From mathieu.saby at univ-rennes2.fr Fri Feb 1 15:01:31 2013 From: mathieu.saby at univ-rennes2.fr (Mathieu Saby) Date: Fri, 01 Feb 2013 15:01:31 +0100 Subject: [Koha-patches] [PATCH 1/2] Bug 8252: Correct UNIMARC 1xx fields in DOM biblio and GRS-1 Message-ID: <510BCABB.7050903@univ-rennes2.fr> In DOM indexing, positions of biblio are not taken into account. Additionnaly some indexes are not working even in GRS1, and there are a lot of warns when rebuiding zebra. This patch correct all 1xx indexes in GRS1 and DOM, and suppress the warns. It also creates new indexes : Country-heading for 101, Code-langage-original for 102$c, Material-type for 200$b. 106$a (used for printed docs only) is no more indexed in itype but in ff8-23 instead. For the moment I keep 200$b indexed in itype and itemtype but if no library use this field that way. To test : Apply on a Koha using GRS1. Check if all coded fields are searchable in advanced search. Check in simple search if Material-type, Country heading and Code-langage-original are searchable (ex :"Material-type:texte" ; "Country-heading:FR" ; "Code-langage-original:eng") Apply on a Koha using DOM. Check if all coded fields are searchable in advanced search. Check in simple search if Material-type, Country heading and Code-langage-original are searchable (ex :"Material-type:texte" ; "Country-heading:FR" ; "Code-langage-original:eng") --- C4/Search.pm | 2 + etc/zebradb/biblios/etc/bib1.att | 63 ++- etc/zebradb/ccl.properties | 162 +++++--- .../unimarc/biblios/biblio-koha-indexdefs.xml | 154 ++++++-- .../unimarc/biblios/biblio-zebra-indexdefs.xsl | 233 +++++++++++- etc/zebradb/marc_defs/unimarc/biblios/record.abs | 77 ++-- .../prog/en/includes/subtypes_unimarc.inc | 400 ++++++++++---------- .../prog/en/includes/subtypes_unimarc.inc | 398 +++++++++---------- 8 files changed, 955 insertions(+), 534 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index 50f7d2b..3047ebd 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -923,6 +923,7 @@ sub getIndexes{ 'cn-suffix', 'cpn', 'Code-institution', + 'Code-language-original', 'Conference-name', 'Conference-name-heading', 'Conference-name-see', @@ -934,6 +935,7 @@ sub getIndexes{ 'Corporate-name-heading', 'Corporate-name-see', 'Corporate-name-seealso', + 'Country-publication', 'ctype', 'date-entered-on-file', 'Date-of-acquisition', diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att index b2c38c4..bdb5ea2 100644 --- a/etc/zebradb/biblios/etc/bib1.att +++ b/etc/zebradb/biblios/etc/bib1.att @@ -53,7 +53,7 @@ att 47 Subject-subdivision att 48 Number-natl-biblio att 49 Number-legal-deposit att 50 Number-govt-pub -att 51 Number-music-publisher +att 51 Music-number att 52 Number-db att 53 Number-local-call att 54 ln @@ -80,7 +80,7 @@ att 1008 Subject-LC-childrens att 1009 Subject-name-personal att 1010 Body-of-text att 1011 date-entered-on-file -att 1012 Date/time-last-modified +att 1012 Date-time-last-modified att 1013 Authority/format-id att 1014 Concept-text att 1015 Concept-reference @@ -262,24 +262,65 @@ att 8911 Host-Item-Number att 9905 llength att 9902 Summary att 9990 Call-Number -# Usually Target Audience 008/22 + +## Codes for some Marc21 fields (008, 007, 040...) +## 8800-8841, 8700-8703, 8740, 9900-9904, 9913, 9658 + +# positions of Marc21 008 (1 byte) +# construction : 88+XX where XX is a position (00 to 39) +# : 88+4X for multi-position index (ex : 8840 = ff8-18-21) +# naming scheme : sometime ff8-XX, sometime a name in english (tpubdate, audience, Modified-code, lf, bio) + +# Indexes common to Marc21 and UNIMARC : +# Marc21 008/06 : Type of publication date (see UNIMARC 100/08) +att 8806 tpubdate +# Marc21 008/22 : Target Audience (see UNIMARC 100/17-19) att 8822 ta -# Usually Form of item 008/23 +# Marc21 008/38 : Modified Record code (see UNIMARC : 100/21) +att 8838 Modified-code + +# Indexes slightly different in Marc21 and UNIMARC (different meanings according to the type of the record => don't match a single UNIMARC field) +# Marc21 008/18 : For Serials, frequency (see UNIMARC 110/1). For Books, Illustrations (see UNIMARC 100/0-3). For Maps, relief. For Music, Form of Composition. For Visual Materials, Running time. +att 8818 ff8-18 +# Marc21 008/18-21 : For Books, Illustrations (see UNIMARC 100/0-3). For Maps, relief. For Music (18-19), Form of Composition. For Visual Materials (18-20), Running time. For Serials (18), frequency +att 8840 ff8-18-21 +# Marc21 008/24-27 : For Books, Nature of contents (see UNIMARC 105/4-7), for and Serials (24 only), Nature of contents (see UNIMARC 110/3). For Computer Files (26 only), type of file. For Music, Accompanying matter. For Maps (25 only), type of cartographic material +# att 8841 ff8-24-27 +# use ctype for 008/24-27 +# Marc21 008/19 : For Serials, Regularity (see UNIMARC 110/2). For Music, Form of composition. For Books, illustrations. For Visual Materials, Running time +att 8819 ff8-19 +# Marc21 008/21 : For Serials, Type of serial (see UNIMARC 110/0). For Music, Music parts. For Maps, relief +att 8821 ff8-21 +# Marc21 008/23 : For Books, Serials, Music, Mixed Materials, Computer files, Form of Item (see UNIMARC 106$a). For Maps, Projection att 8823 ff8-23 -# Usually Nature of contents 008/24-27 -att 8824 ff8-24-27 -# Usually Content-type, also Form of item for maps 008/29 +# Marc21 008/28 : Government publication (see UNIMARC 100/20). except for Music, Accompanying matter +att 8828 ff8-28 +# Marc21 008/29 : For Books and Serials, Conference code (see UNIMARC 105/8 and 110/7). For Maps and Visual Materials, Form of item att 8829 ff8-29 -# Usually Literary Form 008/33 +# Marc21 008/30 : For Books, Festchrift indicator (see UNIMARC 105/9). For Music, Literary text for sound recordings +att 8830 ff8-30 +# Marc21 008/31 : For Books and Maps, Index indicator (see UNIMARC 105/10). For Music, Literary text for sound recordings +att 8831 ff8-31 +# Marc21 008/33 : For Books, Literary form (see UNIMARC : 105/11). For Serials, Script of title (see UNIMARC 100/34-35). For Music, Transposition and arrangement. For Visual Materials, Type of visual materials. For Maps, Special format characteristics att 8833 lf -#att 8833 ff8-33 -# Usually Biography, also Special format characteristics for maps 008/34 +# Marc21 008/34 : For Books, Biography (see UNIMARC 105/12). For Maps, Special format characteristics. For Serials, Entry convention. For Visual Materials, Technique. att 8834 bio -#att 8834 ff8-34 + +## positions of Marc21 007 (1 byte) att 8700 ff7-00 att 8701 ff7-01 att 8702 ff7-02 att 8703 ff7-01-02 + +# Unimarc only +att 9701 Video-mt +att 9702 Graphics-type +att 9703 Graphics-support +att 9704 Title-page-availability +att 9705 Cumulative-index-availability +att 9706 script-Title +att 9707 char-encoding + # Author-personal-bibliography - lastname,firstname in 100$a att 9900 Author-personal-bibliography # Author-in-order - firstname lastname in 245$c statement of responsibility diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index f93de96..dc06bc9 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -254,6 +254,12 @@ Code-institution 1=56 language 1=54 ln language +# +#Code-language- 1095 A code that indicates the 041$h +#original original language of the item. UNIMARC 102$c +# +Code-language-original 1=1095 + #Code-map-scale 1024 Coded form of cartographic 034 # mathematical data, including # scale, projection and/or @@ -270,10 +276,10 @@ ln language # characteristics and defines # the components of the record. # The codes are target-specific. -Record-type 1=1001 -rtype Record-type -mc-rtype Record-type -mus Record-type +rtype 1=1001 +Record-type rtype +mc-rtype rtype +mus rtype #Concept-reference 1015 Used within Z39.50-1988; # included here for historical @@ -350,7 +356,7 @@ acqdate Date-of-acquisition #Date/time last 1012 The date and time a record 005 #modified was last updated. -#Date-time-last-modified 1=1012 +Date-time-last-modified 1=1012 #Identifier-- 1013 Used in full-text searching #authority/format to indicate to the target @@ -389,6 +395,7 @@ acqdate Date-of-acquisition # ISO 2108. ISBN 1=7 nb ISBN +isbn ISBN #Identifier-ISSN 8 International Standard Serial 022, 4XX$x, # Number -- internationally 7XX$x @@ -398,6 +405,7 @@ nb ISBN # ISO 3297. ISSN 1=8 ns ISSN +issn ISSN #Identifier-legal- 49 The copyright registration 017 #deposit number that is assigned to @@ -418,7 +426,9 @@ ns ISSN #Identifier-publisher- 51 A formatted number assigned 028 #for-music by a publisher to a sound # recording or to printed music. -#Number-music-publisher 1=51 +Music-number 1=51 +Number-music-publisher Music-number +music Music-number #Identifier-report 1027 A report number assigned to 027, 088 # the item. This number could be @@ -435,15 +445,14 @@ ns ISSN # are indexed together in many 030, 035, 037 # online public-access catalogs. #Identifier-standard 1=1007 4=6 -# -#Identifier-stock 1028 A stock number that could be 037 -# used for ordering the item. Identifier-standard 1=1007 4=6 ident Identifier-standard upc 1=UPC ean 1=EAN -music 1=Music-number +# +#Identifier-stock 1028 A stock number that could be 037 +# used for ordering the item. Stock-number 1=1028 #Identifier-thematic 1030 The numeric designation for a $n in the following: @@ -475,7 +484,8 @@ Material-type 1=1031 # body, conference, or meeting. 410, 411, 600, 610, # (Subject name headings are 611, 700, 710, 711, # included.) 800, 810, 811 -#Name 1=1002 +Name 1=1002 +name Name #Name-and-title 57 The name of a person, corporate 100/2XX, 110/2XX, # body, conference, or meeting, 111/2XX, subfields @@ -536,6 +546,16 @@ Term-genre-form-seealso 1=Term-genre-form-seealso Place-publication 1=59 pl Place-publication +#Country-publication 1053 The country code or the 008/15-17 +# country name of the country UNIMARC 102$a +# where the document has been +# published. Entries are made +# according to ISO 3166. As +# country code a 2-digit letter +# code is used, as country name +# the English country name. +Country-publication 1=1053 + #Name-personal 1 A person's real name, 100, 400, 600, 700, # pseudonym, title of nobility 800 # nickname, or initials. @@ -559,6 +579,7 @@ pb Publisher # or contents may be recorded. Note 1=63 nt Note +notes Note # Record-linking Record-control-number 1=1045 @@ -785,19 +806,6 @@ Host-item 1=1033 # language and/or script. #Title-parallel 1=35 -#Video -video-mt 1=Video-mt -Video-mt video-mt -Graphics-type 1=Graphic-type -Graphics-support 1=Graphic-support -Type-Of-Serial 1=Type-Of-Serial -Frequency-code 1=Frequency-code -Regularity-code 1=Regularity-code -Material-type 1=Material-type -Literature-Code 1=Literature-Code -Biography-code 1=Biography-code -Illustration-code 1=Illustration-code - #Title-related- 1026 Serial titles related to this 247, 780, 785 #periodical item, either the immediate # predecessor or the immediate @@ -1011,9 +1019,6 @@ mc-itype itype #date1 1=8801 #date2 1=8802 -ff8-22 1=8822 -ff8-23 1=8823 -ff8-34 1=8834 #att 8700 ff7-00 #att 8701 ff7-01 @@ -1038,23 +1043,82 @@ aub Author-personal-bibliography Author-in-order 1=8901 auo Author-in-order -# Audience -audience 1=8822 -aud audience -# Content and Literary form -fiction 1=8833 +#### Indexes for MARC Coded informations (008, 007, 040...) +#### 8800-8841, 8700-8703, 8740, 9900-9904, 9913, 9658 + +## Indexes common to Marc21 and UNIMARC : +# Marc21 008/06 : Type of publication date (see UNIMARC 100/08) +tpubdate 1=8806 + +# Marc21 008/38 : Modified Record (see UNIMARC 100/21) +Modified-code 1=8838 + +# Marc21 008/22 : Target Audience (see UNIMARC 100/17-19) +ta 1=8822 +ff8-22 ta +aud ta +audience ta + +## Indexes slightly different in Marc21 and UNIMARC (different meanings according to the type of the record => don't match a single UNIMARC field) +## We can use it for UNIMARC to a first approximation +# Marc21 008/18 : For Serials, frequency (see UNIMARC 110/1). For Books, Illustrations (see UNIMARC 100/0-3). For Maps, relief. For Music, Form of Composition. For Visual Materials, Running time. +ff8-18 1=8818 +Frequency-code ff8-18 + +# Marc21 008/18-21 : For Books, Illustrations (see UNIMARC 100/0-3). For Maps, relief. For Music (18-19), Form of Composition. For Visual Materials (18-20), Running time. For Serials (18), frequency +ff8-18-21 1=8840 +Illustration-code ff8-18-21 + +# Marc21 008/19 : For Serials, Regularity (see UNIMARC 110/2). For Music, Form of composition. For Books, illustrations. For Visual Materials, Running time +ff8-19 1=8819 +Regularity-code ff8-19 + +# Marc21 008/21 : For Serials, Type of serial (see UNIMARC 110/0). For Music, Music parts. For Maps, relief +ff8-21 1=8821 +Type-Of-Serial ff8-21 + +# Marc21 008/23 : For Books, Serials, Music, Mixed Materials, Computer files, Form of Item (see UNIMARC 106$a). For Maps, Projection +ff8-23 1=8823 + +# Marc21 008/24-27 : For Books, Nature of contents (see UNIMARC 105/4-7), for and Serials (24 only), Nature of contents (see UNIMARC 110/3). For Computer Files (26 only), type of file. For Music, Accompanying matter. For Maps (25 only), type of cartographic material +# ff8-24-27 1=8841 +# Content-type ff8-24-27 +# Use ctype att (1034) + +# Marc21 008/28 : Government publication (see UNIMARC 100/20). except for Music, Accompanying matter +ff8-28 1=8828 + +# Marc21 008/29 : For Books and Serials, Conference code (see UNIMARC 105/8 and 110/7). For Maps and Visual Materials, Form of item +ff8-29 1=8829 +Conference-code ff8-29 + +# Marc21 008/30 : For Books, Festchrift indicator (see UNIMARC 105/9). For Music, Literary text for sound recordings +ff8-30 1=8830 +Festschrift-indicator ff8-30 + +# Marc21 008/31 : For Books and Maps, Index indicator (see UNIMARC 105/10). For Music, Literary text for sound recordings +ff8-31 1=8831 +Index-indicator ff8-31 + +# Marc21 008/33 : For Books, Literary form (see UNIMARC : 105/11). For Serials, Script of title (see UNIMARC 100/34-35). For Music, Transposition and arrangement. For Visual Materials, Type of visual materials. For Maps, Special format characteristics +lf 1=8833 +lf fiction fic fiction -#mystery 1=? -biography 1=8834 -bio biography +Literature-Code lf -# Format -format 1=8823 -# format used as a limit FIXME: needed? -l-format 1=8703 +# Marc21 008/34 : For Books, Biography. For Maps, Special format characteristics. For Continuing ressources, Entry convention. For Visual Materials, Technique. UNIMARC 105/12 : Biography code +bio 1=8834 +biography bio +ff8-34 bio +Biography-Code bio -Illustration-code 1=Illustration-code +## positions of Marc21 007 (1 byte) +ff7-00 1=8700 +ff7-01 1=8701 +ff7-02 1=87020 +ff7-01-02 1=8703 +l-format ff7-01-02 # Lexile Number lex 1=9903 r=r @@ -1068,6 +1132,20 @@ arp 1=9013 r=r # Curriculum curriculum 1=9658 +## UNIMARC Only +## 97XX + +Video-mt 1=9701 +video-mt Video-mt +Graphics-type 1=9702 +Graphic-type Graphics-type +Graphics-support 1=9703 +Graphic-support Graphics-support +Title-page-availability 1=9704 +Cumulative-index-availability 1=9705 +script-Title 1=9706 +char-encoding 1=9707 + ## Statuses popularity 1=issues @@ -1131,15 +1209,11 @@ sort3 7=3 # For recent changes in this section, see Bugzilla #3735 #keyTitle 1=33 #possessingInstitution 1=1044 -name 1=1002 #personalName 1=1 #corporateName 1=2 #conferenceName 1=3 #uniformTitle 1=6 -isbn 1=7 -issn 1=8 #geographicName 1=58 -notes 1=63 #topicalSubject 1=1079 #genreForm 1=1075 diff --git a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml index ceaba51..05b12c4 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml @@ -29,11 +29,11 @@ Date-of-acquisition:d Date-of-acquisition:s - + - Date/time-last-modified:s - Date/time-last-modified:n - Date/time-last-modified:y + Date-time-last-modified:s + Date-time-last-modified:n + Date-time-last-modified:y @@ -158,12 +158,14 @@ EAN:w Identifier-standard:w - + itemtype:w itemtype:p itype:w itype:p + Material-type:w + Material-type:p @@ -171,66 +173,134 @@ itemtype:p itype:w itype:p - - - + + + tpubdate:s + + ta:w + + ta:w + + ta:w + + Modified-code:n - ln:s + + char-encoding:n + + char-encoding:n + + char-encoding:n + + script-Title:n - + ln:w - + + + Code-language-original:w + + - Country-heading:w - - - - Illustration-code:w - Content-type:w - Content-type:w - Content-type:w - Content-type:w - Conference-code:w - Festschrift-indicator:w - Index-indicator:w - Literature-Code:w - Biography-Code:w - - + Country-publication:w + + + + ff8-18-21:w + + + ff8-18-21:w + + + ff8-18-21:w + + + ff8-18-21:w + + + ctype:w + + + ctype:w + + + ctype:w + + + ctype:w + + + ff8-29:w + + + ff8-30:w + + + ff8-31:w + + + lf:w + + + bio:w + + - itype:w - itype:p + ff8-23:w + ff8-23:p + + + + ff8-21:w + + + ff8-18:w - - - Type-Of-Serial:w - Frequency-code:w - Regularity-code:w - Content-type:w - Content-type:w - Conference-publication-Code:w - Title-Page-availability-Code:w - Index-availability-Code:w - Cumulative-Index-availability-Code:w + + ff8-19:w + + + ctype:w + + + ctype:w + + + ff8-29:w + + + Title-page-availability:w + + + ff8-31:w + + + Cumulative-index-availability:w - + Video-mt:w - + Graphics-type:w + + Graphics-support:w + + Graphics-support:w diff --git a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl index f1e82e3..413c647 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl @@ -76,7 +76,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + @@ -305,7 +305,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + @@ -456,7 +456,63 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -470,11 +526,18 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + - + @@ -483,7 +546,91 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -492,7 +639,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + @@ -501,7 +648,63 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -519,7 +722,21 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + + + + + + + + + + + + + + + diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs index 44a5bbe..62eeb13 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs +++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs @@ -27,7 +27,7 @@ melm 001 Local-number,Local-number:n melm 009 Identifier-standard:w,Identifier-standard:n melm 090$9 Local-number,Local-number:n melm 099$c date-entered-on-file:s,date-entered-on-file:n,date-entered-on-file:y,Date-of-acquisition,Date-of-acquisition:d,Date-of-acquisition:s -melm 099$d Date/time-last-modified:s,Date/time-last-modified:n,Date/time-last-modified:y +melm 099$d Date-time-last-modified:s,Date-time-last-modified:n,Date-time-last-modified:y melm 099$t ccode:w # ISBN @@ -83,42 +83,59 @@ melm 073$a EAN:w,Identifier-standard:w melm 073$z EAN:w,Identifier-standard:w ############ ITEM TYPE ################## -melm 200$b itemtype:w,itemtype:p,itype:w,itype:p +# FIXME index 200$b only in Material-type ? +melm 200$b itemtype:w,itemtype:p,itype:w,itype:p,Material-type:w,Material-type:p melm 995$r itemtype:w,itemtype:p,itype:w,itype:p ############ CODED INFORMATIONS ################## -melm 100$a tpubdate:s:range(data,8,1),ta:w:range(data,17,1),ta:w:range(data,18,1),ta:w:range(data,19,1),Modified-code:n:range(data,21,1),ln:s:range(data,22,3),char-encoding:n:range(data,26,2),char-encoding:n:range(data,28,2),char-encoding:n:range(data,30,2),script-Title:n:range(data,34,2) +# Field 100 Description +# Name of Data Element Number of characters Character Positions +# Date Entered on File (Mandatory) 8 0-7 +# Type of date 1 8 +# Date 1 4 9-12 +# Date 2 4 13-16 +# Target audience 3 17-19 +# Government Publication Code 1 20 +# Modified Record Code 1 21 +# Language of cataloguing (mandatory) 3 22-24 do not index in ln +# Translitteration code 1 25 +# Character Set (Mandatory) 4 26-29 +# additional Character Set 4 28-33 +# Script of title 2 34-35 +melm 100$a tpubdate:s:range(data,8,1),ta:w:range(data,17,1),ta:w:range(data,18,1),ta:w:range(data,19,1),Modified-code:n:range(data,21,1),char-encoding:n:range(data,26,2),char-encoding:n:range(data,28,2),char-encoding:n:range(data,30,2),script-Title:n:range(data,34,2) melm 101$a ln -melm 102$a Country-heading - -#Field 105 Description -#Illustration codes 4 -#Form of contents codes 4 -#Conference or meeting code 1 -#Festschrift indicator 1 -#Index indicator 1 -#Literature code 1 -#Biography code 1 -melm 105$a Illustration-code:w:range(data,0,4),Content-type:w:range(data,4,1),Content-type:w:range(data,5,1),Content-type:w:range(data,6,1),Content-type:w:range(data,7,1),Conference-code:w:range(data,8,1),Festschrift-indicator:w:range(data,9,1),Index-indicator:w:range(data,10,1),Literature-Code:w:range(data,11,1),Biography-Code:w:range(data,12,1) - -melm 106$a itype:w,itype:p - -#Field 110 Description -#Name of Data Element Number of characters Character Positions -#Type of serial designator 1 0 -#Frequency of issue 1 1 -#Regularity 1 2 -#Type of material code 1 3 -#Nature of contents code 3 4-6 -#Conference publication indicator 1 7 -#Title page availability codes 1 8 -#Index availability code 1 9 -#Cumulative index availability code 1 10 -melm 110$a Type-Of-Serial:w:range(data,0,1),Frequency-code:w:range(data,1,1),Regularity-code:w:range(data,2,1),Content-type:w:range(data,3,1),Content-type:w:range(data,4,3),Conference-publication-Code:w:range(data,7,1),Title-Page-availability-Code:w:range(data,8,1),Index-availability-Code:w:range(data,9,1),Cumulative-Index-availability-Code:w:range(data,10,1) +melm 101$c Code-language-original +melm 102$a Country-publication + +# Field 105 Description +# Name of Data Element Number of characters Character Positions +# Illustration codes 4 0-3 +# Form of contents codes 4 4-7 +# Conference or meeting code 1 8 +# Festschrift indicator 1 9 +# Index indicator 1 10 +# Literature code 1 11 +# Biography code 1 12 +melm 105$a ff8-18-21:w:range(data,0,1),ff8-18-21:w:range(data,1,1),ff8-18-21:w:range(data,2,1),ff8-18-21:w:range(data,3,1),ctype:w:range(data,4,1),ctype:w:range(data,5,1),ctype:w:range(data,6,1),ctype:w:range(data,7,1),ff8-29:w:range(data,8,1),ff8-30:w:range(data,9,1),ff8-31:w:range(data,10,1),lf:w:range(data,11,1),bio:w:range(data,12,1) + +melm 106$a ff8-23:w,ff8-23:p + +# Field 110 Description +# Name of Data Element Number of characters Character Positions +# Type of serial designator 1 0 +# Frequency of issue 1 1 +# Regularity 1 2 +# Type of material code 1 3 +# Nature of contents code 3 4-6 +# Conference publication indicator 1 7 +# Title page availability codes 1 8 +# Index availability code 1 9 +# Cumulative index availability code 1 10 +melm 110$a ff8-21:w:range(data,0,1),ff8-18:w:range(data,1,1),ff8-19:w:range(data,2,1),ctype:w:range(data,3,1),ctype:w:range(data,4,3),ff8-29:w:range(data,7,1),Title-page-availability:w:range(data,8,1),ff8-31:w:range(data,9,1),Cumulative-index-availability:w:range(data,10,1) melm 115$a Video-mt:w:range(data,0,1) -melm 116$a Graphics-type:w:range(data,0,1),Graphics-support:w:range(data,1,1),Graphics-support:w:range(data,2,1), +melm 116$a Graphics-type:w:range(data,0,1),Graphics-support:w:range(data,1,1),Graphics-support:w:range(data,2,1) ############ AUTHORS ################## # main Author diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc index 5e6bf63..2ff13bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc @@ -1,214 +1,214 @@ Coded information filters diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc index 1845ddb..f1bd37d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc @@ -1,209 +1,209 @@
- Coded fields -

- - -

-

- - -

-

- - -

+ Coded Fields +

+ + +

+

+ + +

+

+ + +

- - + +

- - + +

-

- - +

+ +

- - + +

-
-
- Serials

-

- - -

-

- - -

-

- - +

+
+ Serials

+

+ + +

+

+ + +

+

+ +

- -
+
- Picture

- - -

+ Picture +

+ + +

\ No newline at end of file -- 1.7.9.5 -- Mathieu Saby Service d'Informatique Documentaire Service Commun de la Documentation Universit? Rennes 2 T?l?phone : 02 99 14 12 65 Courriel : mathieu.saby at univ-rennes2.fr From mathieu.saby at univ-rennes2.fr Fri Feb 1 15:02:22 2013 From: mathieu.saby at univ-rennes2.fr (Mathieu Saby) Date: Fri, 01 Feb 2013 15:02:22 +0100 Subject: [Koha-patches] [PATCH 2/2] Bug 8252: Followup for Marc21 Message-ID: <510BCAEE.7020904@univ-rennes2.fr> Followup for Marc21 To test : Apply on a Koha using GRS1. Check if all coded fields are searchable in advanced search. Check in simple search if Country heading and Code-langage-original are searchable (ex "Country-heading:FR" ; "Code-langage-original:eng") Apply on a Koha using DOM. same tests --- .../marc21/biblios/biblio-koha-indexdefs.xml | 8 ++++++-- .../marc21/biblios/biblio-zebra-indexdefs.xsl | 11 +++++++++-- etc/zebradb/marc_defs/marc21/biblios/record.abs | 5 +++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml index 14443d6..50aacdc 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml @@ -17,7 +17,7 @@ - Date/time-last-modified:w + Date-time-last-modified:w @@ -58,7 +58,7 @@ pubdate:s - pl:w + Country-publication:w ta:w @@ -186,6 +186,10 @@ ln:w + + + Code-language-original:w + ln:w diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl index 14f299e..7cbc459 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl @@ -58,7 +58,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + @@ -101,7 +101,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + @@ -179,6 +179,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs index 0f8360e..01ccba4 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/record.abs +++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs @@ -49,10 +49,10 @@ xelm /record/leader llength:w:range(data,0,5),rtype:w:range(data,6,1),Bib-level: # example: xelm /record/leader l1:w:range(data,0,5),l2:w:range(data,10,2) melm 001 Control-number -melm 005 Date/time-last-modified +melm 005 Date-time-last-modified melm 007 Microform-generation:n:range(data,11,1),Material-type,ff7-00:w:range(data,0,1),ff7-01:w:range(data,1,1),ff7-02:w:range(data,2,1),ff7-01-02:w:range(data,0,2) -melm 008 date-entered-on-file:n:range(data,0,5),date-entered-on-file:s:range(data,0,5),pubdate:w:range(data,7,4),pubdate:n:range(data,7,4),pubdate:y:range(data,7,4),pubdate:s:range(data,7,4),pl:w:range(data,15,3),ta:w:range(data,22,1),ff8-23:w:range(data,23,1),ff8-29:w:range(data,29,1),lf:w:range(data,33,1),bio:w:range(data,34,1),ln:w:range(data,35,3),ctype:w:range(data,24,4),Record-source:w:range(data,39,0) +melm 008 date-entered-on-file:n:range(data,0,5),date-entered-on-file:s:range(data,0,5),pubdate:w:range(data,7,4),pubdate:n:range(data,7,4),pubdate:y:range(data,7,4),pubdate:s:range(data,7,4),Country-publication:w:range(data,15,3),ta:w:range(data,22,1),ff8-23:w:range(data,23,1),ff8-29:w:range(data,29,1),lf:w:range(data,33,1),bio:w:range(data,34,1),ln:w:range(data,35,3),ctype:w:range(data,24,4),Record-source:w:range(data,39,0) melm 010 LC-card-number,Identifier-standard melm 011 LC-card-number,Identifier-standard @@ -78,6 +78,7 @@ melm 040 Code-institution,Record-source melm 041$a ln melm 041$d ln melm 041$e ln +melm 041$h Code-language-original melm 041$j ln melm 043 Code-geographic #melm 046 pubdate -- 1.7.9.5 -- Mathieu Saby Service d'Informatique Documentaire Service Commun de la Documentation Universit? Rennes 2 T?l?phone : 02 99 14 12 65 Courriel : mathieu.saby at univ-rennes2.fr From oleonard at myacpl.org Wed Feb 6 16:07:58 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 6 Feb 2013 10:07:58 -0500 Subject: [Koha-patches] [PATCH] Bug 9529 - Adding a patron shows javascript on screen under login section Message-ID: <1360163278-10590-1-git-send-email-oleonard@myacpl.org> A typo in my patch for Bug 9265 (HTML5 switch) left an extra quotation mark in a @@ -200,15 +197,17 @@ $(document).ready(function() {
Export
+
+ Export framework -
    -
  • Close
    • -
    • -
    • -
    • -
    • -
    • -
+
    +
    2. +
    3. +
    4. +
    5. +
+
+
Cancel
@@ -216,13 +215,16 @@ $(document).ready(function() {
Import
+
+ Import [% frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file -
    -
  • Close
    • -
    • -
    • -
+
    +
    2. +
    3. +
+
+
Cancel
@@ -230,41 +232,45 @@ $(document).ready(function() { [% FOREACH loo IN loop %] - [% IF ( loop.odd ) %] - [% ELSE %] - [% END %] + [% IF ( loop.odd ) %] + [% ELSE %] + [% END %] [% loo.frameworkcode %] [% loo.frameworktext %] MARC structure Edit Delete -
Export +
Export
+
+ Export framework -
    -
  • Close
    • -
    • -
    • -
    • -
    • -
    • -
+
    +
    2. +
    3. +
    4. +
    5. +
+
+
Cancel
-
Import +
Import
+
+ Import [% frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file -
    -
  • Close
    • -
    • -
    • -
+
    +
    2. +
+
+
Cancel
-- 1.7.9.5 From oleonard at myacpl.org Mon Feb 11 18:27:43 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Mon, 11 Feb 2013 12:27:43 -0500 Subject: [Koha-patches] [PATCH] Bug 9385 - patron add labels right aligned in chrome Message-ID: <1360603663-24473-1-git-send-email-oleonard@myacpl.org> The element has been given right alignment which seems to only be respected by WebKit-based browsers. Users of Chrome and Safari see a right-aligned legend while others see a left-aligned one. Given that the legend is often applied to fieldsets spanning much of the screen it seems wiser to have them left-aligned. This patch removes "text-align:right" from the CSS so that will inherit the default left alignment. To test, view any page with a legend element, for instance the patron add form. In Firefox, Chrome, Safari, IE, etc. the legend ("Patron identity," "Main address," etc.) should be left-aligned in the fieldset. --- .../intranet-tmpl/prog/en/css/staff-global.css | 1 - 1 file changed, 1 deletion(-) 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 1a3e563..8154304 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -327,7 +327,6 @@ legend { border:2px solid #b9d8d9; background-color:#ffffff; border-radius:3px; - text-align:right; padding: 0.2em 0.5em; } -- 1.7.9.5 From oleonard at myacpl.org Mon Feb 11 21:35:51 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Mon, 11 Feb 2013 15:35:51 -0500 Subject: [Koha-patches] [PATCH] Bug 7969 - select all / unselect all on fines page Message-ID: <1360614951-28160-1-git-send-email-oleonard@myacpl.org> This patch adds "select all" and "clear all" links to the pay fines page so that checkboxes which are all checked by default can be easily unchecked and selected individually. This patch also moves the column of checkboxes to the start of the table in order to conform to common practices. To test, vew the "Pay fines" page for a patron who has outstanding charges on their account. Confirm that the "select all" and "clear all" links work correctly and that payment and writeoff functionality is not changed. --- .../intranet-tmpl/prog/en/modules/members/pay.tt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index 2780c3f..171337d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -1,6 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › Pay Fines for [% borrower.firstname %] [% borrower.surname %] [% INCLUDE 'doc-head-close.inc' %] + @@ -40,12 +43,12 @@ [% IF ( accounts ) %]
- - +

Select all | Clear all

+
+ - @@ -66,6 +69,11 @@ + - -- 1.7.9.5 From oleonard at myacpl.org Tue Feb 12 17:14:16 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 12 Feb 2013 11:14:16 -0500 Subject: [Koha-patches] [PATCH] Bug 9570 - view plain not working in ccsr Message-ID: <1360685656-540-1-git-send-email-oleonard@myacpl.org> The code in opac-showmarc.pl isn't smart enough to find the xsl files in the "default" (prog) theme if the ccsr theme is enabled, so the "view plain" option on opac-MARCdetail.pl fails ever time. This patch copies some path-handling code from XSLT.pm to improve xsl file path handling when dealing with a "sub-theme." To test, view the MARC view in the OPAC and click the "view plain" link. This should work correctly in prog and ccsr themes and with different languages enabled (keeping in mind the ccsr theme will fail in general for languages other than en). --- opac/opac-showmarc.pl | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl index b958485..71fb804 100755 --- a/opac/opac-showmarc.pl +++ b/opac/opac-showmarc.pl @@ -58,18 +58,26 @@ else { if ($view eq 'card' || $view eq 'html') { my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber); my $xslfile; - my $themelang = '/' . C4::Context->preference("opacthemes") . '/' . C4::Templates::_current_language(); + my $xslfilename; + my $htdocs = C4::Context->config('opachtdocs'); + my $theme = C4::Context->preference("opacthemes"); + my $lang = C4::Templates::_current_language(); if ($view eq 'card'){ - $xslfile = C4::Context->config('opachtdocs').$themelang."/xslt/compact.xsl"; + $xslfile = "compact.xsl"; } else { # must be html - $xslfile = C4::Context->config('opachtdocs').$themelang."/xslt/MARC21slim2OPACMARCdetail.xsl"; + $xslfile = C4::Context->preference('marcflavour') . "slim2OPACMARCdetail.xsl"; } + $xslfilename = "$htdocs/$theme/$lang/xslt/$xslfile"; + $xslfilename = "$htdocs/$theme/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename ); + $xslfilename = "$htdocs/prog/$lang/xslt/$xslfile" unless ( -f $xslfile ); + $xslfilename = "$htdocs/prog/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename ); + my $parser = XML::LibXML->new(); my $xslt = XML::LibXSLT->new(); my $source = $parser->parse_string($xmlrecord); - my $style_doc = $parser->parse_file($xslfile); + my $style_doc = $parser->parse_file($xslfilename); my $stylesheet = $xslt->parse_stylesheet($style_doc); my $results = $stylesheet->transform($source); my $newxmlrecord = $stylesheet->output_string($results); -- 1.7.9.5 From srdjan at catalyst.net.nz Wed Feb 13 06:38:13 2013 From: srdjan at catalyst.net.nz (Srdjan) Date: Wed, 13 Feb 2013 18:38:13 +1300 Subject: [Koha-patches] [PATCH] bug_8034: Disable delete printer for printers asigned to branches In-Reply-To: References: Message-ID: <1360733893-31453-1-git-send-email-srdjan@catalyst.net.nz> * C4::Printer - added branch count to printer queries * admin/printers.tt - show or not delete link --- C4/Printer.pm | 24 ++++++++++++++------ admin/printers.pl | 8 ++++++- .../prog/en/modules/admin/printers.tt | 9 +++++++- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/C4/Printer.pm b/C4/Printer.pm index 0990bad..e24c9b2 100644 --- a/C4/Printer.pm +++ b/C4/Printer.pm @@ -67,10 +67,17 @@ references-to-hash, whose keys are the fields in the printers table. =cut +my $PRINTER_SELECT_FROM = <dbh; - my $sth = $dbh->prepare("select * from printers"); + my $sth = $dbh->prepare($PRINTER_SELECT_FROM); $sth->execute; while ( my $printer = $sth->fetchrow_hashref ) { $printers{ $printer->{'printqueue'} } = $printer; @@ -87,10 +94,11 @@ sub GetPrinters { sub SearchPrinters { my ($searchstring)=@_; $searchstring .= '%'; - return C4::Context->dbh->selectall_arrayref(" - SELECT * FROM printers - WHERE printername like ? OR printqueue like ? ORDER BY printername - ", {Slice => {}}, $searchstring, $searchstring); + return C4::Context->dbh->selectall_arrayref( + "$PRINTER_SELECT_FROM + WHERE printername like ? OR printqueue like ? ORDER BY printername", + {Slice => {}}, + $searchstring, $searchstring); } =head2 GetPrinterDetails @@ -102,8 +110,10 @@ sub SearchPrinters { sub GetPrinterDetails { my ( $printer ) = @_; my $dbh = C4::Context->dbh; - my $printername = $dbh->selectrow_hashref('SELECT * FROM printers WHERE printqueue = ?', undef, $printer); - return $printername; + return $dbh->selectrow_hashref( + "$PRINTER_SELECT_FROM + WHERE printqueue = ?", + undef, $printer); } =head2 AddPrinter diff --git a/admin/printers.pl b/admin/printers.pl index 12e42d7..38eb177 100755 --- a/admin/printers.pl +++ b/admin/printers.pl @@ -101,8 +101,14 @@ if ($op eq 'add_form') { # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { $list_printers = 0; - $template->param(delete_confirm => 1); my $data=GetPrinterDetails($searchfield); + my $branches = $data->{branches}; + if ($branches && $branches > 0) { + $template->param(cannot_delete_branches => $branches); + $template->param(add_form => 1); + } else { + $template->param(delete_confirm => 1); + } $template->param( printqueue => $data->{'printqueue'}, printtype => $data->{'printtype'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt index 06fd229..29445c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt @@ -171,7 +171,14 @@ - + [% END %]
  Fines & chargesSel Description Account type Notify id
[% IF ( line.amountoutstanding > 0 ) %] + + [% END %] + + [% IF ( line.amountoutstanding > 0 ) %] [% END %] @@ -81,11 +89,6 @@ - [% IF ( line.amountoutstanding > 0 ) %] - - [% END %] - [% line.description %] ([% line.title |html_entity %]) [% line.accounttype %] [% line.notify_id %][% loo.printername %] [% loo.printqueue %] [% loo.printtype %]Edit Delete + Edit + [% IF loo.branches %] + Default printer for [% loo.branches %] branch(es) + [% ELSE %] + Delete + [% END %] +
[% ELSE %]
No printers defined.
[% END %] -- 1.7.10.4 From oleonard at myacpl.org Wed Feb 13 17:19:45 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 13 Feb 2013 11:19:45 -0500 Subject: [Koha-patches] [PATCH] Bug 9608 - White background on header on check in Message-ID: <1360772385-8230-1-git-send-email-oleonard@myacpl.org> The white background behind the header search form on the checkin page appears because the search include is missing a
which carries the background gradient CSS. This patch adds the missing markup to the checkin search header include file and 6 others. To test, view the following pages and confirm that the normal gradient background appears behind the header search form: - Checkin - Contracts administration - Currencies administration - Notices and slips - Printers administration (admin/printers.pl) - Stop words administration (admin/stopwords.pl) - Adding an order to a basket from a suggestions (Acquisitions -> Basket -> Add order to basket -> From a suggestions). --- .../prog/en/includes/checkin-search.inc | 4 ++-- .../prog/en/includes/contracts-admin-search.inc | 3 ++- .../prog/en/includes/currencies-admin-search.inc | 3 ++- .../prog/en/includes/letters-search.inc | 3 ++- .../prog/en/includes/printers-admin-search.inc | 3 ++- .../prog/en/includes/stopwords-admin-search.inc | 3 ++- .../prog/en/includes/suggestions-add-search.inc | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc index 8fc03af..cf96ab9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc @@ -1,4 +1,4 @@ - +

[% LibraryName %]

- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc index 31b41ac..88145fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc @@ -1,4 +1,4 @@ - +

[% LibraryName %]

+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc index 26ccbbe..7ac9e3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc @@ -1,4 +1,4 @@ - +

[% LibraryName %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc index e55c0c1..1e28502 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc @@ -1,4 +1,4 @@ - +

[% LibraryName %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc index 7559f03..0fbc282 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc @@ -1,4 +1,4 @@ - +

[% LibraryName %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc index 270bab4..e45a5c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc @@ -1,4 +1,4 @@ - +

[% LibraryName %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc index dd4d9f5..877fcc2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc @@ -1,4 +1,4 @@ - +

[% LibraryName %]

-- 1.7.9.5 From oleonard at myacpl.org Thu Feb 14 17:47:43 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 14 Feb 2013 11:47:43 -0500 Subject: [Koha-patches] [PATCH] Bug 9615 - Combine staff home page images into single sprite Message-ID: <1360860463-13028-1-git-send-email-oleonard@myacpl.org> In order to reduce the number of concurrent downloads on the staff client home page the images representing the various modules (circ, patrons, etc) could be combined into one sprite. This patch creates a new sprite containing all images and corrects the CSS for the default and hover states of each link to match the previous version. The separate images have been removed. Also added is a GIMP-compatible Photoshop file from which the sprite is generated. To test, apply the patch, clear your browser cache, and view the staff client home page. Each module icon should look correct in its default and hover states. --- koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css | 59 ++++++++++---------- .../intranet-tmpl/prog/img/icon_acquisitions.png | Bin 1172 -> 0 bytes .../intranet-tmpl/prog/img/icon_administration.png | Bin 2516 -> 0 bytes .../intranet-tmpl/prog/img/icon_authorities.png | Bin 1616 -> 0 bytes .../intranet-tmpl/prog/img/icon_cataloging.png | Bin 1114 -> 0 bytes .../intranet-tmpl/prog/img/icon_circulation.png | Bin 851 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/icon_koha.png | Bin 1595 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/icon_lists.png | Bin 826 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png | Bin 1820 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/icon_reports.png | Bin 1651 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/icon_search.png | Bin 2004 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/icon_serials.png | Bin 1178 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/icon_tools.png | Bin 1442 -> 0 bytes .../prog/img/staff-home-icons-sprite.png | Bin 0 -> 11151 bytes .../staff-home-icons-sprite.psd | Bin 0 -> 117814 bytes 15 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_administration.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_koha.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_lists.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_reports.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_search.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_serials.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_tools.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/staff-home-icons-sprite.png create mode 100644 misc/interface_customization/staff-home-icons-sprite.psd diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css index 2c87adb..064668d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css @@ -72,6 +72,7 @@ ul.biglinks-list li { ul.biglinks-list li a.icon_general { /* Class used for each module link */ + background-image:url('/intranet-tmpl/prog/img/staff-home-icons-sprite.png'); display: block; float: left; @@ -98,42 +99,44 @@ ul.biglinks-list li a.icon_general { ul.biglinks-list li a:hover.icon_general { /* Class used for each module link hover state */ - background-position:5px -43px; color: #538200; border-color: #538200; } /* CSS Sprites - * Each image contains the normal and the hover state of the icon - * The hover part starts at 46px below the top: - * - * 46px - * ------- - * | | - * | N | 46px \ - * | | | - * ------- > 92px - * | | | - * | H | 46px / - * | | - * ------- - * + * There is one sprite image which contains all icons in both + * hover states (on and off) */ /* Classes used for each individual module link */ -ul.biglinks-list li a.icon_circulation {background-image:url('/intranet-tmpl/prog/img/icon_circulation.png')} -ul.biglinks-list li a.icon_patrons {background-image:url('/intranet-tmpl/prog/img/icon_patrons.png')} -ul.biglinks-list li a.icon_search {background-image:url('/intranet-tmpl/prog/img/icon_search.png')} -ul.biglinks-list li a.icon_lists {background-image:url('/intranet-tmpl/prog/img/icon_lists.png')} -ul.biglinks-list li a.icon_cataloging {background-image:url('/intranet-tmpl/prog/img/icon_cataloging.png')} -ul.biglinks-list li a.icon_authorities {background-image:url('/intranet-tmpl/prog/img/icon_authorities.png')} - -ul.biglinks-list li a.icon_serials {background-image:url('/intranet-tmpl/prog/img/icon_serials.png')} -ul.biglinks-list li a.icon_acquisitions {background-image:url('/intranet-tmpl/prog/img/icon_acquisitions.png')} -ul.biglinks-list li a.icon_reports {background-image:url('/intranet-tmpl/prog/img/icon_reports.png')} -ul.biglinks-list li a.icon_administration {background-image:url('/intranet-tmpl/prog/img/icon_administration.png')} -ul.biglinks-list li a.icon_tools {background-image:url('/intranet-tmpl/prog/img/icon_tools.png')} -ul.biglinks-list li a.icon_koha {background-image:url('/intranet-tmpl/prog/img/icon_koha.png')} +ul.biglinks-list li a.icon_circulation {background-position:5px 3px;} +ul.biglinks-list li a.icon_patrons {background-position:5px -89px;} +ul.biglinks-list li a.icon_search {background-position:5px -181px;} +ul.biglinks-list li a.icon_lists {background-position:5px -273px;} +ul.biglinks-list li a.icon_cataloging {background-position:5px -365px;} +ul.biglinks-list li a.icon_authorities {background-position:5px -457px;} + +ul.biglinks-list li a.icon_serials {background-position:5px -549px;} +ul.biglinks-list li a.icon_acquisitions {background-position:5px -641px;} +ul.biglinks-list li a.icon_reports {background-position:5px -733px;} +ul.biglinks-list li a.icon_administration {background-position:5px -825px;} +ul.biglinks-list li a.icon_tools {background-position:5px -917px;} +ul.biglinks-list li a.icon_koha {background-position:5px -1008px;} + +/* Classes used for each individual module link on hover*/ +ul.biglinks-list li a:hover.icon_circulation {background-position:5px -43px;} +ul.biglinks-list li a:hover.icon_patrons {background-position:5px -135px;} +ul.biglinks-list li a:hover.icon_search {background-position:5px -227px;} +ul.biglinks-list li a:hover.icon_lists {background-position:5px -319px;} +ul.biglinks-list li a:hover.icon_cataloging {background-position:5px -411px;} +ul.biglinks-list li a:hover.icon_authorities {background-position:5px -503px;} + +ul.biglinks-list li a:hover.icon_serials {background-position:5px -595px;} +ul.biglinks-list li a:hover.icon_acquisitions {background-position:5px -687px;} +ul.biglinks-list li a:hover.icon_reports {background-position:5px -779px;} +ul.biglinks-list li a:hover.icon_administration {background-position:5px -871px;} +ul.biglinks-list li a:hover.icon_tools {background-position:5px -963px;} +ul.biglinks-list li a:hover.icon_koha {background-position:5px -1054px;} /* ==== MODULE LINKS - End ==== */ diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png b/koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png deleted file mode 100644 index 3f3ac65cadd42ff300de1523c9f950ce835bc09a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1172 zcmV;F1Z(?=P)H>j7_49+l}a1Sb}OL<5yTfkkQOo3Yy*YhL+Xnb47Ly?AW;xZDM%{Pl$MlY zyK{V)37yoI+|B4+huj}7vwP|K|%2lx at _OS{{E?Pj)+$(sk( z<*J->#6JRl16uFuA0e3gU?gYBhuxn`_K%G1D z`3&$)+81ZGlV-XcHf_$}^CgMX{N{-2Nd|3%K1LrJHA#~s73nAxs0Zyb2kF>lVy zUUrIXV2aG*e(L8kc~=|An|0+`y^E}7DS-P{0Qao`?pp!ex11MQlGfpVps|@SclqtWKOXknN0&37w*%`P^ESA` z6!ym%z9GofcsVe_pJc#TX|oJ({oG*FkVygzVrJy zV*lwwc5z8eMO%p&0=5BbFpk#VwUIn^bB%aURR=MKfU_o!8?;6-Ka?xlk%{RbViMS9 z;xk|zaiXWHeR*o<9r4`;$4?L1A%L#;_348*nXrhH;^twY2mzcd{dNhPn>z%t|RsUZSf3!@eF-H8!>wqp#cQ*D4%;G7r2Zs4BjYL)VkPL z8?>JcYKVSBzd@~b#C~4fU#_UtV6Wh-rh(roF$~n>i0R&{2Fjx<0m!J4IDaA)Zj+h2+$1$JeshxX0zN?~^QpD#5&jAIQKvCdUpp=ALNys#1 at 5Uhtto@)G;ry5A44 z3+Td at rbb3TiNDKPg}rri9`T-II%VeOo`~Se=wRZW=&fozc63ij%+(INxhLGGiqWYR zJRdiBMy}7tjf=|%B`WM9D}eh}0Qao`?pp!ew+ajH{Fnc5%u@@F2f8*f`T`I=#Fkq( z-P{w|yydhCR)^Kb+!M9I#68h{ROcjj_e5>5iS7wyR)Pb^UY_pJc#TLIj+0=RD# m7QC>Ftiq0X0QarJg8vQ3rQSS;RxJ(y0000;Si$I?gCun6vb z`s3W!z3=6|_x-W^E;_T{nfu4N=eg&6 at 43%;&U4TC%FOsU!rRvb%0(~no<=Y6QXuI* zNxr1FB at Ha6jfxYOl#)~(xjh^ZFc3H_WGhL1ifOl^!~?>20c#~4CaGG|Il!SIvqnjE zlJ*a5?~znnuyHf1*ah4ISa7`#ycQ~luXlidh01FHFRATHyUMD72*AO>A$jcTfMKEX zLuTeDwp_^(4 at P}1 at uU1dpd;q~T0n)`?TM&za-_T*7y~Q<8i5(X3uG}8=v%1KiVzPb z+ek_00;57zj{wgA`M02b~`isXGYgr`d`10?rjz5GihQvJfIxY;x{i)BFbgCqkLpDmTnE1Vs+|RxnI1 at MW zgCnkTH*TR?M}Aj(u41kd!KO&L3g-^XfDMwqBk3~W4%}Dx8*oBGdtDy!MB>4}<6_{f znCgphetS9Y=l3++gj|3Nhe=pnI at JibggEX2PXnJX(8hKg;dgNp_MjM>7lCVV3)BeU zN;6wuCTE8NzMY}Gv^0Em0HeDr3>J*z0r7soO96omxIgk8B at +K-cattiJRpBMaC)eG z6nif&N!K%U26QhPf0t?zH$_;7vM(2oH|*8PnXHUx-jqSMjV^)UV;n$=CFXOI;4CxNNi=n`V!9ctQ$8=XG zhf$F at -tO@mL1T1>(1+i8FrjUReJi;2*p!TF%^lTr!k8tP<)?TG_+nfimC>u at QBR~4 zqnbCk5w^=S$V|q zcoBDCmBsL#yZCE;MlZkT(T*`E$KLp-JnqMBOCz{jFb{Y;(((@AR>5Vs^M1^@flx2h=BMj*#}y#vPW?z)df*B at rko^ zcuL$is&H1I!1GlCkvzC)6n!d0l1lYz>iLquT(cBT>Y58o-$RIX*=F}6u&q_~RV at c`>pR>D4I*~Y*qlt~f^>}xp2z%#j7}9 at S5FkXa&C!~kN3nwz?cbX4bI*a5*~9f?lJgEOgjxe zJUBVSvt{!A5Jkmt!6tK?I9XJE;4 at xgSs#xLlQX(fqTeLrB*YN&XqBJ1P<4646Nyhv zt8Q0{1;nT)Bre9d5x87pJVt-PT6`XmlGPKkuB#{V5>Kb)?ebWMC8#IFkId=6v+9Xy zD35x=xCSvoFv1tNb(MHxk~JlxjKTCS_Tl?t?DFaMKo{G|LE_}Bso`2WbBQMeSKsv%VzAYo-n`r)f43rk3^V$rLf=xOv4 e?`eE&iT at v_^t4ztrc#gq0000Fc<~W1VJARArK(J z2O(T4iNvJT;G^*cM5VQWBKY8=h?XWIhHwk at 0Zq6VBtBRmhz7*OAT&G(SO^eqwtGGw zW`y0dXJ=-YI#Qi~GRe-)`Of#-*)!)d=P#;Cf0Xxc15~OMJZYuiNh<|US}AzaO2Ly> zzXh*~TTnzYz&KzsFcBE+DE23C7B~$YQq^-JG5}Z(JXRv#b>JA#37k;XTr40}4LyKb z;G-acmT}~OjX)N75;z$n=6aB;Hj*m>dS-A3%K^5JZeTI+AaEdN%voS&Mc}}adj!ru z4A20K04|gfx1+b_DMRY9gM6AArNaYG5od z0NCoNYfeZ#H9;;rW_BF#7AxrY7}391Plq9NdC1o5p`vQocS^D*yUUU&?M`; zT~)gss85{GKGNY=MGY?bg>%+vQx~cA>*zi2~U_wj=NJ?ufE3**Rl@ z_Y1kek6P!Ue{G;6*7 at AL&vPQmx at 70HnVjHu#f>78jYwqwwbMmph=>dVrbU!3P>`$9 z`Z^YPr*%FYXcLi|kbE}GK>T at 1FHn!)>l^`&0|!H(Yw!oB;nt<^iwgI}02F|BIbu%Y zH=DW`U0_)QP+txCO~4gkA5a}L=5O`QkYC{>>jE$men4DcxaLu{*} zrCV(9`%V9;A-`WJ1y5Qjc+yJ2lU53zv{LY-m4YX&6g+9A;7Kb5Pg*H>(n`UTR=)+0 z?Vf1ZE*W!@aVktkm?#qBo-mwN<mW#OE6RKSI;FuaZy{9;_ZDAk1 zf}68mY6skAJ at 7K{K%7bg8H6^IVFfuJ_LQCYFGRz11Nf|`nq?i!^jgK>^H#}BPxuu7 zg=M9>1ia=Mb{mf`Dc%!usmmy@>}uA%r3#b;U$9!1P-qso7b&pFGkj}2ex&pcgsr9> zD|M6Wf)jlHyE0l#_*RNIwna3;J>hxG$mJO7$=w?g5pzvFChUBxcq^soVG%?Y7&d7! z^e-wb(+uD3T2Xq7{H6D$?shLzQQo7lO;;Pk7a8U8ZOu9&KW5%q$x4prL|G3!k$0)q zGi(xMhEjNki|+WsRWe(JJr++#tzl7ni{5g<2G7C=C_N&4oil76Hj>}EFR&Tq#lnQl z-QKJnu6i0u at t|Hydw?Sscvu4Tc(O8f%Dd-XB{~UC0b|_P-qWp8h%i*dt%$`dh_!Zy(+eQ zqPT2|*fS~*#-zZI)3|EW^cTZF>O(;3!_thlpqGqU< z98>VUh7vO_N+l;*CA-5ND|M4mX5kxXqBKl$Z1D_x at aOH9D&xGPE~CsU1q~7X_^xK% z+f&VWU<3XnKTOk%N2d{vnkvR3e1h9p6Q&!$hMsE1ht0*I3==}krCYBmXC4~Px{sG? z&-_*yCBhUH#)!Dx6aU!K?S9pNYRK;wO2Ly>3ZAr5 at T8T3C#@7bY5fJ#8ow7HEo5#0 O0000FuNJ{0z$^RX{8<7dWp z+7Gb5_XA|{(PAT&#O>b(AN5ow6XJrU88V<;kes{nRtnnf6 zJ7>yXb*y<)d%D80DsX0J_G!ZX7Dk7JrVwS z(er~Rgmm@|8fT<4R*8F4OP1B~50RI?RG3!+- at N0(nO0+5b6#ivwv^m at W z?}Uy5p91fUjs_p&S3U4v=%{cHyf->J+yNhiP6DsM2cwh0$M}oDPr!5FYf45$*Q0P= zWfAiFue!}!mhjYB!c%7nPo0H at H(U#Tcv~88XZ)hDT~g#Y%V>4mdSGO$j8ly}paE9$ zoc$}iX|{gU!X42kNrtb4d!kR01Yi1f7>GWdV})j~qle+V@)Xv%0UBUMpue>v8&lk) zG=*>j^hu)O3*j~BzkqM^oJ$DTfj?@Vu_CZyLhyy~Zd(r$Xa-PD+UP%TA zy!SNo){bll>@(WM7CVDnxP1Sn{&x0+_qWQp=36AH`AoS{bRuY8rPt9zvSiKXgQ7o! zCxrIedXxmO#k(h_n#oFle{x>=uIPlx8qoHxtdrBn_Jw_ty}>8lFSW1>HkmuzYwJ-4 zA7fYZm1r=W^z3%@=@>tl@>aEIFrKX)aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}C7d%}Y zLn`LHon`MW<0#QS|NbmJU%SQxWg(`QNumdpnp!)Kc^}#GQ)t%iAJ6^X1}`^tIltnd zl7J#(@KQk*PWM>{YMW{rcI0vNW6&c<*A~eZORhB7O@|VgpzwLaJjx{KKSW@|N-IAG8Z2iu>=?!k3xi#ki zO99V}_Oc7-7RT;3dpv1b#+eVw%O!V6o;$uF?0d!Dn>F)ZK8Y&uy>rIz>>36ehI@?9 zH9MB}?UJ3Q%FFD1fLn_Hvsr-m&BbYH?_;@kb^U*>!OPfvVBgHzSB`q2Lfz?FioQ(7 z2bRtJ>lN}?OD|JSqVW3b6C598elX`SN~e9>oZR~Q7pKgGzq{%T8-BmFDcblx;~>KZ zhB=#N=7cjVy^Z#P$`l9X{X05buJFm{)+fmP0ci-csRr7(0&))@kA3p9A zUB{m;#yf+Jukqp%)5^%>%EsMuvpy-@jtD);|AO9NHE5Tb0{K~xZUUqIXj$4s&sAtiGk5d=+rhl0F zU#`IT<4#lG$j8%OtpDPo^J?NR1KW+^n=WUa)H(6Z?2C+vSo1G%B-Yk+|rk<2+u*uHb z-y@{VJ9C-(l%lFbdY6Tp7F#U(^f2`K7nitchckus8&Bn(+^4R!>+Om5nHx7bJ&Bs! nE&0B6&w8y~&PV&u&`<6UrS+ayHy()rW&j3HS3j3^P6K~#90?V4|BRb?E=VibM8f!#83(iTbb%+yLwV#v_2Im%eKT4lDq^ zj0rroypTCK&;k6O0$PDGuq-ohU at 34RCG=$ZEE8~GJ}_npda`tw^qqJe7m+5Q1l*W3 zM~I#^ib^rsZ(?_(C(D_dO%610&Ymg5=;L?1sH<|C%xxV;h5`ER6v{&e*(BZIZG_r8*yMw z3Xr&p1eai4t{x=P3Y;Ok8`Ev7db(PGDagtgv1v6L1r6pft5d?n(I+NBrr=9bfW(y% zc;sbSM4Extkm{qrG5quRd0;mF|4xS)V`$E3862qY7# z8^m8FRUHEQ4MO*->Yt{0O~A(i57=#*w1VD_s8`^PI0;R_hk?VYIua-GG at Xj5A5hhk zaT1zlfJgC-31J#Vd46E4eh{}0tKiS{NyE9bY!m;JOU|5vJp-M(E>2(8z>C{u zfu|h6;8R~^5;hKW>MrAO8{m(*(t*Q=0xc=hj63jPsY{1Uf>W<5kN3(_aX69^8X!NR z>@*EdHR5YsneRA!fkh*NdMq65j(*jbc*LJ_rO9z>;GS^I+!Kkx#~gN%^g*m5fk%wu zl1!CCuN3iJZZ%OkN86#7tH0ffJ>o^T_U?&BuLkZ3&&j|&p_bhf#aFX&PpED8gqE{$ zPpDe_mS1$GO(h%mgk#e^p-zVG3CH4yYnJW_&l31rS6YGlQv(^Qoa2Y67$b0zY~2$F zU$Nw#5XsIxp)y0=6OJwS#41;s8=cDT2~~~?98-r20_Ra?BdkV~yC+o5+!K-D`5d=% z^*QV^%Il8OU+UH$D>Ug at vqR?QC)j|n$qe_3P7ikRok?IMc+O*<%9S6-R9QW^RgY9_ z6Fgj-3%&9+ at D9*u0;8~7F*~kC&T(~^7yNTfJsyaHo~nT^eb0f1fC+=}i%kveG0hzf zKE*v at a;2KCQkM=P(e4R_z5BLUbWcd&o^T|&dqO4JJ&_aJ?g@`!fy1TFwc!YaG z7$|kxc26iLG^Kl at 9O0fQJ2h}m40bajDcuu!33pGZvOem5SxE*Dr>X~Eh1I*RRLvoX zC~OR=e1CAOCc1PRZTaIlM#Jj9&9SD?BP%O&i4=P1M!2s+^>2+6$uA~mreH+EHikm4 zECG&+&?8VPb?V9GuHvI77JB6%|NC!$!GDif at qttr zy3V7pzgy3x>C?&?+spGbupfViyp;;j;u~vvTIR4KEi_nuv0rqh-OI5hI2|?v%>u)o t(AUz+p|{r6-4iqSt6LpBYt2~j{{VvF&R#R}Hm(2w002ovPDHLkV1ip4=@|e3 diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_lists.png b/koha-tmpl/intranet-tmpl/prog/img/icon_lists.png deleted file mode 100644 index cb7b762b4465ca875205c75e6f6eb7d994b88d3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 826 zcmV-A1I7G_P)9D^+M*3J%dlCnY+V+|MP5xeK}X?p|JU;eFsiI4(av zdHn8o>c1kPM1 at lp{kM5*<)J8rcGS0J9%1VmY5ENv6*yGYFVf_3JJ_{BPehhg^{2I23O22>j(zW*11?y8#|Y;a=NQ@| z at +)r*Rek>d0UzR*9Mrf1jEEOysw7&pDB=l%xNm~EZx%}2`R#ccjJpAC0IS2#?>xF# zkq}qaW8ioOE>dLnVlueD?!yC6b at a&vc6 z-#Rr*!A*KX<{&*$Yh_GNNWS!hDyNqt8qKCzdcxJKlvVWK)2~bj at KHDd_Ds&7tEnR5 zGCiSes~Dyygo>!2^hBEYlif{yW>c{KSPr6ygB(sqOl%d&ke>L{FKBw=bu*+VCStYY z^)0EYnx!WqMayLlUp}01dZNB1)kw|L6Cw~r^lm+s6=!2T5 at s?;pqQn=$@Zhad zxpj#eDS;3gMNCXk9(qe#ctCkmG&V+v7u0swR*I$K14w)^Y9MI12_=XTL|QBev4!sE z!A)wz39{duCrsPv|I5t at 2=D~3(*ibK>@+!~ zDB!>tpgRxX~kB|w)k+JV31eEJ^7a;Dj&I_>H(Xa9;9V*5Z7Kx#1He#{(J(ME2k42WZ!p&o at PKo0WB6i{+3q|> ze0Nf=7enRSWL)U>_jTEK5`_|0zY3j`oHt^rw_( znqC2Ujf z6L1y#iij|6GijuHqS(5&t0zS5DWREZ zd_jv$7g&XVhJHhq<|lz&3hQI_`fWbGIe`lz^P8zacv;|~T#OaILV4}e2D+8-5TU^< zUY9ZB{-6W at Y}-l at ub6+Xm2d=IO$DtxHQeEfo&invFtrd3L86Ig at ypJFL~p;I6_c`7^JUal7{Jl=K&UcFw*fIG9bGho|+?F-xGIe at lEs6vE0tJh1J z&3bPIJ}|_1>&a&n68JJN{NFq?%6e6)YLQ<2nnDDA1Dc1%@cw77=($_~=e#NtN(Wg4 zG$>qeE+387>#dpkC1k%l6m}(EDqOFyp=6NFp=bjt8Dz7!QYeoD`9WjY8|l6kx<)e9YENdba|EWuu`Zm5 at X|R z0`}wAnslkMJWT(fOy4e(Yrn~DEvuVz!CILq%2JdFFb?=4TCZtOt-`3PMS6fofeQ%j zD!d!3)vR+p<8l~jk!poHf!kd`X3;p5#iA^(YLTA=*0k5_d+8dd9r3C)Qj4-CO}`_e ztURrJxua1p2 ze4TAyEr?XL at SrMBs}K?Y-xD(F+=Mt&H#X{DR^Wojf))+{cVtN%)XxGROPr6|8g)`ZXPQWw>ItC_r5~YBl|Ga{@%-uu zjZ=%>ab;-)yx6*G!T$zR8lH at W`r{M;0000< KMNUMnLSTYWdP+|K diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_reports.png b/koha-tmpl/intranet-tmpl/prog/img/icon_reports.png deleted file mode 100644 index 4d63ca90a0e351004a168acc1cbae51b3e2c16ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1651 zcmV-(28{WMP)}3zX at T`7!_*g& zq_($(_2$4(38JE;Kc3s%o%lk;L?JySL9B39Od-r75-LPNEU!WjBO|lBFcd5;b?4WM z+0(t)!LRcU~*8UpWc4O;MFFeczVv!XJbH!FyIP&4~&Wp9H<6% z8vuj_SKuq4Dl#}AxsTB#c@%I3w!{J693pX4a0O{v9RWG at e7ghzPKr z%1sF#1fJ{b0za at 6@KEeHW_qEoMnCYk$^c at jxgs*!udxVRMDD@;s4A^tz+AsZuRH!! z`B;o~pI?I)_>*M>F;#UB+(2=w zLgYVSc!)$jItxrtRVPA>lJWxY2JVO$cRR4O5MD$YfeD7OdPd`;y=#ky`V)j3rVGml zoR|HWCh=H)7ce=pQxIWJ%XxAq0&E?Hn?0sIc!fofzV z at La$#z>%1tuLExc$sZa#2VV_r&OLikp??7$3kz)op7#$-2KI#n{sVXosEq=xs>RdV zpc0WOxO0!Efk*IPEL;S>zQHvxC(UR4q|6iH5)le zVa_NW)4-x>n%Zw-O>w}!y`TV-`mB->Hz z%&WI1QOQ<04cwb|Nr%GDgvE!Mcl7rtxgvolTV*=#LDvl6eqgLBt$SDN>RkIJ;5Lu0 zjtU=><;}fm4Yh}E{HQEzm#Pchyd>}ewphtl*{I4P`Z$+~pao8XZ&S963fiG0 z`20;${e#6W;N?hYrKC)AEcPyIm#QF__X#eD)Lvq at LNXq@l6vAo7n_1y*e7_hja9&c zSdaorgk`B#nN{jKU+~3kGFz2*W2Fix2R7Qa^m$Xg-4lpd6?RXYv_iNi7PpW>E9;(+ zFzyMFf#IH5VjH+8o>?<++!NQtz&#;4aNHAW;+_y4IPM7%1NVduxhKGKn4`i>wL-Wj z9I{z8a8D##qq`@jI!rK~rkctNJhFR2h3(U_EG>j at Y>`G4GxvlDs>%*tXn+PuVh2Ei$IDa`*L5;LiN|;sHoGABwg>IrwcobB^63pk3SPXIa-QIswEnGv9Uaw!!vJ2D zV^gzi^=k87;aCl{1E0r(+gkzQvmz|_8-abnGmVhi$`v9Ks%H}=I zdcwbdiM_*An>0Aem%!L~kbB9wUQPY}m3kSV$(9k96SRwR`?YFPJ at sA+wCS0$WsD>2 zLwGbs=o<)c?^&hm!gLP2TRVS~RM%c)J;HKa_fQm_wO~o6S&xJbV7$$ov}H0DYk`F! z@^u00t~qQukk%_9`rlOO{qdA7Q=9~g&|vNfg at cJYcI9vUM^P*%5{qo9ud*2LXwE$$ xT(zJZp^FC2WEzLu6E`(zPu+&V`&)w+{D0*PiJ6Uy?BxIe002ovPDHLkV1mw=22}t6 diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_search.png b/koha-tmpl/intranet-tmpl/prog/img/icon_search.png deleted file mode 100644 index 7caf2d8f0a5825a3025bb13bb344babb60cfb6af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2004 zcmV;_2P^oAP)XMx?o9^eqr2FwFK11t=LS+Ak*3aSPBg#y_+II1;FLL&H)9SZOtEfZM?Phbl;~S-=Zc{da+xbq5Dpf#X)g z4^Lv2wYW90DrNHz7#dMKMcOXDvINt at l>MYxSunf#t3jp#17~IE6)3jG0usj=WGIA zw;J66q^g9z0vNSoe68+XzTfbbc)6Z$cpEUcLg?TK at fE;n2)GaMAcbR%Vc-tnoD%1^ z0KW^=838WF8*Ltlns(KKPXQjK`0Zx|*a`du$O1#aJArc)Z*=$t;Hy^ITfq5s1-E{{ zRlvazuyWh4fo8lnqTsO|z|^{f`|#6%hk^f=fi-?Qd at +zde+xNxu$H_p`_5TPBGQ7_ zv0M(!2KM9ixO-Lgem9{lM(Rg8T4O{QM5WzX^OS zvEV*@+RyJG{NI6#5)1CbPxtdXY{<}-Sa2VH2Cy##{s{1?;Q5JJkxcywREfZ?q=B8?6cOMyo3K zM7JwV$Am>V%okXITJ8yDmk7IZ!p@c`bwYyp8B>P7Q=FZ!vF&3=_u>tLG~01ZX6!Kn>GMAI5o|xY6JIY^(ew^ z`R at u{*Y`?$G|Xa+?VeEX{N>l9t>+K)6uKw0p6-cGx6nP2PRHn;kUE+W94T~9M7`R1 zsai|yT1Rjd%RM2ruLL(uE_6 at aJOe=IxWZW9v6WSp6ME~7|?g`^WcTaS?h3*N7;hxDW^f|7u+4}n3&OW&$O7LL^ z7x;w#^~7k7=cB|4Qz-a!LoeP!E5H;-c_K3)scHge?w2bR?y-t`$_>t{RVerqSshV_ zZoHLZfQ9A&FLk*xx00aC*2oHD_&wnLSY=0>VO<=+d6gZHcdd~J5x!v+9S6SEJd4M| zo(>(Zw4 at v!0j{x%Phz-SQ(P^|?MCQ`-SfR^?`dId~p)fP=5S5f=a#Vb zM`s#~{U=x?RWv;@)T3J+LmSE?K)DxS1>QjD*wmvp4z1E7Im2N*kBY5 at W|$4GE0L#1 zB2DafxYFVX^F%!NgbMpp!tRsju=lBZi`^5MwKCI;hPx+ at 7`nG*t9MT{Y(*mTLz$|> zY*gqd0D#S6Sl*x252}gRu$ip>yYwbEQkjB#6aTkOiDW`|9{b%8^Fb_`4U zvwEmp{c&9`^gFnxfzJmH{Z$>741P!7DOGn|rxt7o~no zIxTeLU(l_EX)+xXC>F$37ezN#TByxXKNdw8m==Zzir{WsX)RJ*42pI{Z8Q0~xamwL zIf?fsXHJswJ`i$q&dGa!bLZTz+{Yv_jzq%_&@Wl=&}6|wlLZe=F3BJ>I|sbD!&!PF z>DAWHiGl-%fS3Kp>7S&*TlvR(itbF(Wjdz~{=1~d2hWoXGy4>H&DFPic1|<<-ZAc( z09jJunkp}(En;T-y3|U_x}>!BGo=vmjHa-I0O7n$Y!Ivey z4q#?C=zTc61mx4KxQ(yUeqoS*?)fF zBm;d+m0QF+ay!4atmEy3wf+Xe1ef&rpf&oz$5fdEo_2Iyll0}F^}FF?s?>nT9PK}N zsNEGGQ)SslkhJ)iDi?w09bM-oeLQIWZupogr+|kX?Z0`b-4!3f*KnW6?t7 at +6(7N` z00$iH?*SipsPDwb&iTfF45s-biF=y&V#rwd2dU)BdJcjA9%$Tyxwe|Y-xM2 z{Fh_=31GjY{W7p)XH{45pPNBiZwwwRf7d=(lJ~8d1lQ5vr{?>##Z0kv_4jp{Serc2 zd|z+xaBcA#@!if8Z~=G{ux8&kJCV+XnH>jSYJU8-qrd%8ikan!uQMKX)Vl|Sc=lp! zKdBv&^u at Ljk~&_%Vc?f$$YH)VfHSU)9b0_!Pd3{N93wutOylYPG$8_3fvTjMYe3iF zqt4jgEN8((lLZe=7Cbar at X%zzLz4v$O%^;fiEa)G at 7OtPxb{S~*oQqKT9{ zkT}0s8ex0l{syNahdnX*$cWn$55w9X$BFFE=@GXl8WC6Sy6lP75w|C*#oqSBEvV;} z%$`sb(4Lqr+rf>f^OCn-=k{mwy0bh#M0>)-Wb>hThdt2{Crq98L~ddf>h(of3#wU5g#gcRfb8!MEPn-XWBcuN(i$Hwzo0CF>7!DV_E_235#u% sRhyuCbuP0fMuRMPXtLm;$%2RGU!9b9Py+Qjl>h($07*qoM6N<$f-|5lbN~PV diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_tools.png b/koha-tmpl/intranet-tmpl/prog/img/icon_tools.png deleted file mode 100644 index 4273cc5280e6f8bdafff2baba9d9f0c0c588522f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1442 zcmV;T1zq}yP)O~vEUTAoeV2MzW ze`eM#OE6i;F7iUUNZ8%hao2>TLc0jNFr$pzT}|;OK{CYj#4-NXh|^Rt#kV{O^j_n zeeb)0PDvYqxxh)_p^(p1X(qq{I)QJd)^GR4Jm5rF(lo%Y))>FL#`sY)`yni88Z~~s zj=7hBSEEc!13dJa4BP?^18dFf&q!I#EYSlv1z3&aI&c73RCnHlp;rMD0l<^MZs4AV zb0-MB0QfZk`Y&KZ)ASF=sRf&sq=mq at Q%zZ^Ux4Li_FF6qO(~Wekfb)?bE={L0Sa+L1M!p!aD?Ex zektxAimk?hoi(5jBn90xIOUy6(4FxdkWUi4;pUXI7`P0~_l2%dZpPmmN*qxQHRsgU z>lD?{H!0uF6NLuqFBL$PuOLBn{d|(;(Nv8Cr5ez0r3GC#I8dOxC-g&q0k|~5BR8j{ zWt6v8clkm;0xQg{*4{D^MQYBeXCJ4ihQ0x;Pa7H{fJ at 2)Bf!JHkO5mQ!j3!ZBB*RAy7&iv2|S*~k4eSt4~` z4zs4#ziw%(1)jEA;AyJ`p0--xVd^PqN%v4~_e61zdW)ruxhHx`>N3YgthReXuvCt7 zQQ;E at UsqDQ=QwK--4n`X#68jG>U2*SUB$f_a8G!RxF;qvU_wykzt=9TnYr1D?7)O_^{{h;b_RDhA!==q!}95yxB? z;GU4O;GXapM^&Sp&ee8Lm}S5{;c{H{g1`7+_k=h))}I0Q#Do{!Jz;QZ&SXa16H;{d zM9yRFCxg-46Umo~(L2p^gd4zNbG&oB&#u&yH_^uv#l2c3k1v6oFXYJ>QXB7%yl&ST z$({o(OiGr7amaC2 at P*5aH6yC-IQEdO*cgYJo*lIG*W^N*wyUMeowJ#pfVjJqe~Rl6tVcx*9d)&vj=?u?Is wgTT)wK6H*XQJ;Mzsg`>pZMDGD)*TD}A8gHI(_1%*Gynhq07*qoM6N<$f_813fB*mh diff --git a/koha-tmpl/intranet-tmpl/prog/img/staff-home-icons-sprite.png b/koha-tmpl/intranet-tmpl/prog/img/staff-home-icons-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..4660df7fd056921e23924141116d2f6a4a387270 GIT binary patch literal 11151 zcmb_icU)6v+fK+JfdGLpf&@$eSt1fqAc`0uKp0X$MyRMEC^%3tA|g^7AV?TOz_2tb zASx=g47K8F2w at m;RxPf|6r>K&YPH(8-+j{h_Wk1>wZD&l&dE9FS=V*loPdG5L#W+H;DSx|S?q&CeckJUD|`aK&C~pOX-hUHrEN_R zu0r{&+$dN at 4_cp)yee{4!pd!%F0Jx{kNDxCQT|O$O+9y-POHn|Z*$G;@$qpN7nh|H z(!G24dU|^9j`U<7va+%Q0|S>XT{<;2WnyBo=hT{{Qj0Zf)*SgZYhrS6 z>h(n7vB-Dtet!M))b5t$OLAZU)NjB2wjkSrn3orB0p}l}P;h5a8k*Y1_ z!~n?r(PHP;R+S@=(kxsaBtSsD#XLVp^W;pd&otYvW|V9|i$HG>8JpSBqyUR&jCo#{ zAq~Oos^kij9jKmEM#1_Eg%8l!?@(km$4MKH;b8#iujDwIJ~U|%nz~4IG%dul3bM&Yram#Nwet^{EYYWnnjOY^ z?!6YHL?~s{RnhpYgkUW!`LG04vcruEYdS1!*x_NZ6GZd7gwsfHHy#b7GwA?jkB{hFCPzj>_amzX-F^FOi;Lvt zu+q48`d-?i&+CUqsuKN9gV3qr<<@VcKFFBZC0G0G@)yuY#e6jk8T_gPFTMT?#jE*- zk2hgDT|`$OBFFg}UwSRCCv4)L#lqB!>qEjM22HuU4Op9e{YcOqIYHulsVCo^L)2Rg zR{kFSh+vl%P9lIsq6Zzl(L3B(42Js-bcAmdn-e9reSafDhhP#QOe&JNY*v zAsiRl1sNI!*&%F+{oAo8b312cI|9l)S%~0SrZ04w;FQeysnT^j0_joO(StK{8ALL> zT3zED)*^!Lm|rsCF&b12a}}zzl5dn4qe|@r6}o1qEfXIz`6N zt;1NkarU-oYz#)MRvgF5u=i$l zmNdzh;m79(*}jHW4RYdYqi{;RcKEDt#`S=YYUtH#*%=ZbURG@=aPSCL!i2;^$GB>t z%v8H~5#bRC+qWItD#W5318uD|a&XP$R9~M~dNY(Bfd!(d*I(w at R;r3+Awc6csXooh zp*tiuPg<@86A7eHlHOof#gE8HWOlFmP~6HJ6qBk3XWiB>U`pXvam7|mj82zaR}5Xm zSDSZSG7V&_3l&CoY?Mz$kQLX0zF`1z}1^v3ooU%HMbQtr-tYh zF_{I#5Mi67xveervV at _90$1#u3{ZYTAQIm!7+z`0rwE19E(sY)T$2v;bM$7{wuB^KSh8bP&PqG?2=88rgp6 at JJr_j4UAB4Thb9p{TPu7XE=k=Wqp;Umg5uVm9pw*DRy`Kmn#4#lqYPky`vpNdbH=ml0f)&7 zffxV9E1Pp5zDcvp`tii=Kv4~fexE?9deslb8{$H!wIT&4^U z3B+?x<)1 zzmIxFFzBNfkh1eKEEeOt$0A{xLr^P!-6ljrN?}~OokV9-_}ZkgRf3K_F(RJwn*KO( z7yaNO>taPOxr5t at Je+l0%O+0CYpo(@e>r%Q_AW+W$*qOBu>e_%IT^ysEn$E>BDA_7 zWSaY0R4YCj*c^1M%&=u%0U*xL(r^B`z3d at C^j3GFB(ot6P+)( z|C9xX{{);4!L&b;{QCM&pl zaS0W1Z06$v{s27;Sx2qDkx}Gd%F;DR_4 at tbn-QI>?FN%<_Z%8fX)7?15D^8@;Jp8L zrvE3}+ at f4vv}#IYG5ytAS!c;Fw04M4S~CM{zN35uvzJ@%%WN>!MuKw>mU|VFEX_tD zv|U1_&}u(Rwnoy}YN6dp29Ac{c35t>z8IAcn+D}Eng^0$BKF%VTpoZ`l$io4L9E&8 z`M9Tlq|1__MNj?KXz# z!hy^O&EjPX(>{ZoHNiBKcf0e>39yvPIYvd9Z+Do$`Bu6r^YF1SKZ z7Zd>zrRN_*j7*ii;7&xmxeJX>OrTC!ZCPjlhSRjLcH(Y$>=uX-&(-)Qt1rGH!_%XC zJ+b1q*JF$SPUxUsAG66`7VYu?R3Sn8&HEknqtgx`2r25Pm1?esr+uTj9-DRqt~s;& z=wSe;kE~NBnVM5DfS~B0_PI={p4{{Mt)HQhh6M-ps*wn at 1Bu5#^-=4KWofbu9`**n1IWLggO6;QA(+Su?h z at Fcurr$pX65(&rQ^IJKX(#+nq)8Wa?cIP%kr9>MwI at Cj@{YSb0Y2ECy-VQza*qWN7ID$0rnL1M z!cDYx>Z^$FUja8)?_t(@>#ntct#)dxJO9;eS^5MgruVUCu62lxZrj2&!Eph5x0%Wtk1$L=CU;QscLUw>nAO#4s)57;3n;|nsFGe!$8kLyW@|Cej zvz;jyy~CM{Q+NFXrgHjeM|VeIW$eJI8PMo*mR43I+rWCx^qWs-0XfyD{=a$o6qd#D z<5P2pxt}dFHcd3H8Z*olR%evyEQHmjxS0k#aVCaLDyu4+bvuiq5M#VeNlcanG${?U zx9kT)c<++cn^Aa%(Cq?dkmF#MKc9mo at q4(bOzTbbAK9SZdbvgGYxL>*71LVtR$!k7 z5((PEG)Sg8-rS{^bPos;42ScI7yFnU<}y5i_!#|rPtlK>&_BFm%(zl=axLNfd8%+F6&ZKZKfF09I3p z?VEK);;oPVOaT{GQ(M8Wg|DVWTOaT*Wg(&b4*q}C>;8=5|Fx|5UqAD8 z7#p at nu?qp%I{AtcN#1RkMm_D;GG!hE%p0l?WUIheejh_Ap-HZX9npl?-uEeVbsUSw zk{ZtZy*y|pNTlRAnJMR+8$?444j=tM_~unXy%v5Yk}DmheSQBAU5e}E=2 at MDBVGm* z5ADN|mvwS<+8#$Y`?p+!hEr(GqwkoJJS1z_DfC{Q%8!K(scKfo_8p$74q)O&mJpe! zYMf$kdi5sc0clj)U at h@O5;%t{EsT{W5AkCy@|-s;gwoOAPfl-mV1%SmTEE9lAEaYn zmc`sX3O^H)C$hRUheAEhBqgj2G-FYyHN(;Syt*SDUZgk#%cj3bV&cbFgXd!^0uPT6 zj6?Vp at ExWJxb&HTP@^#2 z^vn}$p8aqg!tAklqrr4$f-${Qf)sIGD~7i$_ at fI~nOpWo>R|bp&xQBcW5`QcuD;tU z!4PixlkAi3DCAMdExfpnRvzB) z2Txv+{Es|gk0iyHfHBIKcUc|R$iVDQuXcln zngK;Jac0$F+H>>u1SI!PGy#=tY+;*IeTV3luAtAxtt;v4=a79L2~kke_+6+0tjJri zhKXkk?Bb6G_WMraA+j$y3)OwDrUazaOyjqcJXo5V&>HZkWJdCv!K at IIWHrF#|}gl)*bMK(&D)KuFvDC zRySsL=>`R|7aUjTb&S15 at 6(%5yeh2S8VFim)-IMfQw$o9cQ{<@RJr8*@FfVXSXwrK zzp|#SE%$I6bE7>h&v>+Usb6)qtZJ5wll-SR3|TkoZ6S(5RQv z5Jm%ug{=;pzZ(U*gNtF}UjuC%ae zamc?m2l`Fhz$+06dDD%d?$S&x at n=2VZ-ne@$D}rmw25g*^5H&_>(5Ff=z at p)tfT7$ zZGHpT6p1I-ulcQKA{M at 2|9G)ugl8U(p8F6wzmvE=FC%r8H at LmE^M493!Y6s#62b^D zncL6EuW7ui3RpoC0~39%bQ>K`E|`4VKwf=??>Tofnx@!SV`cdGV59bNkfK+9Yi*4| z*gV)B(n~MTTm9JYtO}NR;UD<-L->`i7?^zMHhH6I;k)Y}uw-`gvbUZwMIBf2^#x#M z7y-%TTxRcWr{-2LvjLp8cF8I8oLXzbj#&`vnDo*cM$@KMRDl_f+%NVgPM-xmG}@eM zwA%UbLoOEd{8iSN=)fgsTSf6`C3q=i(?TqZ1xF^VhUO##V7A5S;~xJnX74Ve=ZoX} z%OMX-xS$piGr0zw2->}+cm=D;0305PN9w7krQ7JTQP~wm zmyM$IHPt-6#p{lG+I%r`);XR~;>SwkLJCi9_OzVyTWK^zRA%k#9=>`8H3EGL;uCg( zgt8?NcU4mfnP-`4L$ujVHNx6s0l|rMN#=6rWIo8G`<;S2(atmwBY~=TL=rx`Ygbtz zG9kBx*0&DEx9OH3+LD6AoFC`5(P5b0VWHlhchXItLBO(lZf_mZo7JmeK-zM5Z=S$= z?jpz=o4Pt?6+Oxtr`tiU+j<&Xq8pvZ2XDct{`^ z8S2{a_jl at YZ!2Eegt0{64gy9R8i~{f&(k%r1!amKNjA81FdhEBqjx8SY zm at r4lY?k4#9K_R9G`;1FirM=@Z&@tYv`s3F7RAX7PEkSsP<@Uxp1x1+F}W3M0sMV4^q#sT|c+ z9U+y}k{7*6lmi;iE+%;IV65Q~bBKRWcbgABs(>haW+}}}>OyMVSGu|dFmoC8Dt9)D zto1%see$I3kSXlAm51W-X%m>V9di;0nduudsF4{%3|r} z>HKqz?P^Bx;9j7br5WSEFU`zPbE5iKrZ58$)@a~pvq;{#H^K$ zf*WwoQ1{?49TUbd8aVN-?VVgt1S5Kw>6&eh(ns)r0R}YiGUdX_oG(qeUOJf9!8r!W z{Hg>&pe;B9fkLu%b#iG)sJtlO@@a^R3P{liuzF?x-5H$gFLpwrVmmrS&F86Ii3cr@ z6OgUi&;#Z5DKEnybEpMVL-N3pURdYSjU{avXP7uwYhOboI8nW~+Etfwuz}ETX3guK z4YP`7EwFie-5?>sbYwS2iUQB{SsyCjx`^u8cZQ={+4A5QU8ImfFqdv`?-DaEWHt+f zLXo5o6TD&fs+H)kuNx)#SoI_Id-3UYi+Q2qf}ovw5vEA#I4Abyoa+(V0p>w=c754g z2hbC*2xB;V#rvjW; zW1^{`-|J!JdGlA8e!njSMmi=ZW(Iyua)CrfC5kA?kp&f{CNAoRI at 0y$7N)~H8~oxu zN}=yhKC+s$++y%-f-(CV%r#5Pg;OHjEFFh-4GLL3)9|nUS zkH(|oSm!$-M7@>y&3|9J+#^dD>gjkd=&D!oHQj% zf!EeufstZFgJ7QS#oamE4(RIu68IFGyfY#05D_C>0zMKq)crm3 zUqi*Z(f$n@;#8vjs%=w9%|j)sR1xD1^fbho{gb#d+mFO0l-VJYCT}n^Ei<&|c_3xv zPdFHcJVEWOuv6J7iYuK#Vm(*#Bt;1kCIH2qii27G-z1_S1SdpX?bx|}J)FuJZpPV0 z8UW&wcD~V?bPBR9+{|A(vC9?Mq&BD9Gr!;GrwQ6W&P)6 at Py-ISho^Ptq18)G#(wBr z>8O!$wGNh?K+ ze>AXQ?0i7R#%VB^WRtEn?EEB+OHvK}A^_&_k}*OM2M^v at 75BsSg>G3{eOW1I*Gy#Ky!>=txFrE=AWTB_SCioBH{;^>*RtC^x{-(cc$G zmA;zwOR5=6-!!wfaddDbaH&2HQZBTEgZ`^12B6To7i+r6H>-LVbfS#0OqH~@ z5U1Su>k|Hszf5&BOD15<2EoAuYR*F?Dv^zw}-x!CKF=kfr?UAAeRl=kV0-wrrXV97h`P!dbr;tQ) zB-bi+W_}>-W*Dy>rsUrfUVI6<#V|McsGz{XtTp&~;No@@WM5TByJlD}A!(7>67-hw z{pL)j9rLG^1>?v*7xPkKdX5_98&5j-9sFYeq1~g{YpqhUunl~0n$XZudib0Ccz6R7&Uhz`Z>>O`4%#zfPw at xsd zp0M8uc8JyL8T=_5>z%A-*ai0=!z at oQH8tE2kaCa>aR1knWem!ZwguI#W7LI$zaalG K&Iw&9*t>T6#BKw|wd&$eoo9}n#zL&f}uu#FTO9=1YGiT<`ojG%6?m07O z&YXYoa9df*`R7r}GaT?t)k3)))UU2Q|KdSIJU=s`_71M$YT{0laK|%#Ghoh)#H8uT z**&gKo|=;0zi06qZ};qxGP!@xQGJJ;HDt!XH6tOznMwCwB|7xeBud-m)zXPr7LoGm|pXdZ&!;efF7W_2xybdYD&TLUl4zW at M*i zr1wa?I%8IL|DLmErA)ryyz|bRa?ZJZr}XM~UQ*v)XP=$ir`P#s{W`JNJhGY;*23fntme$GOtWalehNh at f#3BhFow-M$)XbPCz+okB=B{RP9To)+D{(V-HIwVGC~#Pbo4Ko*T!%%0!%E!DUCrb=ED9V};%4q@ zCf8w6;II<^tK7x>PIy)*Ii0DX+06MUnKg13npvdwYD~~#{>cj8&5Y9NCN9=o&1FE2 za-J$O!M1JUGZWLZW+Y}Nrzc%!Vmw_;%!ypvs(6*D5>>j&QZu+`s$}3KbzLZrVv~~G zwKkAalPxEY6HJ&{Fejy_ZGHGeQ?6qghu!5S+|pdRgmP(R!py13Gd-O-vsU$UY?i5g zrAc#z>OEx&F{xamLr*!FKQ3NUkLhEw9?LbHrmw;DYQUI0s|hP=Oud@==iV*RO~q*a zW8w^DBx|Ky%GA!|GNJC~+Qh{?(ZWOw<_e`;7dk)HMyb|0Ai4?m6oJkZ=-2bOT%x%Q z7igS7Qw7Qt=q7<~b2;x84qzHnF6KSQ3gk}W;!sb5;aN_3PnODtN2c)COHET5Dh+Pw zrBdLR48uXa3>RgB$tK2>)?^WR;q~?Z&J5*Vj}Ra-K{!GfBZN<%m6}RO$QI2EVfy5( zVOL)xMGnQsC1syY$W$smV at 8kEjP$95&A-9PQ?et&7iVXrIbk!EtKz0k3&&G56`hru zl9Ze^GIekkA*<1QqD&m|?&dScXJUKl%Gch}PG6)ra-HhZ=;#N*#!AQ)Yw5dI~9qszNXJw|wUphLTS49xN zF=j~C)Z|8(=)~0Q_{6D=aIs0rsj2bFbFv3zT at gQI@YT#aONK4N=thZKPRq!={-V^B zsbNaBb1HvD7|oM0lar?;&PvS&YRW_AcEWDjLZn)c5w2)`11M) z9#KOx(uLM7vomH4o0XlF9A*rOYn2Kk9e{0fbw)M}bpXCKO+0P?9DZ~K84f(2N3+=yz0y7E~w7ZJnZA9V~YTOK+sl zTKau!0Hutw%s&b&|J+p06BQlPqGhYreEu3oTFT`PN48g%$8x(ouBe#k7E$gt=MdS! z?K!#Q*-;mbNbGdV%-lZFo$vYM3m2byT9>%LUVYBFncmL^#{6uNU9zP#DXVYSKdsC= z{gQj*Ctv#R{}jO`pO4i at A7p}E*GWsm@>sgNA)#DIQi_39!fCtlul87a_{LZ zCHQOHXC>#HcJ-D_ at 1lWrm!zz7OMezE1&BGl at 4KHgH8bt516Qrdw(@mE8J^ zXZO8%e&zp-J!^05lv&vWPC0IG*SFXG_4(6J{jzfLSHF1WxT$sT&f73=$)J8;ZCV?HG9Isb>Vev4Hyk(K{&uH-;%7Jgb?8xYyA6@ zRux9?{C4!1g1b+8<&0;0eqQOj>AAq)Z+dX|^?!K0V)>xUpG=>3&p`dzml?nFe^9mW znA)*-t>5+AH{AUP-!(e^gtSNRyZ)v>Jh!K^|H9x66%P!kdE%b+Yd)R$`U{oUfA;0L zFPFvs-96|Pybcg#p~uicE0}&{|yBj179uf_52qfRA{y2xo_(Fwm){P5)e?juI6|diX zLjSLeXTLhO&mYEXReJ8mJCo-2ukC-FR{PF4{iap^w{Pn^Pk*^*- at bd-Wjs;&`>WT@ zI(Ay;nE%`G+T#CP at rb|o at 4kBNrG80shYc(2JjOrl#V1y6xaG6AzDexga?2lHTs|#h z`8`GRmQVj~+pvm}E0*pS~X!y*e=a-DrYMgJ~`l5;YtG$cw`g%a>hDm#0 zI{xu5ugO~R(WX89mPSuF=C(E0rqw+ at z3t+z^WL at NuH5{5%vUqdA8~W-75!g3 at yUl5 zj(Yu-?XTbY=(i6)yl2ZR6_4Jl)g#}GZ?oy@!IfX{-cL^rxaga*xfha%c|h2J=^_Sedf!mfq!{5up8Y+))%?cr zld!p)(YnX*@X}+CerKMg`kZz4ITxJO=Yq4(?Q!4#SRML)vJ|9V#2LT|@b;t_|h4PK+!+-xK*3No`MeHRLVtm4AF`OqtDHzE|xY z6LgEgX&E!*yDV$sQYZNr!;kD5{p%4533_s)n9y?~eGA?b1`c+YM3S=k*Gz+E9{Atn z0T}~A|J-W;8WhIZ_{7Yq$=P;tc6LhoR8izaW9yzBF)4CMO7^tm%!|^{Cc{#`j7VKF zGg4DCP%nlgW?^eHJTa9#l0|tTQgzHso;)i_ELAQ_or-3cJq-gAquF(gJ0M0Lu#;0o zp=gzoPG+fzNy(GLS+x??&pcG0drPu1>PS{dr|iL_?Pe!mZBI*?l07^*GYM;z2z9gd z^{6Y8or*NlQ(KOeh(YO7GRQ#2^Y+PUGo~eGrCgspGC3(bBQq;pinjF;qN#7(c zR?W>Qe|ctlqj22h#_1b<-R~xFzbU;i>)}?b2lj at 7EcqXj8%PZTYXADWC z1gZf%_>8n=Pes}(j`$(LnhrlG()oY3mBdJOTN z;X^N%&-QUm at Lu>mp$D6KeMlkgkYv)Xp_xjk<{vJIO>X&tn7 at bScQ#BHcD*dRLf7mT1Kw;qZHFql!gut(9p9z zp{XF at r>-)ua4{xzGVPK+Io#VDktUp8=C(REq%}3C_l4M5xUtiIu@|S#N{)!`ykGR? znatBf#wTPY4 at yg%ntV}KL&`A2MdWSL3{T9S)@c4?|J?0t_$idTbgwp2)gP>2C#m3| z^rX~Tlat3LXTtTF%sbWh&-RyR45l{@%t)I-w}g+vMeA}=>g>epvM!oD`J&Y9i?ZRA zt7ka_p1ilCFteR_Eu-iUzP$x$I}F8+F#Lj))RgS&nrsPaxrn5rQqm`9%&sqIY(pjq zLkEqPQc5}6HlT+jCWXu1Axv|7*40xoQYR;8hSMK&$*dX7v_V9vfINJ0 at -(VZKY*Fa znYO5ZR#Jr;C5G9|G-f at gqFTt;gLzOhaTm@^YRM3ro*nKy(V at 0dp?jy${rJ$m`~G*b z?C#L at pn0|oJ!6ILokMq5=pKGY_}vG*Bb2Ty?`j|7jDZ<5t}`=JVM4_UrZK|`X*$@L zs$yz-Y1)kJ>jpBB7ycv>M`pt3LlS2U&Va&v48sK at uH%SV8QIAfrKZ-iQvJ6koF{X7 zDU37OiF|0yG_8E0+6+w1$dc!nMy!7#n)V%N+u`PJV`pENnw;f~wxMUGJkf*FCx^a_ zp>I{&`nL~E%nJ7-N!l({FPSKWJt9lcuAW3`Vij7?k*xR6K(Zz2DT>p^B6yiq*3W{!(RRFmVmka7*|np~fBWNL~2nzK9E7 zH}}2Vf9~)}v{~a}1rchv3k)^Z?MID(Jj=gBrbZ{>kRFMX(^AqA4_L2&ZzCx4EAr|T z<`LC{v2!vbXbLMtDbOj~tT$!@%bL;tRBQW_QSH{vQfL0Tc5s1z-Tk=#!l7E!`4Z!P z$x!Vvp_)5(KdP;l6#P46s>Q at 5&&bHk&WfN^XP%EyaeP^3K#fdjb08nJ`N=49i>VJ6 z*R5Pyao at oGw9t67QexdbOs^_8e6(yoitLsY{5xcdw7Dp0=B$*g6yYB#9@)E&C)kED zCrQm@%n`nkHARPK911q{wAMcvh4On)Ecxd;iwivCx{-UBXNF6R`+LJPuN$73upfmE zpJ(jk%#_5`19`@VXJnlQbrR$9NAS!q_M^yl zNx{EE=9$(P&B|th5S~enq>AuMYxqUJPqH%YtU;$ZGMl_J;ycyyC!@}d??~PFXU*cm z3ZC@=_cNRx<>t!{b>27BdCv5x%l4zrW=X-nL#9rvfr-dc8A$t6BYRVK@@S<7!Y#6X zp9+1Z!aM0|>VA}I at sm+zwy75v>liNZjWwNnh;Q7NNv!JuLzyv#GH32bnZy5r59U)9 z9$h29;De!re3im+4dY6?pNtwaFO&+)zc={_HDuK{Jg&%mm2y99#+Bb2YJ9sNHA*A} z{|=c?+FdmH+Qf9Gpn7B_CuSy1ll(%`-f86HET>!xuZS&BGT-kW&?lL2CgEuZe6^#0 zGD=M~^^{8 at KYEl}#V^#Oq8ynx&roV^laxCA5g7eElh0EGg`BVUa7rMujAQw-zZ?_w zlTl<8^>_Zoa)Wo&P<|oaaT$tOe-?^ZD}^GKS4tM4C2V&dK6Kt`JuoFRX;$j~QlB#d z52QBV)b>wN)&(Zf*ER$gdTDEzuhye=P_*f9;W8JMb4vKWJ;7 z>!>=bE`%fxR}+6nDDN`WqWi3;Kd<=wvFWXARfTe$`;6bOtt~?Ws!F+{ZVptjP+g~d z%IdkcT&tNuRjsT(`^vPtc7Ref%IaTQqFo;<#TWPV@*>TuW394UtS!{m!$9i60&VS5 z0i{On)v8;avO1OkTvn&lEqk=OCaA0~6#!F$O5L$rD;B7&?o|K at Xph;uv>MF)eeMHY zs%sth6D*aqi}FF;mE51;zK1(~v{kK+dT+sXDL4J2Ok2OCg9f#$I{!3EbHZ(v+O?IX z#X(w^T|`x`s_|*pwG416x~xy7vIYcdw7UY!7}q>~XE|%6HCo*tRIVH9P9}6d^a%E( zr1tA&Xr`w^G^DS_(7B at UWeR!%@$ zdpZlws#P)lYUlP;o<6UG+|_|R zrMETlSH_6sx7Bz<09y!PO^K_pg$632)D|k}xKi7dAe2z?#kMO>sG&v_+EyF{QIiTB zV6RP$^d4Ict>a1V at pXDP*C3%?|#2-s#Y8dh#w1mlBb>C=^_Py$zyz0Y=y)tX1_a$OBBs5K8U#K+Ze4{FPf zmrB=AM{NTQr}~uHQi6`J17>Q$&DpdtN;1_;L6F%3wm{)x?TE&%J+FyuJjAFxWcRQOvlJ81Cp+xa*DmuF^asd zT+=Ob3cXg2bc>vQUNc^BrB`^>&Gd>K?qsmbOK+HOuDQF(oW78=%iMPouQk_POXqOQ zw{$Ky=?Y#eul|-(>(#kB&+_J#N at QN0*UHU-CG&GDD2>Vuk^w^tushG|&8gH?Ue_&j z2?BJ3ylUPLoClm=V=7|hdg1*XzbT%T6An;jOG_ZPmK>#5c%^2H1Gxc`N+-CPOI|Km zNkSQFw1#vpos(1Jl at 3t}*7S$@ka4l}1}jI(o45F=_l6_%<@q1~I{c4(8X1{oJd8De z?a)_5KWQnWVQ8FeW5!kqMM9$e2uALr0m-P_l%#Tm at -9}^X;W&II|==;gn8553kWRO zaJ(v2?p6ibg!HEpnyf=1eG;KR)`yY^J*o9m0p)SOp!HJZkVk?#YB}cdo&LhG^dyK` zb=v*a>Ag2GV$CHugpOZY$xu-DOG3Y)2mgsTsNQHAe~%StXpQ#xA0Y?e7m(@8?>VVX zl_~4DfjaG~%V}4u%9)wkMGlq2YtY0j&%40>-&O;wdr%~%`V`xe5`h+1p$u5(R}=q! zbd at M)$L<8)-W?%ESur01SD#k_tR5rvq;m8$H4_Mx1+C-~UTD4TDHBEQ)I#9RolDWs ztTtZ)SDsa(M4x${@Wp)JYx!wif}T*z zPw7%Lh)AeTIT+_2K+h=EwLDSFy*%`z=kc6#72Ts0m7z{M- at 0;?g&IU3)O4=zhSz`$|9aSd=CGP{R| zZ18oq2WefSLqHE(?kXON5K;-1PA(%*9^%GHesMq~mYh)=;)FITuGY5VnF|qJ!fy+S z)P8El_2C&Lj at 9&S%cz4e-XOLV}^2QAbyPoa-q;p4F^9)=!cd= zN}-`rK=Fo-w$RZiAUQ%ylV&XQQF?^mW;W`=c&X7oUd=s@$tbx)VXou$Km~}9zy#FM z<#XptCpv{QKPVb{3|!p8d?TIS73T8>E*FSh0sI{9Z}C6L=Q)Vi?%W*1=s8}bYIm+T z2NrbactfE)LL%LpC~tmbAlC%)V4Y=kURcQMCZqWQK$VBIj?SR+fKd^+=2wY6QHpqu zwjwEfUKhzrbu~(d;r0All!^t0*Kd|b4Yx}s`G(uU7;Z=GH{4Egm1DSF(x7s{?TbW9 z$QN!$S3vVXZ{RNcE_anPspN4Q=-HX%6qSJzZNX&;1}uC z9TQYBo3+N;$chf4TeOc^wdS}Orm}Q?Y}*&!XeIiF=V7gP?+WPX(v4cb?E+&B3$g%_ zqsT%nL`~RNhwAVi%VUH;3hLI+UVMAP+yLVlo(js8E4J6TppO0^_wI9NydiTCH}vh! z;=)oMOk9B!e*Fjrug}0d3ueNDEK>}c>E{Eukw;TM+`*$c%h@*e=PP)$@|(pas#UB{ z>x#H#PrN$$V{qrlT8)YgsHms^esgcpYdlqVrrofGZ{|OO=mG9ypY)v-RMB0LAU3#O zsM79Y)_Chwi}UD!>k+(WADtHCWoA#;7jl2Z9wEA}8*eV=^Kn|;B_m&K~PxE#r~^)~&<^_9p!cb3V# z)n&*VXME(-)|Xbfw9Y`PSMnZ39BhK=LEYl5)=Ht0`X?I9L$ubopmMj{@@^kd>O3dU z`|FmLXlorx)TSo>nz^`{i~qB at nC=qI$ljnxh8MmBD-wk$eG=;^lnp|%UCDvzDO-%}c z3b-ns@|mX)akRo*MMVx6C_uTG!6GI=o_zZBrY8ROit0I5Xk;Y} zV%5&}j1Zkn$mAJh+X;gLcJ#QR@%9iQnVaRPcvgpUfK_}2>p?;`(E z*zxhK6`^;QY1g=fc)wZsszcpP5cM-)TO(LWv*OV$5uQ;-&AOVOfXj|U1J?1L1f5`y zsI_^^IP~2ScAOo`5#op2P~@AQP-a zai;iawo#%WeBe7q>oemf at Kh6c(u3T!1Jzi8fZEZDK67FS0;(%w)b-mKv%^j<5$ zw0FRc8fg#ZQJ*c%&l;p10|i(jWfXWk-e%(YBrW?&i*ZXq_GH({%P_i|FiVnXnhX z5*@Y3>&;)pqFYRE&aEuBNp~+3y_(iX+m?mFVxTJ2)S!Xtye!M*vI^!}XgWHoe$X48 z>&?wa%@2B6n#-YgqkbbJTVAu&#&{}$T%$jOtCRFOdYKmlugM`VRxSOk_`#1kh|#QI zvi!(0A^I>Ym2`A8VpC*MkSP_#ghTTw%k5fLjFSBZ>`qZB84xOaDW_Xvd%!)AKK!psM5OBS at xqh$ob(sbT3T5+H z)MRafT1ovWTCTiZx_gmH0;G#6xODg1OPG(~AFHk`V^%qn6S9|VG>ATCGNV0TlP-Ke2ZTovE1f_2*2q^zCO||KmDyksLz at y;<+&q}cad`cY}DDU%a~?REzxnmVQBdL z+T$u&PHb`ZEw61CoxLQ$a^w at o`&cw|Ma}q%G4UOce(kE7>#C9U!^_tD9UPOFE8F;G z>CkmgwSz)R_^e~CDDyGPeGZD1(6^(I6gg_8!6bS#;uQRVgFmnDo at s>zgFt(Zxlgl($41Zhuv+e~i=QaSZpL+}}b zYn(=m(LnfR*KcL${fdTuY!F?DT0{pppq zGUsA-{{REs+F3qUeqAy51*p=dUss6{@6VrSI%ijAt4h|A-M_eDO^})MqGu+xENAUG zrhTu=CypG@(_NxAH1XHWQq3&&BUs8v{>}oyf!FYofn%K)o(c%7`cC>VHu at mrrbzD{ z89imJb>w@;!ai)HB2x^`ghFd{07>nP)}jqK>uunRjO>eYsYHQBu{JBk)hJU~ZK0OZ ziI8%9K$WQA=zTyHtTxwi74^=OLKIP53xiYs(X#|pq2#vk2*xzDn3r^I16nz89 zR7Ai`6x1?lz)Clh1eGk_$^?O|gqP?IP5c#UH=5=6GFco(i$)ENW1+W7)I*eFKZ>r< z5rbMWVP(bwbrWki#ACExK~%BED^x{DHer-amY13B9Te{%Dr_}HNUW4&<4PFoR8ef5 za5)bMxzz}!6v(j57M%n$;PP+~^HuMgL1X*rB>YY{$(Z#e(e$r9pD%)t}PX-02)3z~l zap6uYVwQC9)?mdzq-}Gj{gItEFV}m!>9h-jvd)}u`mAHZ%epukD@)ajYtW{vC1`pq zsx1B0=(*Bgt4xSU>8@%~B|)r%7c-}6>~4XvE`vAGq3M;Vu5f5xxq+pJhC`*I)$80c zA_QbqGmvQKDnA5^eK3Z;l0xPZN`UtNSvk2Cd5+}(C8SeIu_+e{x|N5jTjKTPk!4Pq zw+Iax2>az+2h1t=78qQPDD(76Cm=PobY3Wg?JmW{q*)%uvKQL{DO4z2OSw$HT(;Lq zfZi>2$K07zOc}_;2c^l|>y5sZQsjAWm7YnV3wfn6lv`__=n>R>G_N4Ik!%e6XAQ=a1{3GWXsrlKgX#gs)Xcv!Wxb zI-;H*XV!$A4INEgT}BmeI_5y-{0QY;t30zl-~HT4b;@(fGoO4trWS>*-JHOkGe6&r zC-mnna5A~t}5HDkOgez&aV3I_yF2q+pe$cH6uD!R(2e*M!(*bH6GRN z7gtZ7nv%+P#L|k2Qmt3u9ewiEXCN4IhC!iru_GHP at oC>X?&nx>_r0T at R-4iIks(VE z8aDqM1Y&*d-Rw_p=VQu+qQ2}~>;8*U at A=lMm;Vh)7fGyLkaGXOW_~!*JoKN#4~$sy zbq!AxI$u(kS=Da%szyQwk2`R@!dwMaSk||l#V=8FWyEVxwj&{#j*JXPz_n)Gm*E2` zMU+Km0)dduPy|KraYBfWD2+}i2qfb*lToC^2#Anu at C+c_l#`EkR z*daK&B8oiA!@f8-YqascIAvFv74^y^e#g)IaQ8SgTHkOr4oZur8CP}0UlT6=QSKjN zg(z}@eA(qHQ%jDmNo1dMVCg%~rqKi9n)^pXKVfD;mOwF at b~GL7BSCMJEN;?E&~JiX z;dORJ>ejdBdY3KpdRb3oRo5V8%~R)E&f=$_oQ2RjbV1fS&66shmE~m`1t?c9Bf}i& zCi1Q*)?>XnvLJ~PsfRXKD7@{(oY zAC;Ra&rxRiBlNjxX8A~#7qh7Uz0V_ at Dnp?&S=WZ)vm1Xhop%C%-6F0|I2>;mqG3R99lAX$hveO7&@2b)vJhRayJb8Rs57n78 zq|`d9bnV&-E$GeY;g8j$SMUadzPaonHE}<*^BNv at QtcN+9!d`^a1Br%-vV_BTATAC zCoPdf1Cw06R0}cF*e?>h=cdp+b3@=E*X0L`yeKf-^|K};51!$l0;^r)n|y}19UJK3 zYIm^6=s*jX`(TmJ2iCiin~bC=2cbu=!1?OfQbVSgTK$qzf781t#Dc)nYG??(Nq?!- zcKwP&>6mwPmDMtc!vN*_n=X%;uk{jk_zvEs+ at pi~9jj9*^OiNct5pqCb3bRjlATc+CAK{!YN^@< z^k!7I at Gq!#8pY1J*O-v_;VI!4#K<5F1ySfk0d(+ANS at puk{z)M)lbw#C+P z_#^Sefq5K=Ij|gTGmI#8Lr7{Grp+$Y-wo7pBR{P-acOGxG!h53Q5;p=mintW at F7pa zVW`H0YfOr=;c5)jwA^QYAm`%p`5Axar>PZ%H zd`v=h3}Q zBiFlC?iRG!&7oh=3ugg4_ZkzbAzYFpIDuFOWGi#fiz6nJQh7^dK{XVXr=6Gvh%Vs` z4*DaOhR$I)HosN+}gYY&`m#&S#s`y8Pw*u7Bq=n z)&#bR9L&4+uaq~C&uVF?noJw8#w-O5V;s^3srW(xB>}t1y)svk$MEb`^EW~dmUuT| zYE9q8emr+ON%D_+&;1eK{N|n;?yEoHcbPG=SrQ6j4Yt2T)-XCA&REHJ at i@LpVnKa8 z8^KTHC-VjJ=Y)m}vxz9|xKk!)0k{iYxucB`Jec&_b*Xvnrvk!oUF z`iPAvQn)^9Se=f3I_mVikJesVU!QtnV9Xr76}qe&&OZElVua}!-0k|^Z>l3G3LS;$ ztVZuWW at NC~5ZyEkM(S_1xvCJGZfO{&1 at X$Y?u<@L>Z(F5*wEy^zcET3Kjy|I^-bPb z#Xq!ALw3y^bWryCpWz at zwT6Wxk;EGod7V&r5vl1-%T0}Bk+^PX at S?+aLSH`)-CdS= zWuf;NLdSx2-gXQQJB?;7MtR$qqYmmVXwi-a>S&|YSTW0%VeTx;R`TNxPOO{7Fr|ih zQkg52`=N&#a%jjk^cG`x+ at J?LC2~q9 at 0YF6wf|H*j?|RHFdG>X*vwmlZLAgpV|N^D zti~E~Xc^9}FssF>Eo0J%VzGN=d#ezl09e*AF}Ou@#tPX=hzrUsPCVO+{W2SO+0;xj z#^VvP<2YVPgqnmC@)5EmJB2_zW6~tK%ObE9&oizsfh&+~ zoULK0*DTlyN+Oy>%9G+RmsT)OM!sTPLc}Y=#gco}6j?WBx!5UIxGsD<#JMq>w8M2V z6%Vre82`Vf{w!Xzs_U#N3$?@~8;U_K9v)f+C9$c7k|A=l1v+kuW;by?!H+WMcZbV` z^V`Df$HVQhhVx^AjtA4$a6bLue~j~&<>Y$(c^=G87kg`2 at U(K48P>nGoVCySVmW%N zVg6h;dSa_92B$HCkeiIw{`)eK?!ITok89L zsmF1%du}m~^tR&G>D*%c>gD5*_uOLKORkRP5Q=k)i?nNXJMrRsPBCsx0L8oSIYp=* ztJ?*|?e957Y^Yh?4)3D^Q?b?U0^%#IPZ1C&X2&6-3=sMV1eM4UV4=NYz?A1 z#$6J7)e|T_Hm0%@lNzDEP?ZF!rO;4pHf3ui?Hecb5L${4UnwdMiN()Qg3#16g4M2Z z7 at -_p9u9M13_L3f&W`%p+JuB#o$a~eqDSI|ubtzy92 at 2E)2;rSd6;7(u&NXmHtRI` z!oecGt9)T##kMt-&j(lMlo$s%MR>I>zz5N=^wBiyQ+5p>z;Cudv` zgE1suHc}xJvl%WQ-r`DU78yN%2WM9xGVj12FYn at RxHg}oIM5I9QN~?(c877JQ_CH1 zKYl?Y?C2uIE@)If=Y8bj93g)%53qyvS;CmNt&B24t0>iCxI>!RTt)hY~5N^f!3{H8DI=6;L;~zPi|2K2%f5W$gF;Ap# zTzK+}Hq#D{mqL-*#h0M$KaTv9aj1be!qCBvz&JvATkdmw=d0t{jrA8q%eu?=@MY%2 zJ-MzcecHO&RjamQm0_-Xx_=85)FaROILI7pA)wYhlwF at D?^t_f0#gYnbz`} ztvb5*=+P${2uF#85C3ZQuGp^CC#<0K*nYl>ZEA|YnX*TMvh<<`nO2~%O zz3~&_P*~!PygOrXjFAdN@(uS;+0(gy|CAorR1Za-s6e$W=g{A<_7?~g1?W7w~^s_^u8jT?(DumyPp_!TD{?S16hLrF=C+j+JXz z8}q=C0ypM#C)A(|hI!rel>aWSw3c~&nCR>l#}K)&CdU($drLXB4d&bm3Km7al&M_| zj&SfGun37|VF-5(f}`h|pGd7fkyq)0%-xD>33V&o5E#KR$APvmyG%zs>?>|3bL2Uv zQ2+c6W94k8c1M}9BH80d45j~FjP;*e8 at Qz%gF;)ZTV#u_oC_UxhvPWK3HuF{bzQOJ z>`Lke2RY6;Yw}rZ`joXJl(%2CY;jT6Q|n9Ly?eqL1u|dSe*;sOkG01Im2$PZN2I_V zgAodqb at F$d2~fWD+RM%ycgJc})%)>ig{jNih at EftV0LvpMki_%F0fQo8p|!$Sk)@3 z+v{x2>r%#f>!(#}y{J-oI_}nbxgeg^`uo<*^vfhm|8fS?omvkmQ|_0voB=#&v5$wmj6lsTR{V^G} zWJ4lHFSs%MTP&|x=j7jFz1CC9DaXxtzB!{pdGOX!)kD1cxAek z>>iR%O*y52loxNpK;@}U{g|s--LeX5yV~4W%(7c>{cxpvYy|zR%g2dt(LF}wE>8PR zTOR2GsjbI7)p!82T0RH-Tyzb7z%18&z^`$}0@}e6z;|P70WH^)z#nxA;EBNUU{7Ry z*}V?aA1mfH;0-4Q)edE~dY6+cww}&@8fC?PghkHoUYz7+b^L-Pg=cP6R=00y-ho?G z)Crrlz7{tSp3^?bYI?g&GygR6&!O at UBVt%Us-M;~DubggL^>FfbWN$;@{N?ZNHrl0 zi+zAt&4{Ca at e=4vmWwS-3&vG(mmsdi#8azy1?&t?Tpcx(#F(C(d=}u(fC*XFm at P)w2nr8on zXe;I`d`DEmloTPUa5u_K2E zsrn%ChG*(Q3#m6NKC7qmwccHYLm4MX{ zNAOAeVd8)zKWRhm`P__X6=b-Qk=gK0;cRa}cmEN}y%MI*8e# zp_C|o3kIhcGsV%w9F-SGQI2lcY-hA{$FrZ~4bVBBUb>)kP4N*Z-Wue54(Xt>D(?KG zdpbf8gG6)JJe02K&dHTSz1ankC!JGHzvBo+SzADL$}@cv at A>Y$oLrp0qu7f#`5Zc> zxPj+jJ(vNz9VXguCOls{r15HpwubGG>5llZr+<)0IwN~5a_L9{OFCQ)%B~ASIBTHe zaV<9(;9H2vp%a=z`G6OPU0w~uU>5pQ9v`khSq&Sq8J4*-V zRruqVE@{k$@J}d)LT+5}@i53mwYZ;9RNd5+H3|~2G=f1CCQu8dTjHg!+L$lNd3#RB z#1sf8`?r!*Qt=v2;aez>bW74Zw4*;d=MI{l89;HJZ at Q+*$8=3zF817XO>m-qZkMM) z(lc4bk!%e^9X&CoBQUW^v!0`B2u(~v&AN=K?HLkQGLai zm3$XOCGKjBL1lBJIN1+xa+K4Y)h8aHSpxdfY(kfY$8?HN=LVXvifp?}%4!#N;TZ^{* zyLZWDq<0gw9%m>@wPrAV6`|3M$oML7Yq7sl-2}^7h=S=>M;1}vVxuR-bm zUb0n>@f}))3+q+f9}|q#&(8!xT|4Zp+SLL1`-v+<#bJ5sQ__9PJ-rr;Cw5(6B_?K` zzAFRk&~@>!_}j-SHE;C1sw*G+Ewk~;njng+DFhnsw-Y$@Pu;-gobLvC%9YDA=sTM3 z2KL#MajM_G2l_)Yx7GiFeHgEmwXm#j(9O5pdKS|jXWhDmX^(F#OHJoIf^|3ExQ_46 zba}y$&v$6|=R?F-{|T-*?;rm1O=bD!f4uSZ{oafW at BL4|@sG{rmEZj358gOVJ!s09 zE23c|+q;1ant7?2mzv^cIID1Q0z0a-DBIDhD?@#jUy*YSk6z< zH$ZY2fT+yk_(~M;+6buOS(yMR=0~>Fu$-Sbt{moOQaDdU=FyO|&@X1Z>=KC| zFN8UVbY)oquGK%^Tv)&{Pery z2T?f+UI^RD~$k%yuS-X&{YON{vg6`~5A{RQ%D!lTr@&)7)Kg z at i}~k8dT(PHwoX5Oc#_c)VK>ux05dD%!Re0`*lZ2cDkL@(WU!I*L04#Y^6?U?t+KZ z1&yvNUC@}`p_I~{FrS0_WPvi*bUhX*`8(hmPT at S!kOSQ>l&k4}w~H2 at n{&Gv#qjqo z3M#g5xlGQXisB4 at k?D5$nMWg(PPQ2T1-a}-;cPb1jZMcxGp6G$Vky*}w+O~W4>lbS z8 at -std2+5?p19#BNT0Y}_T1=YvIPfNFlg|ye#)H}pjzHaAG$R_YF>xRN&gCEh#tCt zx-Y0D&Mec4+Kqy5dLQ~WbC;%=bQzArBU8$nhZ{(SL;`XYAI=rz9J?GkUJi%U;WS at N z89CSv+kdanG>5^GE2WZY2uZ(1Qqf~`w}~4F)9dokh+Cttb7COJ766F5{k)^!`NAD} z|NCKf?B>pQD4nlaMu?OV%x6W;LUB$!k=amL4iU{)W9F!W_ at jy7sZt>m;;dkM;zf`~_kN z at Gk8NF7GYSPHlZSL;&{hynC66O)q at R^On}Hqv4U;uvPtPxhoE_Ys#+gP;g}bA6efB z0VKQ(79Ou6!-vZu;q;;9FYNFeZ1SC>b0sWh2+>S;;DfQ2WufhSUUnf&DG^@~J9f%FS2ibXb1*rAsbe-=1fIfNNk=>9$+J)$Q9+tZc?)wr zk^m8d#xZm3P7XVm_BR-$4U-PRhBumLy@)tJQHwc!HL~^h#P|a-GPs z%qjd%4*fZy6RFpa_xN?>@|JdY=2F_ToOB$2VnHNjJ}%FrH-uKhUC-QY at kbNAgN%&AF4gUYhCl03_YVaTK#KzOW$bv zYv$y7G-ZgRnfFg8pGe;kpSY2-Pe=MxgY4tTKcZhX$UdT7H1(A^nleNEN=@(UT!uhC>fm_Hkqj8KWBHj05R?G-Zgx$y*M!6WK>bc3J&(jN=Y2 z`y5ykS=@3K2b?cggA5 at QXr4b2tx&k(;PS~2&&?cd`6Rrv at Q37+rgs*GdHml+K9P~I zdHy8aL!0MM!j$;eGcb-`&Rgk#_=4&Gnn`g_;Y80x zN?rQb8p(0R;MG3vs;=?}YIg8COAK!cntFdbe~qd4S6mn-#<#JPJC$L0e6Ysp=@B){elXg5(k#Ycsz!0FNDnC1mA zRJ$CwqFS)K1xs}Vv%8usqE2Qn=>28oI;!mcZc3dj*{X?b5FN~(g2CJ;3dUL;g-a<{ ziJUUPUP&tou4JFmJ>+s0>CWPQPZbzX=^5 at JYs$4}%@Fq)rLv8}^Vf;35UpHqk?3AJ|13HN>M$4Jw*UpIV}MjU(gN;)81g z at D)*MhOesG)rBu<4ZUzzZL4a-SH*&*I)W)Se3fF`Nv~GHS5>bj*>;NIt9!B0oe#gv z=YFr at t8YijDNU8|RV5qDtdaD3`06Ec$s%1A_m>P`Rb?dHvH`x at a7#i)mEo(e?j39M zMo*qS_TH}yU%it`wx$qxVo80+ at YSE$XEyzl0DKkrWIFy<{%rWle-&p_O=J3 at k<+eLx`SJ{0a6X5??ikZEwtvPS*X@=r z_U>sMa50f{E#zFobPJw7cGW(4)%T|cRZN at Fx4!n-6IuP}I at gGw5G!~g{qW*V#Q&)y z-S6o_kWq`+Lw$b`|2(_-wsqcHM3p=nS}B!=gPuaVcf7%{o$%xewn9D2bMLa#QoD~) zY9%KqUdh3PY(df%G|lVz1#sa<4wlTuU6JI~-{w5X3U>>)vTu4i-mx(e;NR;iYo z1QX@^xl;WC3 at ab<@SR0c!w+0aUAU1N{;4Czr*%aTNX^2HTkCsiKx@;LLFI}0dQs1H zB}BNYr&&Q26?5*?oDnD1spxJi at 1f>A;t9EG4GN$$NkU?J(e9;s{_XqyJ^Vr)~D at Eiiq5;1j;7AHnyNmHe^ct3A_$cFeei&#&G5?jPsSb(T1MbrbzCXAgY!&P2N3`-ZPxVsGlJ z!dJz}4wFg^7wsBr+mFCk<#g{m4CXfac{O~sn&;M;HlA$TAJOJF+xByY2}*1`p&GpN6;sw z#PHSUDGVTYm3_+)G^fV!mG5B&*y#AQ54GNN4d~l~hOhRle)^%8zOEwkQiyNe6EJ*L zbDN~7HGCC(7}#5F`07Ex8>6TCk;mTlt{M}mHnvGRw*U9&C)AkQkX^yz^=um7y%0vNq at BKw2%`$9 zJ&|G4UZfA-X}29!@2f)7Y_{ip_8rM6G`7mLlkEoaJ{!9?H4e@!oughgP2;2xSJn~1 zt at e=*L|pq!x7#Y)G~1r-->9mln+W^f6ME_d)qU#2RJ1NfW66DwG;4T93iqR(1DGDY2XeYS4nw8uutmY!2b~O(OM(v zJN%Z$;a6ReNgBdnYdz*7U at UZrjbpnd@s at L?~N zBTIle%Bx?A99m+1+ at 9mU`jyDBCDz9sI1;R1i5y%4jDwecC318LFtzPh;uEia|L6d1 z`ju3P`>=m-5HfJ3-XpO1!YQf1gBUR5TfdTWSAu+cQ>1_w4x8iGxehG5gAA=or&2sTX`f=!cdm|*fWP3pkgOp^+%?lDdJ-2~_0GuTX_|E7 z1Zq2{(lqJD3D9N^;u=l5ae`l9)1(_Ga8m4?O4FnpCm;mPsWeTx?e3{hAt5#;#P5$o zBM*G``)dLdW0Lcq+NS+^Nr8#(Yaad#g$tp+Y+5Va6uXiO)^S9dtJO688qp?5ES?0c;KevW z>iI$e0&mgtXNW*qgZfhNLQlYpgECC2mjQ?Qa9#X*?{jbb#y<*)as at +%53!UuNs$8& zcOwgR1E0wjRi)AB1~*W=f^GowOp?JsbI|%OBL#j%t{`|B!8zOqn*_%IJqreX#Ql)g z4-xE0P}GcL4lP0CE3VLb5KlIKMWbRymsYhP#eT&M*Hx`R^#p@< zH77v3GoI(nzX*acfH at Qoc5}V>UQ7e+4aJ#dc*LjNU3NZW;XjK8GL2Y`x9jr9J2Ik3 zBRZ{J!%2bb3X)xD8m6 at y*dr;=ueUvwmt4;t`*YHvgvqXM^Iw((?u~iy&+joVEPo(y zuY1W~HY0-Z{;I`et87pFgJs(?m at pW-xXN(b+Nou>d*WYx^XLOp*BWknvlu at ye=AO8 z!s1QCZF{dmQBDjbsYI0L(O-WYG>~=GUWeOqI089sO&Juc_%K7n%v!juY)u+qj>B!A z050&uZELfxUAiN%5IJ)VE#OC3Ri79}c!utkL>B5P4y71fQ#A^W;VI}?mIUyONirYk z3Ao2gihQl}39^$^J;8mxNiZ2`H5jxMH(TIeCpeLyC?As#Ex|v1MWbSls;U`H-uo3Z zTvxRQMPOlI$I@%Fn9q!;s}&3p3~sAMTX1E3SOM)C2nM$~6b~l3KK^=i1MLmP;kGw% zEIK0ZQ$RaiNBXLhW{H*RTUaI5Fwz;#AdeY at G-f?GO{T zm2Fb{0-N^XfXp+%V3qIZUS|IY9swN<~oj~9g5GvUE00W zQUe5M6~y9=FnTwq4l>}gWzyRMk|x2Cn%NQQ@%|Fk8~ zu=Lz5Xc4gVT-)9`S{wp|LgOjTf&)XmHqAB0u8)PK at tOtS7L@H#%n&)xz*TnCRaseM zZHb!3 at jmx9idvxcTod(V*+c5>CZfVGHyJspn?OO{mjaKwzS05T(hfiOM))~AG&rPG{FyNz9=w<&iDgwFAVH);pOch zCFkw60ly3SA3VXWwAC92O+fK}fNom?->5?PHbl~xkv7K$TyH1w-p2zA6>B>6Q7QHe zt&{Eih8BvMYmW)m#M at 7Uy51gVSehxQ2g&SXSo-~Vd#+*Wva9gzJ!3a5}?5KOo1o`vpIUDQzUV%Wb{uNqhpDReK)9svn at ug?U63^E-^St?VLAug-po z&OUoIOtayn8_nZePi=X7K>wME9UZv6<*C~^8dA62bE)e4Tw$wLh0pa>mol$fsk?mj z$iojka4%y)Z0pvsEWF+Oz(Wr|vQB(+sk;i5dQjH$(4t5A2DtHf{yX0QKtY^@NYzd2 zc8pOc{f8k+eZ_7ZahLdt6*Ir4dV_qu-2=7$jjy*F^dDB6#tjiUaE4)cZpF-`+xEh9 zyYI|Sf6wsTa|w^Fnwhi-$FWyuzx2nEFB_&wf09#LuA5m`H}ghTE&q6};kijKz;jzi zzVXJ$?eN^QX@=(>N!bO at EzHhd2+!@Bw$wbnZ~B-Q>huS;{eiA~Va)Ub!*eBGd-m$` zv17|u&$hkHxx#bX-u%n!uf9zGx at zoLrf?R#{Oap}d2^fLxm9>fd at aOt3w?9lw`o1! zH&-n*jWP|vDoN|{3?kG1!w^-z3U`&(mA(qatgzv^d|#G3N9!AWS#oA9UFtuzdSO0` zyzj+9 at YA2Lw9etkRm@(T&XP~BTel1AwfJPtWyh(xj2!{xa*f+o4okTFcl`n%$OAxf zAbm?O<`c{&z1Gw3;83-Pl*=ljRhN$9CdrubICxmUFbI}i at _mP4hnz2 zQ;kbNZ>57^y7?XPZ)3gbs>fKp>-;jB2hZYkBgvad?I#7Jo at RAAgusm_h~D)G%d at W* zK}T(7Hb9af2|r~J_cb8q8pMbO#7Kka>mYu~BXI_Ce3|l)$F3C>&s!@wu!wATxHc-^A26H8zn!yCGpoV=7W^R$e_%4SCnFjN5 zVF**D)bsKIQ^$ufP}tgMP&oymM3`ZmVb)m7yM<9`1P_>H`v>-g5;3cGUY($e{$0at at 3V$2F9VTp5LxvIYh;;WlfBFiND_qB_YC5d2ExUB(k zr$Nki5Hon>HiMW_W_!q^cumEJ)<+cvH3~&FC1|+sYGyI-W12wyz4AHhc^rTPW|i0; zrX=+)N_Mru++1uh!F*~s+hCR!8H_&5*K0AhaEkCvpj~edVkz8QM z#4`^27v)zO?km2IiOG>G4EOmTPN1?W-x%)OerpA08!M{~_ig+0Y at Fb_C*1i~jp4qE zEuX&qx36~8HO+n7wfi!wLs5myI|r&c)s0o)FYv%wQ_U1+Z1v#2+pC|7W*V%tZ0IFS zeeTts$x3zWj!XC0Q&=o#Fk+^2g+;fWhyOFJX41(zyOQ|LI$l)pHfRPTK&KF&OE-V>gxOZ+#!QZDpskYVoM$CENWYa z+E#si6sHIRid9h&QK~o>dBl^13=kwh0tp1dn1m1 at 5Fm_+fDq;>Ktg~J$UF}>_uk|V z=l$-TFld8s-{+~d>iy)8ti8 at Y``mN(+H3E%_WJGB5Ws=-Y5iV!bo!kbaywga<_o;^ z*5`ls_r1oeY~BZsoD^~um+o*fX3Qmn0yt9MufifkZ_kr*6XLLRC+GAdFkC;0XQqvO0+;-^CMY?euC)fEe9Eb7HtdbnX51#?d9&Ed)hy zOyM^2s>5Gk7lG#SulaW??=3_=?c!nXMvA(ZqTl=!hp>ydhQExM+J_mX`@liBuzeE9 zVi(U$c#H5GJ?rs at M<;dWBV50)UNWC+75*Q*(kD9ovEL-|k*~3F*s&oVCwMDx7Qq}pPr!I91%Qf*M{)8=q8}2jIq-lK(q}A3_+#ZUfT8ykl!5XVMEcVb{%#JsC zYh-7w<3+pO$M0OOibQ|~JcK z27U{W9igO~a54XB^M-6#HDP2nN*h5&y6uyQs+hSYI%3({0WcGk zbbIl2n_u`m{8e|5W!Tz;F+|BB-ASn7=k_bzjLROW#Z5RKF4yI7!=e$OL3;rc^i at L=AoY*Q_@|LGI}W6ErR%(bJweE at T59E%YsoL6uPCdL`*zN|q5Zd2L*wWbVpbJy1jZd1 zL at K2}Vl5BU{^+Wd8 at op@hQ7M00v)0?-2{EXo^rX4^FB at Wq%uhH-%uZx%EeWhMukT` zrBZe8C&P*M>)H~z8mztsx^pi1^7zs0lWAHSS at T$lbLZ%jl6nDVU#}wLQOnmi6v4H$ zjOh7F at rmt_zYyGm%G?^6Q%?ohh$V zWd!R>y3~X1Ize?0O2Rtcfv08+f;LgHmU;+1EGZm at RHiD%4utf at K@7gA4iPHtEvZA+$1Ro9a at x3>oTwP<3en z>W|ndx^x57G}Wc~1GqlQrMk4{HR#vtRF}4X3_XB-X}WYWwKu3PT at IC?x^y28WF at P* zwCu0YZ#Jqfb-W8bsIaX|BdESvb!jrx9Mz>cQi%t9RhJgY*Bx$CUE0W(&|WyHy420y ziuPQN>e9{JnWXwr21tdqb?I7k(FnWhQdhzoQ))Wu(n=$sEb{rAJKg-(DYhoLc-hh4 z%1-}P%WR0UsrBz9mldx!OHt0lUX!`UkmOyLU{P7J9WvNpW7m2i?siB4&hJb}Bry%h zuj5wyU9U+}yjd+o52u_yQ;1L~m(lTBO*hEZDp39tA{b(%3fC$-LB=U<{yuPoIcoR3 zED(}|;xXyRl`-)u>JL!J5F%b-fU?;nooX6M8}nc_#yl&h3K+ at fi%|-Z(M{lOU$vN%PxL&Hc5oEPPJ-- zaf}$rs|~@ddrPIN2r(U}yp=DfUdR$A z*(QHGJA{Izs^-0yq1mrVvdZ~gY0IP~{W)6f(kjLDx(xpui=Jn=c0CNY*ZxMj!-B)H zX8>(KSk*w$R6WRy8oTVj2}LC^zhKDi*IoH=YHMwWxV7A@{28pGUMqrt1ENL6B=y_s=F80?z`yP&W{Ai|X`rFd3|w z5rk1t`&IYXOP~fxk@#Ngpm0w>g+WbJ)T>ZyR9`z?LDo at o(=r!+h^cl`u}(1$4_Ls` zUaOiz^vBS)?%$0g?Enw{>UkVvOH}t~2EBNUAAPVNtAjx{)%__!iF9`?c2&IU{zcDK zP|oMeJy)W-f2&MCSjW^nUUheQ0>ujAUtX?j>;83=w=l0q15s^>ssP5Rbg9Ax at C^8&nr?up}eGGA5h2#6#9<<3hharFd=!5 z0tz+Hcj?;vW(5>VX<nyP$Ovt z6Y?bKvkxzcXx9BAmK>g~ClN;k{A`!5&j&?zBt6ol2S%nJaT~^bUEd|InPa#HOvrOA zWBmAxWB6^&T#8XJp;ofr%*TI#5iaIK<48w)+a#BlksJVNz|SV>den{BpF|6YiYt8nY$ zn25y8eN_q~R5Zn at Yv~RN5z<;SNwWOq5rq({o9xy7!_&S#R=$5t0;6VSwRES-thW1`b+qDmc(iT~B61x?a~q zJ&IAR>tAw5o~}<sTOt6M^=w#QUSe30f|;nA(3(=)zW z812#hqVl)#;x+{jDx8GwSZpsw^(43yJg8-5WUFqC$z#W4GTen;g$}AaoSm`#WD89< z^Wn869)%8aEtECT+ at Q|9E1~DLDs)f=WTLYT9kdvFIz9kUXPy-3sZ9zUbP$7Hp at Vd7{02vk zwmF6=ubm^dVmqBYr_AzS)SX){V8>6Yjnn_xPOY}*ibjPF(#^TJGf_ZcEeZ{!%DFaO zlzp=}tsy~%Ov#qy9l0m<@44U?uIpzXt_ND@}y!gM3g9KkSCS3W<-gC26WAov)xlC6TI41r2JWi4({BFKMwvL4!&oaWG6&(4f-DN*({SbikHIRx_VE6*QU>P-!H~p9DOGpuMV=OxysR`CQl0`RKFQ4<9th2MxO5`-cX3%XhDIr~7AYI?!Nv zHZFIkn^*2GXC4PE(y}7Vu3LgL>{YQCxM3^U6=%_UEV at xQkK5lehcOU+Oqs=dYIW1W zrtx?v_9%n6o|Lm98nq7o30Vrs;u9t?I zF#Fp}5#Tve{;@=uVT at _4e&#Bm6jFCHz8f0rL^JRnb&tm|bZbOhT$nB|p=p7eoqH*T z at OX7;Lt}>6+rg#N4_6Jf)$V{rAj&rPI at 1Zm<5(w-6SZ{q;cfR&A>X~%Q~?kUh1x*{ zMEZP}xObB~!*uk#_fnzIooB)!^gn8RsXM{6 at 4WZYc%!?{Si`03*|28n z;c_1GUynyBS=WyM3d+T~Bzc;hgzu$t)??d?Dd0$yOuL>fz0PL)&Q(bz^R?BdI(EUd zsc9b`=!b_8{S5IyTc$-VtOpNNyC^=E^(Jt$&B1GOrbQ9%S{4<*eQn5g1?Y(--!UL_ER6~?qT6}yOI;ti*OWocuc`S7g z>G~nVyJhTT&e;HihR1ovVS8AZ{qPKZ9!^&9K$UxT at 7lQ?)fW*K7NP4Y+js8Ty{Agy zfpThev9lcyl;)UiUdXvTj at cqj?K?#~baRwpM4-K*e`E}&!(k>+k$(bHR^fpbIO5E6 z4P%xgPAvG5z0Ef};vW~F2Qbimcp%}!1O0G#pqkt=_SwM$xp0`pun{!vYZeFKfy&m; z`%=$Bi at 1qtS<;~JK%ShbZrwZ^W~*)*yRi)qbS$Q|jfcIR%mJ`C#=M!>aIzX6xj1lr z_|4q-{}c-^)ohQ7+Df*!ahmbxDLBx^<~9a?aw3PZG7E#xaI`q0sxTMhZEbaM#UD`M zpIo-9<)dJ5qy>x8xHAkbgp+kx*3{z=kX2Z%9#D)OXBkJK-GUR+sNsi2DGuQZiZh at 0 zo1r*awTk1K&nH-;IHfi19Jb^06!K@{X%5=FS#iFqZm&Z;2Cy at hS1nPeS*+Q2s=fW4 zRqd7V_|0g;0(s}1=HZH`suUZM8CzRrWQM77(+uPwa?xIwf&w`zj_y5pqT1_&0{Ngo zKSL+X>pwQ0D^Rb%AOX6$lV&u!4}|La24_q1+*SnzT2A!P1UHuTWDF=2 zT_s0Eq9q8N1#Z944M1^5kM4h!M!Tfu6yASZ-2Co3S(_8DK&Kz6F#@TMM>(Eu?S z3JByJtLtHh7A={-o2QCW1q5Py!kRX7L%FexSb?!?wrz~&(sTs`YFs=P_`9DiMAxTy zQSVwL0lmQ7N+JoTLVa&R at hsTDp2cLh0s=MTaMa?ybnAYrPlV~ot8sN&!y%SPS&b*$#9$P1-r^<&1Ug{X1B16N4~?)*(e-Kt1gec_&@D^1tyoW720)Fjb9Pyf}`1qp_@~nLEC2(fzXaCe6#r4d)}omMb7oYOC(QcG-+=`3t5Tz^^;0 zRRMvLT=;DZCN%M#GFQrXA1fmzv=Ra$OmSJ8aR{H7n8oJ<6o(fPL)SEG-3qu>lh)A4 zA}~geBr(4=zdBx+ at gs zsx}zV)E37EIBcIOb#8QOxpkbbih8_40qxdh(M)_1hfRV4T6(6uTa^*4 z#l#_baRzaGo&;?%p27MU_PGe!V#V6x(alq<%O at d~8x#7U%isZw<1 ztR82wxk*F$?C*puYf&hmWcF;rGdaGJ%}vffVs)C$E+)I4O%rG(EKi|;JTf#Wq)4HF zGSPiRNPz;{1C^mrK*gb4pG7D=aj1>*zAu{;3dlVJI+QJFVq4Rxy;q at ta-cF53g|cw zWc{j8K(*tbqni~9sAVd2SXsHk#!x#~fq=51)=ChNK>u1dtB_^erU~0;p+A+O)7~ z={s5#0;qIR2%G=WAi)8Ec{Z?nCNdNPs2U?l3HmzkP`|4R1{HO zl_~^~D-LH9={kr|UQx~Fqe1{3Bxu2=5J2__NHD^9o!1l8utOn$n!_MD2N%&_L(s!M z6(i9!7LtP=2r=4H#;l~MSy0Cn0>~B&*`N?WyP=|0q;)dX5=BKpfk3)?!Rels2cOK-a?yiMrk&%9QxEWSMvB;iXtECxTfOgn=q# zckwHI4R5v_V``-W0Bs7cqg+h6TH${V%>&@m#GJfH;eBc|B^-z#mvOdcImz#)c#ye0 zSHXWcs$9rW at dQTjA_er}4kU+j9LI2hy zLB5n!zLZo74 at 3g8?*(_}!vnQv9%B2zhX*z8;B-V zxcAybmyujEMhs|{EnXA<*a>k$m>!G2#vyplfSNIuWW$wsZHp`|tuRdP`8T>0U1pfP zskeF*&8hI)`nHkfWF>n<)fiEeXyMqUH4n7N7N1&vkAwe$Y}My~v+ut0^LXzXVSQy; zY3Z_8YD69Ba#x}KR$WpDEtUdPTUsYb`PL6WUcY)t&4rq)C{9QhhrUIfz1n`q*;dYN z``*F=i$7}v8fitc2 zZx$rT^;=P6Xe<2eh>@RlxsmnEyoP4OuVLOZS;lg!18(3@!^jlE|A|?(E+epZ))W3h zWE#d$dCg1~f=svYw>}bISsDL`m4vrk%HvEavi5QiLuQLG$N(oYp*uMx_cF=lbtLC9 zCrwz78%FtCU7Cco%Uk7!aa=Yl6E=(Gq|RH;|3t~r?jh5w=IO?d at 8*GOMJma%H-c97 zP>-CyVuT%zrRyR0vOZ11(r20bP**!ov^A59_++kMPV8En9Ham3 zZ+cAf+Fd7_n)BDq(w{Z8bU4D!>Ev_!{;Wj!~nG{$)+n-I@(-~DyeF_#)f z-$r3xVHls(G3{9{C4*Ea7$Xg1p=6jJC3`}HFh67%M^*VF!)I*igx^gmNC<4K`tk;2?!w zl4A`xY#2GD^R(Q}%_D2&8{W%-s#(9{4F}g4##U1;A4o)U at QCegw4c_C179r8>)*+{ zp`HsS|EXTiDs=9c_W9x>kKtF|cLZ;KX#)bQ{izTIvY`7tsGyv{M!vtP^Ar*o`g!x7 z7NXZN*lDIFRJUKRXTFGg=e{m9{tG_7HrHYkWn=>`}D`OR)o zD71?YK-b*j5yypgnN*j5_K0J`a^(rb_{c4e3RCah at 4GtGS3bG&$<_BES1gOocRKDB zJ&PIbVjbGa^Jobq$M1x-|3B1_tc98!Fi#pHsQv!{`5#SH8RB?X`!t_l8%rFM}c6zL{3nM=k|8Wh;(h^*Sq$x;}Esh4DCy zU-E>yyXxB*Ghqy4oYmdc(AGxFq~Cu=c5)bvFfd)~?rMS%^^&~P2C3cMMk~u&(Y1Hl zJ(pE#_jYCZf0dgi at 9#mB(%Hgu*y%m z1^K=2s^dVp5I6Q0Bx&z+y1KFUphNrKCec$k#f=9(8fZ$QwB9#+=yt97LP=-;Cf-^8oR5Wcz*o4C?lF37oTa^Cm2 zS5aEy)o$iBOG3J7G07$T`1?;%bUv z{9mprltMiVN1g>fREVJzYbZ)Pqx7GvaPA{k39*tpzxjx7{LGfFfevbX>t~*RSMd~U z{$%U5!8`Uo{Ec@#^TGIbekb{Mhn~KOZ+G^Cp}^X{xVPN&_4b|Ic#bd^2R?&0dXYpsm$L=aV*{v^9S((uU74vMAFdeLUGkER~(Ylx-NLP7`)`d#S!un3n!y$s@=u!qID| zuX^O-qMl_!&&FQj5_kJO9$^^PhP``jhP-rwL&g%nacL>fRhL2=r-{FIaOrIGG}KnR z0~QKygge~yps+Z?#b3PVKD_N7Dm>|a*>tlAK=rp!o%%$& zeVlx^)cHjE#~{-9TtD1jzW8dKw!cc*eRyC4c2KuZ+)?lCFTYKQ+bedzGp_aRM#(%J zDnys9`_1P48#@UxZii%Q)gO3;^(NQrue+}I3hnRtl4+V$*jt{1vU_(Dda(D2V0HVI zN9`Y&MUY_x3G)Z`qdgn3vbtQl#@PPM#m&tZKeOFfgJZQ>{Nlz}UmH5?ZFE6{jnk-& zrEd=#`r4~EG|LUocR8B&O}UYY_aoVnZC)%yh9etNGB}yjTrNaC>i5KtjM3F`p}DIN z-5eJRT)*n|Ryy{Y*9o!7u~)48k-g0~JK|i$d7Adg+z&6NKR21H6z1PNe>;2YwL%2q zkjiJzXa7f6NOc!*d)Vq?Lq~UzhtD&wXA`={WPSG_Cmd$Olvz4Q6F-4B>5;tFHXf$- zvd(gQS~GF{uBwK|Yv0AnFXfMaO|kF-Wm(mhwYJRO#sV=uO>)HO<~9cY<_BA(_w7%f zGaPNNsZ}mev^}=AN_e#gNsf4)?P>X&V60S(y=NGj>k=0W9dR|@09l2V at Ib{FewLvt z#^SS#6vZG}m%JsHThbJRv?Uf8J)W{Xt at XW7v05-p3r!XB2^F{oXPO}THGiUge2+5B z_tYDfnI<86^UEp}XGNXjXsdX`?TVwqo#ya`y_YD~ z=hf|%h{HIfHt#!^pJrhZ3{(5|!>ZaV;Z at sak}S=<`ZN#Eg!^`7W?z_JW%$Rj5+}@I zqO`KL>x!!le at _=!b5?a}l|9;HE8afWhfPc>CjTjJUbgUejnaR3{Sq4y86z)fz-wr} zanyD%XS~;@yc{TFL;Nqi`O&}jfABhUb%(AypY$PHKI!{`q_0?*S9 at zOvPr+Q+21St z*#`ctz<1 at uE8W$9`SvUP2aM0|CNduWOvQS1iub(1|l^D}P z8)5>3tjdE&a1((wly`WIz_dS&>o=NR_WHmUT;QgzH@`rFldWG&yzAYyI;wV5pB^sw zB8gjHSt^%`&tQ-3Q at k{IFHL2s_}F``xD$^_rs?f%B{VQ5^ECmP#)`FzK1Ug3AC%P2ed|dbvjsaCaSXPMt)+hvdJxV at C4CLrm_xsbG^_LYG#~7=HT88Ef_F*T5)NebhbG8W}73X z!o9w5JT+1t)MVU($fK`X|Le%*G_!2VRy>o36+46cq|?I6Uml*cZ!k(VuR%85bq)ay z6Z_3wGV*mN%t`VmYbFk+H#coqT0sVjPW8 ztnr8;v>SFXJLYONva|loi`H-AcRrztgn$KXz at 8xQcI#giXBwUN0`^0mLM#H|eKEnOA)B>PdV37s91oz50hQ}or%a?*Ifjq34? zVQZ7E&|j9(O7qhVa*Na=1D9GKsF!m>G&2DaTs1=iSvZ2se at 1FIVA45br@nS4w}xUwELFWvP at KyT7i1K5a>|q7u0p?0y`&>84`2R(ZZCmsW~^9v>#}x9v|H-l<70 zUhYb1Wv9QWuMJT)Swr0nnfPWY%GY79iTCVMlJBU(qH;axkiiD`H;_hYn?nllwN2z0 zC8h!S4Iud#3F9DTo-$G9l+$N_A`~u at umJ7iddNonxQjw1Yz8Ajtn45SyyL?u3wMzMLA(Rc?x`aw5~ zAKOK0JNt7ZidUO~Sr=ocifNSR8p`+b<-FHPh8DDj^DTO?@>nP_6WXt$DfS|!rTQ{e z)?TCBk0s3WHu>B8ut;L5s%cvpnhTpG>oR`Vvwfu{Jq9gSafxDTF5!QVYxH%(a>p9D zg*P|S9Tpspr^r{TWna=j(bRpu8#Pw`1+l0^=J%elJMZM0=d86Ij%Q!@|17)z{{kh6 BHuC at g literal 0 HcmV?d00001 -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 15:41:49 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 09:41:49 -0500 Subject: [Koha-patches] [PATCH] Bug 9616 - Replace YUI menu on patrons page with Bootstrap Message-ID: <1360939309-19917-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used to create the "New patron" menu to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page which uses patron-toolbar.inc (members-home.pl or circulation.pl after searching for a non-existent patron). Button and menu should look correct and work correctly with the AddPatronLists preference in both states. --- .../intranet-tmpl/prog/en/css/staff-global.css | 8 +- .../prog/en/includes/patron-toolbar.inc | 86 ++++---------------- 2 files changed, 17 insertions(+), 77 deletions(-) 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 c0b759c..eac01f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2401,7 +2401,6 @@ video { border-color : #ADADAD #ADADAD #949494; } -<<<<<<< HEAD .btn-small .caret { margin-top : .6em; @@ -2415,8 +2414,6 @@ video { background-position:-3px -166px; } -======= ->>>>>>> Bug 9420 [Revised] Work on Bootstrap for Koha #toolbar .btn, #toolbar .dropdown-menu { font-size: 13px; @@ -2428,11 +2425,8 @@ a.btn:visited{ .dropdown-menu li { list-style: none outside none; } -<<<<<<< HEAD + [class^="icon-"],[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-koha.png");} -======= -[class^="icon-"],[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings.png");} ->>>>>>> Bug 9420 [Revised] Work on Bootstrap for Koha .icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-white.png");} a.disabled { color : #999999; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index 4a9b715..374d388 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -1,73 +1,19 @@ [% UNLESS ( no_add ) %] -
- -
    -
  • - - - - -
    • - -
+
+
+ + +
[% END %] \ No newline at end of file -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 16:31:24 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 10:31:24 -0500 Subject: [Koha-patches] [PATCH] Bug 9619 - Replace YUI buttons on libraries administration page with Bootstrap Message-ID: <1360942284-22846-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar used by libraries administration to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any the branches administration page and confirm that the buttons to add a library and add a category look correct and work correctly. --- .../prog/en/modules/admin/branches.tt | 31 +++----------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 2bfefb3..7cd4b65 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -58,33 +58,10 @@ tinyMCE.init({
[% IF ( else ) %] -
- -
+ [% END %] [% IF ( add ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 16:41:32 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 10:41:32 -0500 Subject: [Koha-patches] [PATCH] Bug 9616 - Replace YUI menu on patrons page with Bootstrap Message-ID: <1360942893-23457-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used to create the "New patron" menu to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page which uses patron-toolbar.inc (members-home.pl or circulation.pl after searching for a non-existent patron). Button and menu should look correct and work correctly with the AddPatronLists preference in both states. --- .../prog/en/includes/patron-toolbar.inc | 86 ++++---------------- 1 file changed, 16 insertions(+), 70 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index 4a9b715..374d388 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -1,73 +1,19 @@ [% UNLESS ( no_add ) %] -
- -
    -
  • -
    - - - -
    -
    • -
+
+
+ + +
[% END %] \ No newline at end of file -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 17:06:47 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 11:06:47 -0500 Subject: [Koha-patches] [PATCH] Bug 9420 - Work on Bootstrap for Koha: Lists toolbar Message-ID: <1360944407-24390-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used by lists pages to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page in virtualshelves/ which uses virtualshelves-toolbar.inc (shelves.pl). Buttons and menus should look correct and work correctly when viewing own lists, others' lists, etc. http://bugs.koha-community.org/show_bug.cgi?id=9621 --- .../prog/en/includes/virtualshelves-toolbar.inc | 141 ++++++++------------ 1 file changed, 54 insertions(+), 87 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index b2bd544..225e5dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -1,98 +1,65 @@ -
- - new YAHOO.widget.Button({ - type: "menu", - label: _("Edit"), - name: "editmenubutton", - menu: editmenu, - container: "editlistc" - }); +
+
New list
-[% END %] - downloadlistButton = new YAHOO.widget.Button({ - id: "downloadlist", - type: "button", - label: _("Download list"), - container: "downloadlistc", - onclick: {fn:downloadList} - }); - sendlistButton = new YAHOO.widget.Button({ - id: "sendlist", - type: "button", - label: _("Send list"), - container: "sendlistc", - onclick: {fn:sendList} - }); - printlistButton = new YAHOO.widget.Button({ - id: "printbiblio", - type: "button", - label: _("Print list"), - container: "printlistc", - onclick: {fn:function(){print();}} - });[% END %] - } + [% IF ( viewshelf ) %] + [% IF ( manageshelf ) %] +
+ + +
+ [% END %] - //]]> - - - +
+ + +
+
Send list
+
Print list
+ [% END %]
-- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 17:17:48 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 11:17:48 -0500 Subject: [Koha-patches] [PATCH] Bug 9622 - Replace YUI button on MARC fameworks page with Bootstrap Message-ID: <1360945069-25204-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the MARC frameworks administration page to to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the MARC frameworks administration page and confirm that the "New framework" button looks correct and works correctly. --- .../prog/en/modules/admin/biblio_framework.tt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index b87ec20..1458d10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -43,9 +43,6 @@ function Check(f) { return true; } -$(document).ready(function() { - new YAHOO.widget.Button("newframework"); -}); //]]> @@ -124,10 +121,9 @@ $(document).ready(function() { [% IF ( else ) %] - +

Authority types

Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins

-- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 17:35:51 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 11:35:51 -0500 Subject: [Koha-patches] [PATCH] Bug 9624 - Replace YUI button on reports dictionary page with Bootstrap Message-ID: <1360946151-26536-1-git-send-email-oleonard@myacpl.org> This patch removes the toolbar include file used by the reports dictionary and embeds the toolbar markup directly in the main template since it's the only instance where it is used. Toolbar is converted to use Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the reports dictionary and confirm that the "New definition" button looks correct and works correctly. --- .../prog/en/includes/dictionary-toolbar.inc | 21 -------------------- .../prog/en/modules/reports/dictionary.tt | 6 +++++- 2 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc deleted file mode 100644 index 4d213a1..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc +++ /dev/null @@ -1,21 +0,0 @@ -
- -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index 2e15834..20c56b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -22,7 +22,11 @@
[% IF ( start_dictionary ) %] -[% INCLUDE 'dictionary-toolbar.inc' %] + [% END %]

Dictionary

[% IF ( start_dictionary ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 17:45:38 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 11:45:38 -0500 Subject: [Koha-patches] [PATCH] Bug 9625 - Replace YUI buttons and menus on reports pages with Bootstrap Message-ID: <1360946738-26996-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used by guided/SQL report pages to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page in reports/ which uses reports-toolbar.inc (Saved reports, Guided reports, SQL reports). Buttons and menus should look correct and work correctly. --- .../prog/en/includes/reports-toolbar.inc | 59 ++++++-------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc index a4e4226..5d93b20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -1,44 +1,17 @@ -[% UNLESS ( no_add ) %] -
- - -
    - [% IF ( CAN_user_reports_create_reports ) %]
  • New guided report
    • [% END %] -
  • New SQL report
    • - [% IF ( showsql || execute || editsql || save_successful ) %] - [% UNLESS ( errors ) %][%# Unless there are errors saving a report %] - [% UNLESS ( editsql ) %][%# Do not show edit button on edit page %] - [% IF ( CAN_user_reports_create_reports ) %]
  • Edit
    • [% END %] - [% END %] -
  • Run report
    • - [% END %] - [% END %] -
+
+ [% IF ( CAN_user_reports_create_reports ) %]
+ + +
[% END %] +[% IF ( showsql || execute || editsql || save_successful ) %]xx + [% UNLESS ( errors ) %][%# Unless there are errors saving a report %] + [% UNLESS ( editsql ) %][%# Do not show edit button on edit page %] + [% IF ( CAN_user_reports_create_reports ) %]
Edit
[% END %] + [% END %] +
Run report
+ [% END %] +[% END %]
-[% END %] \ No newline at end of file -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 17:57:10 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 11:57:10 -0500 Subject: [Koha-patches] [PATCH] Bug 9627 - Replace YUI buttons and menus on serials pages with Bootstrap Message-ID: <1360947430-27462-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used by Serials pages to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page in serials/ which uses serials-toolbar.inc (subscription-detail.pl, serials-home.pl, etc). Buttons and menus should look correct and work correctly, including: - New subscription - Edit subscription - Edit as new (duplicate) - Delete subscription - Renew - Receive - Close --- .../prog/en/includes/serials-toolbar.inc | 108 ++++++++------------ 1 file changed, 40 insertions(+), 68 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 0e7497d..efc32dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -1,4 +1,4 @@ -
-
    +
    + [% IF ( CAN_user_serials_create_subscription ) %] [% IF ( biblionumber_for_new_subscription ) %] -
  • New subscription
    • +
    New subscription
    [% ELSE %] -
  • New subscription
    • +
    New subscription
    [% END %] [% END %] @@ -83,37 +49,43 @@ onclick: {fn:function(){popup([% subscriptionid %])}} [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] [% UNLESS ( cannotedit ) %] -
  • Edit
    • +
    + + +
    [% END %] [% END %] - [% IF ( CAN_user_serials_create_subscription ) %] -
  • Duplicate
    • - [% END %] - [% UNLESS ( cannotedit ) %] [% UNLESS closed %] [% IF ( CAN_user_serials_renew_subscription ) %] -
  • Renew
    • +
    Renew
    [% END %] [% END %] [% IF ( CAN_user_serials_receive_serials ) %] [% UNLESS closed %] -
  • Receive
    • +
    Receive
    [% END %] [% END %] [% IF CAN_user_serials_edit_subscription %] [% IF closed %] -
  • Reopen
    • +
    Reopen
    [% ELSE %] -
  • Close
    • +
    Close
    [% END %] [% END %] - [% IF ( CAN_user_serials_delete_subscription ) %] -
  • Delete
    • - [% END %] [% END %] [% END %] [% END %] -
-- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 18:05:10 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 12:05:10 -0500 Subject: [Koha-patches] [PATCH] Bug 9628 - Replace YUI buttons and menus on budgets administration pages with Bootstrap Message-ID: <1360947910-27940-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used by budgets administration pages to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, create, view, and edit budgets. Buttons and menus should look correct and work correctly. Functions include: - New budget - New fund - Edit budget - Duplicate budget - Plan by (months, libraries, etc) --- .../prog/en/includes/budgets-admin-toolbar.inc | 171 +++++++------------- 1 file changed, 61 insertions(+), 110 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index ca517f9..d36c2ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -1,110 +1,61 @@ -
-
    - [% UNLESS ( budget_period_id ) %]
  • New budget
    • [% END %] - [% UNLESS ( period_button_only ) %]
  • New
    • [% END %] -
  • Budgets
    • - [% UNLESS ( period_button_only ) %]
  • Budget planning
    • - [% END %] -
-
+
+ [% IF ( budget_period_id ) %] +
+ + +
+ +
+ + +
+ +
+ +
    + [% IF ( CAN_user_acquisition_planning_manage ) %] +
  • + [% ELSE %] +
  • + [% END %] + Plan by months
    • + [% IF ( CAN_user_acquisition_planning_manage ) %] +
  • + [% ELSE %] +
  • + [% END %] + Plan by libraries
    • + [% IF ( CAN_user_acquisition_planning_manage ) %] +
  • + [% ELSE %] +
  • + [% END %] + Plan by item types
    • + [% FOREACH auth_cats_loo IN auth_cats_loop %] + [% IF ( CAN_user_acquisition_planning_manage ) %] +
  • + [% ELSE %] +
  • + [% END %] + Plan by [% auth_cats_loo.authcat %] +
    • + [% END %] +
+
+ + [% ELSE %] +
New budget
+ [% END %] + +
\ No newline at end of file -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 18:13:31 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 12:13:31 -0500 Subject: [Koha-patches] [PATCH] Bug 9629 - Replace YUI button on patron category administration page with Bootstrap Message-ID: <1360948412-28386-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar used by the patrons administration to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view the patrons administration page and confirm that the button looks correct and works correctly. --- .../prog/en/modules/admin/categorie.tt | 24 +++----------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index 6c3114f..e7e00d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -266,27 +266,9 @@ Confirm deletion of category [% categorycode |html %][% END %] [% IF ( else ) %] -
- -
+

Patron category administration

[% IF ( searchfield ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 18:23:20 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 12:23:20 -0500 Subject: [Koha-patches] [PATCH] Bug 9630 - Replace YUI button on cities and towns administration page with Bootstrap Message-ID: <1360949000-28799-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar button on the cities administration page to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view the cities administration page and confirm that the "New city" button looks correct and works correctly. --- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 4b5dc0b..65de2be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -19,9 +19,6 @@ document.Aform.submit(); } } - $(document).ready(function() { - new YAHOO.widget.Button("newcity"); - }); //]]> @@ -118,10 +115,9 @@ [% IF ( else ) %] -
-
+

Cities

[% IF ( searchfield ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 18:33:09 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 12:33:09 -0500 Subject: [Koha-patches] [PATCH] Bug 9631 - Replace YUI buttons on classification sources administration page with Bootstrap Message-ID: <1360949589-29737-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the class sources administration page to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the class sources administration page. Buttons should look correct and work correctly. --- .../prog/en/modules/admin/classsources.tt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index 21eb0ea..e9ba27a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -64,12 +64,6 @@ function CheckRuleForm(f) { alert(alertString2); } } - -$(document).ready(function() { - new YAHOO.widget.Button("newsource"); - new YAHOO.widget.Button("newrule"); -}); - //]]> @@ -232,11 +226,10 @@ $(document).ready(function() { [% IF ( display_lists ) %] - +

Classification sources

[% IF ( added_source ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 18:38:41 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 12:38:41 -0500 Subject: [Koha-patches] [PATCH] Bug 9632 - Replace YUI button on the currencies administration page with Bootstrap Message-ID: <1360949922-30169-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the currencies administration page to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the currencies and exchange rates administration page. The 'New currency' button should look correct and work correctly. --- .../prog/en/modules/admin/currency.tt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 4834ff3..99f693b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -46,8 +46,6 @@ } $(document).ready(function() { - new YAHOO.widget.Button("newcurrency"); - // prevents users to check active with a currency != 1 $("#rate").keyup(function() { check_currency( $(this).val() ); @@ -76,10 +74,9 @@
[% IF ( else ) %] - + [% END %] [% IF ( add_form ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 18:49:31 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 12:49:31 -0500 Subject: [Koha-patches] [PATCH] Bug 9633 - Replace YUI button on the itemtypes administration page with Bootstrap Message-ID: <1360950571-30679-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the itemtypes administration page to Bootstrap, replacing YUI button code with Bootstrap markup. Small unrelated edit: Button label text case correction. To test, view the itemtypes administration page and confirm that the 'New item type' button looks correct and works correctly. --- .../prog/en/modules/admin/itemtypes.tt | 26 +++----------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 30a3a85..7b6000c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -127,27 +127,9 @@ Item types administration
-[% IF ( else ) %]
- -
[% ELSE %] [% END %] +[% IF ( else ) %][% END %] [% IF ( add_form ) %] [% IF ( itemtype ) %] @@ -254,7 +236,7 @@ Item types administration
- + Cancel
-- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 20:21:59 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 14:21:59 -0500 Subject: [Koha-patches] [PATCH] Bug 9635 - Replace YUI buttons on label batches pages with Bootstrap Message-ID: <1360956119-31549-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar used by label batches pages to Bootstrap, replacing YUI button and menu code with Bootstrap markup. This patch also consolidates the include file and main template. The include file was used in only one template. To test, create a label batch and test all functions related to that batch: adding and removing items, de-duplicating the batch, exporting individual items, exporting the batch, and deleting the batch. Buttons should look correct and work correctly. --- .../prog/en/includes/labels-batches-toolbar.inc | 185 -------------------- .../prog/en/modules/labels/label-edit-batch.tt | 140 ++++++++++++++- 2 files changed, 138 insertions(+), 187 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc deleted file mode 100644 index 8786a8c..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc +++ /dev/null @@ -1,185 +0,0 @@ -
- - -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index 5a49e70..bde821a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -1,4 +1,3 @@ - [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Labels › Manage label batches [% INCLUDE 'doc-head-close.inc' %] @@ -17,6 +16,136 @@ return true; // ok }; } + function DeleteConfirm() { + var msg = "Are you sure you want to delete batch [% batch_id %]?" + var answer = confirm(msg); + if (answer) { + window.location = "/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=batch&element_id=[% batch_id %]"; + } + else { + return; // abort delete + } + }; + function Remove() { + items = new Array; + item_num = new Array; + if(document.items.action.length > 0) { + for (var i=0; i < document.items.action.length; i++) { + if (document.items.action[i].checked) { + items.push("label_id=" + document.items.action[i].value); + item_num.push(i+1); + } + } + if (items.length < 1) { + alert(_("Please select at least one item to delete.")); + return; // no item selected + } + getstr = items.join("&"); + item_msg = item_num.join(", "); + var msg = "Are you sure you want to remove label number(s): " + item_msg + " from this batch?" + } +// else if (document.items.action.checked) { +// getstr = "label_id="+document.items.action.value; +// var msg = "Are you sure you want to remove selected item from this batch?" +// } + else { + alert(_("Please select at least label to delete.")); + return; // no item selected + } + var answer = confirm(msg); + if (answer) { + window.location = "/cgi-bin/koha/labels/label-edit-batch.pl?op=remove&batch_id=[% batch_id %]&" + getstr; + } + else { + return; // abort delete + } + }; + function Add() { + var barcodes = document.getElementById("barcode"); + if (barcodes.value == '') { + window.open("/cgi-bin/koha/labels/label-item-search.pl?batch_id=[% batch_id %]&type=labels",'FindABibIndex','width=875,height=400,toolbar=no,scrollbars=yes'); + } + else { + document.forms["add_by_barcode"].submit(); + } + }; + function DeDuplicate() { + window.location = "/cgi-bin/koha/labels/label-edit-batch.pl?op=de_duplicate&batch_id=[% batch_id %]"; + }; + function Xport(mode) { + if (mode == 'label') { + labels= new Array; + if(document.items.action.length > 0) { + for (var i=0; i < document.items.action.length; i++) { + if (document.items.action[i].checked) { + labels.push("label_id=" + document.items.action[i].value); + } + } + if (labels.length < 1) { + alert(_("Please select at least one label to export.")); + return; // no batch selected + } + getstr = labels.join("&"); + } + else if (document.items.action.checked) { + getstr = document.items.action.value; + } + else { + alert(_("Please select at least one label to export.")); + return; // no batch selected + } + return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800); + } + else if (mode == 'batch') { + return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]", 700, 800); + } + else { + // some pass-thru error trapping just in case... + } + }; + function selected_layout() { + if (document.items.action.length) { + for (i=0;i @@ -34,7 +163,14 @@
- [% INCLUDE 'labels-batches-toolbar.inc' %] +
Current library: [% LoginBranchname %]
-- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 20:33:10 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 14:33:10 -0500 Subject: [Koha-patches] [PATCH] Bug 9636 - Replace YUI buttons on labels pages with Bootstrap Message-ID: <1360956790-32405-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used by the label manager to Bootstrap, replacing YUI button and menu code with Bootstrap markup. This patch converts the previous menu buttons to plain buttons, removing the redundant links to the manage pages, which are in the left-hand sidebar. This keeps toolbar buttons within the general category of "action" (as opposed to "view"). This patch also removes an unused include file, labels-new-toolbar.inc To test, view the labels home page and any of the label manage pages (layouts, templates, profiles, batches). Buttons should look correct and work correctly. --- .../prog/en/includes/labels-new-toolbar.inc | 23 ----- .../prog/en/includes/labels-toolbar.inc | 92 ++++---------------- 2 files changed, 17 insertions(+), 98 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc deleted file mode 100644 index 2f75b27..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc +++ /dev/null @@ -1,23 +0,0 @@ - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc index 4de8007..06850f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc @@ -1,75 +1,17 @@ - - +
+
+ New layout +
+ +
+ New template +
+ +
+ New profile +
+ +
+ New batch +
+
\ No newline at end of file -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 20:42:48 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 14:42:48 -0500 Subject: [Koha-patches] [PATCH] Bug 9637 - Replace YUI button on local use system preferences page with Bootstrap Message-ID: <1360957368-400-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the local use system preferences page to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the local use system preferences page (the "local use" tab on the main System preferences page) and confirm that the "New preference" button looks correct and works correctly. --- .../prog/en/modules/admin/systempreferences.tt | 41 +++++++++----------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 8e69259..874708a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -70,8 +70,22 @@ return false; } ).nextAll( 'textarea, input[type=submit]' ).hide(); } ); + //]]> +[% IF ( else ) %] + + +[% END %] [% INCLUDE 'header.inc' %] @@ -240,28 +254,11 @@ [% END %] [% IF ( else ) %] - -
- - -
- + + +

System preferences admin

[% tab %] preferences

[% searchfield %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 20:56:33 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 14:56:33 -0500 Subject: [Koha-patches] [PATCH] Bug 9639 - Replace YUI button on MARC tag structure toolbar with Bootstrap Message-ID: <1360958194-872-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar used on the MARC tag structure toolbar to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view marctagstructure.pl for any framework. Confirm that the 'New tag' button looks correct and works correctly. --- .../prog/en/modules/admin/marctagstructure.tt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index d0f0132..8886fcf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -30,10 +30,6 @@ function Check(f) { alert(alertString2); } } - -$(document).ready(function() { - new YAHOO.widget.Button("addtag"); -}); //]]> @@ -65,10 +61,9 @@ $(document).ready(function() {
[% IF ( else ) %] -
-
[% END %] +[% END %]

MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]

-- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 21:01:16 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 15:01:16 -0500 Subject: [Koha-patches] [PATCH] Bug 9640 - Replace YUI button on record matching rules page with Bootstrap Message-ID: <1360958477-1380-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the matching rules administration page to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the matching rules administration page and confirm that buttons look correct and work correctly. --- .../prog/en/modules/admin/matching-rules.tt | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 2bd8aaf..99b8e6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -544,21 +544,9 @@ function CheckRuleForm(f) { [% IF ( display_list ) %] -
- -
+

Record matching rules

[% IF ( added_matching_rule ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 21:06:42 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 15:06:42 -0500 Subject: [Koha-patches] [PATCH] Bug 9641 - Replace YUI button on the Koha news management page with Bootstrap Message-ID: <1360958802-1809-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar include file used by the Koha news editor to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, open the Koha news editor and test the "New entry" button. It sould look correct and work correctly. --- .../prog/en/modules/tools/koha-news.tt | 21 ++++---------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index 195dcef..d84f8c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -55,24 +55,11 @@ Edit News Item[% ELSE %]Add News Item[% END %][% ELSE %]News[% END %]
- + [% UNLESS ( add_form ) %] -
- -
+ [% END %] [% IF ( add_form ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 21:11:44 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 15:11:44 -0500 Subject: [Koha-patches] [PATCH] Bug 9642 - Replace YUI button on the patron attribute types page with Bootstrap Message-ID: <1360959104-2309-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the patron attributes administration page to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the patron attribute types administration page and confirm that the "New patron attribute type" button looks correct and works correctly. --- .../prog/en/modules/admin/patron-attr-types.tt | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index d70bdbd..985ece5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -261,21 +261,9 @@ function CheckAttributeTypeForm(f) { [% IF ( display_list ) %] -
- -
+

Patron attribute types

[% IF ( added_attribute_type ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 21:15:38 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 15:15:38 -0500 Subject: [Koha-patches] [PATCH] Bug 9643 - Replace YUI button on the road types administration page with Bootstrap Message-ID: <1360959338-2805-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the road types administration page to to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the road types administration page and confirm that the "New road type" button looks correct and works correctly. --- .../prog/en/modules/admin/roadtype.tt | 24 +++----------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt index 1c3ff5e..ad491fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt @@ -108,27 +108,9 @@ [% IF ( else ) %] -
- -
+

Road type

[% IF ( searchfield ) %] -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 21:20:13 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 15:20:13 -0500 Subject: [Koha-patches] [PATCH] Bug 9644 - Replace YUI button on the suggestions management page with Bootstrap Message-ID: <1360959614-3219-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the suggestions page to to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the suggestions page and confirm that the "New purchase suggestion" button looks correct and works correctly. --- .../prog/en/modules/suggestion/suggestion.tt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index b687595..297207b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -20,10 +20,6 @@ - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc index 6d10986..ef3fd3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc @@ -1,41 +1,4 @@ - - + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt index 19833a6..2dc4af9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -24,6 +24,10 @@ var progress = document.querySelector('.percent'); $("#server_response").hide(); + function yuiGetData() { + fnGetData(document.getElementById('quotes_editor')); + } + function fnAbortRead() { reader.abort(); } @@ -148,8 +152,8 @@ $('#file_uploader').css("position","absolute"); $('#file_uploader').css("top","-150px"); $('#quotes_editor').css("visibility","visible"); - oSaveButton.on("click", yuiGetData); - oDeleteButton.on("click", fnClickDeleteRow); + $("#save_quotes").on("click", yuiGetData); + $("#delete_quote").on("click", fnClickDeleteRow); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt index 7a838d0..493c34b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -83,6 +83,14 @@ }); }, }); + $("#add_quote").click(function(){ + fnClickAddRow(); + return false; + }); + $("#delete_quote").click(function(){ + fnClickDeleteRow(); + return false; + }); }); function fnClickAddQuote(e, node) { -- 1.7.9.5 From oleonard at myacpl.org Fri Feb 15 21:50:15 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 15 Feb 2013 15:50:15 -0500 Subject: [Koha-patches] [PATCH] Bug 9646 - Replace YUI button on the printers administration page with Bootstrap Message-ID: <1360961415-5324-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the printers administration page to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the printers administration page and confirm that the "New printer" button looks correct and works correctly. --- .../prog/en/modules/admin/printers.tt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt index 7dfb80b..6edc88f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt @@ -145,7 +145,7 @@
- +
@@ -160,18 +160,9 @@ [% IF ( else ) %] -
- -
+

Printers

[% IF ( searchfield ) %] -- 1.7.9.5 From oleonard at myacpl.org Sat Feb 16 21:42:14 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Sat, 16 Feb 2013 15:42:14 -0500 Subject: [Koha-patches] [PATCH] Bug 9647 - Replace YUI buttons on Z39.50 servers administration page with Bootstrap Message-ID: <1361047334-4017-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the Z39.50 administration page to to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the Z39.50 administration page and confirm that the "New Z39.50 server" button looks correct and works correctly. --- .../prog/en/modules/admin/z3950servers.tt | 41 +++++++++----------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index a2f473d..adf707d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -63,7 +63,22 @@ } //]]> - [% END %] +[% END %] +[% IF ( else ) %] + + +[% END %] + [% INCLUDE 'header.inc' %] @@ -259,27 +274,9 @@ [% IF ( else ) %] -
- - -
+

Z39.50 servers administration

-- 1.7.10.4 From oleonard at myacpl.org Sat Feb 16 22:12:47 2013 From: oleonard at myacpl.org (Owen Leonard) Date: Sat, 16 Feb 2013 16:12:47 -0500 Subject: [Koha-patches] [PATCH] Bug 9648 - Replace YUI buttons on authorized values administration page with Bootstrap Message-ID: <1361049167-4973-1-git-send-email-oleonard@myacpl.org> This patch converts the toolbar on the authorised values administration page to to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the authorised values administration page and confirm that the "New authorized value..." and "New cateogry" buttons look correct and works correctly. --- .../prog/en/modules/admin/authorised_values.tt | 44 ++++++++------------ 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index e464617..8b6aeb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -26,6 +26,19 @@ }); //]]> +[% IF ( else ) %] + +[% END %] +