[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha catalogue/MARCdetail.pl koha-tmpl/intranet... [rel_3_0]
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha catalogue/MARCdetail.pl koha-tmpl/intranet... [rel_3_0] |
|
Date: |
Thu, 02 Nov 2006 14:57:34 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 06/11/02 14:57:33
Modified files:
catalogue : MARCdetail.pl
koha-tmpl/intranet-tmpl/prog/en/catalogue: MARCdetail.tmpl
Log message:
adding short_desc & long_desc to avoid label conflict : now, the label
is shown in short size (15 char) with a span title=long_desc
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/MARCdetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.7&r2=1.3.2.8
Patches:
Index: catalogue/MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/MARCdetail.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- catalogue/MARCdetail.pl 10 Aug 2006 13:23:09 -0000 1.5
+++ catalogue/MARCdetail.pl 2 Nov 2006 14:57:33 -0000 1.5.2.1
@@ -159,7 +159,8 @@
next if
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{tab} ne $tabloop);
next if
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{hidden});
my %subfield_data;
-
$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
+
$subfield_data{short_desc}=substr($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib},0,15);
+
$subfield_data{long_desc}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
# warn "tag :
".$tagslib->{$fields[$x_i]->tag()}." subfield
:".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}."lien koha? :
"$subfield_data{link};
if
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -b -r1.3.2.7 -r1.3.2.8
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl 30 Oct 2006
15:18:01 -0000 1.3.2.7
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl 2 Nov 2006
14:57:33 -0000 1.3.2.8
@@ -97,9 +97,9 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
- <!-- TMPL_VAR NAME="marc_lib" --></label>
+ <span title="<!-- TMPL_VAR name="long_desc" -->"><!--
TMPL_VAR NAME="short_desc" --></span></label>
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF name="link" -->
<a
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&marclist=<!-- TMPL_VAR
NAME="link" -->&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
@@ -125,7 +125,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -153,7 +153,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -181,7 +181,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -209,7 +209,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -237,7 +237,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -265,7 +265,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -293,7 +293,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -321,7 +321,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
@@ -349,7 +349,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield" -->
<p>
- <label class="labelsubfield">
+ <label>
<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib" --></label>
<!-- TMPL_VAR NAME="marc_value" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha catalogue/MARCdetail.pl koha-tmpl/intranet... [rel_3_0],
paul poulain <=