From a04f92a30a3d37eba639b25ce34ad27e2f25b620 Mon Sep 17 00:00:00 2001 From: tipaul Date: Tue, 29 May 2007 16:36:11 +0000 Subject: [PATCH] some minor bugfixes, templates improvements & zebra default config file changes --- circ/branchoverdues.pl | 3 +- .../prog/en/authorities/authorities.tmpl | 85 ++++++++++++------- .../prog/en/authorities/detail.tmpl | 2 +- .../prog/en/catalogue/MARCdetail.tmpl | 18 ++-- .../prog/en/catalogue/results.tmpl | 12 +-- .../prog/en/includes/intranet2.css | 3 +- .../prog/en/members/moremember.tmpl | 17 ++-- koha-tmpl/opac-tmpl/prog/en/includes/opac.css | 6 +- .../opac-tmpl/prog/en/opac-ISBDdetail.tmpl | 37 ++++---- .../opac-tmpl/prog/en/opac-MARCdetail.tmpl | 49 ++++++----- .../opac-tmpl/prog/en/opac-advsearch.tmpl | 22 ++--- misc/translator/po/prog_intranet_fr_FR.po | 9 +- misc/zebra/record_biblios_unimarc.abs | 3 +- 13 files changed, 155 insertions(+), 111 deletions(-) diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl index 2bb540204c..52e3f214a5 100755 --- a/circ/branchoverdues.pl +++ b/circ/branchoverdues.pl @@ -104,7 +104,8 @@ my @todayoverduesloop; my $counter = 0; my @getoverdues = GetOverduesForBranch( $default, $location ); - +use Data::Dumper; +warn "HERE : $default / $location".Dumper(@getoverdues); # search for location authorised value my ($tag,$subfield) = GetMarcFromKohaField('items.location',''); my $tagslib = &GetMarcStructure(1,''); diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl index a34bba4e2c..e473b598b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl @@ -1,15 +1,15 @@ -Koha -- Authority details +Koha -- Authority details -
+
- Modify authority # () +

Modify authority # ()

- Adding authority () +

Adding authority ()

@@ -38,31 +38,58 @@ Koha -- Authority details - -

- "> - "> - style="display:none;" name="indicator" size="2" maxlength="2" value="" class="flat"> - - - style="display:none;" name="indicator" value=""> - - " onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+',this.value)" > -

- -
- -" onclick="unHideSubfield('subfield','label')"> - -
-')">+ -"/> -" size="2" maxlength="1"/> -"/> -"/> -"/> -
+ +

+ "> + + "> + style="display:none;" name="indicator" size="2" maxlength="2" value="" class="flat"> - + + style="display:none;" name="indicator" value=""> + + + + " onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+',this.value)" > + +

+ +
+ + + " onclick="unHideSubfield('subfield','label')"> + + + +

+

+ + + + + + ')">+ + + "/> + " size="2" maxlength="1"/> + "/> + "/> + "/> +

+
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl index a2badeee83..0cef5d7953 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl @@ -76,7 +76,7 @@ function showChildren(mynumber) {
-

+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl index 12b768d9f9..8c19123ce4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl @@ -82,7 +82,7 @@
-

+

@@ -110,7 +110,7 @@
-

+

@@ -138,7 +138,7 @@
-

+

@@ -166,7 +166,7 @@
-

+

@@ -194,7 +194,7 @@
-

+

@@ -222,7 +222,7 @@
-

+

@@ -250,7 +250,7 @@
-

+

@@ -278,7 +278,7 @@
-

+

@@ -306,7 +306,7 @@
-

+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl index ae4aacde86..28994152f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl @@ -254,20 +254,20 @@

- + - --> - - ( - ) - () + + + + "> +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css index 2c04079c3e..0e8892056d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css @@ -167,11 +167,12 @@ legend { } .available { - background-color: white; + font-size:0.75em; } .unavailable { background-color: #FFED3D; + font-size:0.75em; } .hasexpirated { diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl index d3e7248c71..1e628953b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl @@ -213,6 +213,7 @@ + @@ -231,13 +232,17 @@ + - + - + - +
TitleBarcode Date due Itemtype Charge
- "> +

"> - - +

+

+ - + - +

@@ -274,9 +279,9 @@
Total replacement cost:Total replacement cost:   
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css b/koha-tmpl/opac-tmpl/prog/en/includes/opac.css index 82952910dd..31971097cd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac.css @@ -146,10 +146,14 @@ tr.highlight td, tr.highlight th { #advsearch-itemtype table { border-collapse: separate; border-spacing: 3px; + border : 0px; + margin : 0px; } #advsearch-itemtype table tr td { background-color:#CCCCCC; - width:100%; + border : 0px; + margin : 0px; + width:700px; } #advsearch-itemtype table tr td p { font-size:0.8em; diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl index 72602ef797..eb7260714b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl @@ -4,16 +4,17 @@ -

ISBD

diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl index b2487f0dc5..74ad9a71b4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl @@ -5,30 +5,33 @@

MARC View

diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl index 4e8daa49bf..16b77fa52c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl @@ -91,17 +91,19 @@
-
-
-Itemtype to: match any of the following - - - - - +
+

Itemtype limit to any of the following:

+

" name="limit" value="mt:"/>" />

+ + + + + +

+ " alt="" />" name="limit" value="mt:"/>  +

-
-
+ diff --git a/misc/translator/po/prog_intranet_fr_FR.po b/misc/translator/po/prog_intranet_fr_FR.po index 7f706eed96..ba9da49558 100644 --- a/misc/translator/po/prog_intranet_fr_FR.po +++ b/misc/translator/po/prog_intranet_fr_FR.po @@ -1,3 +1,4 @@ +# translation of prog_intranet_fr_FR.po to # translation of prog_intranet_fr_FR_10.po to # translation of prog_intranet_fr_FR_9.po to # translation of prog_intranet_fr_FR_7bis.po to @@ -14,9 +15,9 @@ # paul POULAIN , 2007. msgid "" msgstr "" -"Project-Id-Version: prog_intranet_fr_FR_10\n" +"Project-Id-Version: prog_intranet_fr_FR\n" "POT-Creation-Date: 2007-05-18 16:21+0200\n" -"PO-Revision-Date: 2007-05-23 18:02+0200\n" +"PO-Revision-Date: 2007-05-29 16:31+0200\n" "Last-Translator: paul POULAIN \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -5442,7 +5443,7 @@ msgstr "Choisir le fichier à parcourir." #. SCRIPT #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646 msgid "Choose Hemisphere:" -msgstr "Choisir l'hémisphère : " +msgstr "Choisir hémisphère : " #: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl:30 msgid "Choose a Framework:" @@ -19090,7 +19091,7 @@ msgstr "n- Nouveau" #. SCRIPT #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:1057 msgid "need to check for irregularity by clicking 'Irregularity?'" -msgstr "Vous devez vérifier les irrégularités en cliquant sur \"Irrégularités?\"" +msgstr "Vous devez vérifier les irrégularités en cliquant sur 'Irrégularités?'" #. SCRIPT #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:1057 diff --git a/misc/zebra/record_biblios_unimarc.abs b/misc/zebra/record_biblios_unimarc.abs index ab23a2fb40..9d687e11f2 100644 --- a/misc/zebra/record_biblios_unimarc.abs +++ b/misc/zebra/record_biblios_unimarc.abs @@ -359,8 +359,7 @@ melm 676$a Dewey-classification:w,Dewey-classification:s #############"# item information (based on 995) ############### melm 995$j LC-card-number:s -melm 995$k Call-Number -melm 995$k Local-classification +melm 995$k Call-Number:p,Local-classification:p,lcn:p #melm 952$a Local-classification #melm 995$a Record-source -- 2.39.2