[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha MARCdetail.pl koha-tmpl/intranet-tmpl/npl/... [rel_2_2]
|
From: |
Ryan Higgins |
|
Subject: |
[Koha-cvs] koha MARCdetail.pl koha-tmpl/intranet-tmpl/npl/... [rel_2_2] |
|
Date: |
Thu, 19 Apr 2007 18:36:40 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Ryan Higgins <rych> 07/04/19 18:36:40
Modified files:
. : MARCdetail.pl
koha-tmpl/intranet-tmpl/npl/en/catalogue: MARCdetail.tmpl
Log message:
mv <a> tag out of script to tmpl with isurl flag.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/MARCdetail.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.25.2.25&r2=1.25.2.26
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.7&r2=1.3.2.8
Patches:
Index: MARCdetail.pl
===================================================================
RCS file: /sources/koha/koha/Attic/MARCdetail.pl,v
retrieving revision 1.25.2.25
retrieving revision 1.25.2.26
diff -u -b -r1.25.2.25 -r1.25.2.26
--- MARCdetail.pl 7 Dec 2006 15:31:59 -0000 1.25.2.25
+++ MARCdetail.pl 19 Apr 2007 18:36:40 -0000 1.25.2.26
@@ -167,7 +167,8 @@
$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
$subf[$i][1] =~ s/\n/<br\/>/g;
if
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
- $subfield_data{marc_value}="<a
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ $subfield_data{marc_value}=$subf[$i][1];
+ $subfield_data{isurl} = 1;
} elsif
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq
"biblioitems.isbn") {
# warn " tag :
".$tagslib->{$fields[$x_i]->tag()}." subfield
:".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN :
".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
Index: koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/Attic/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/npl/en/catalogue/MARCdetail.tmpl 10 Aug 2006
17:01:56 -0000 1.3.2.7
+++ koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl 19 Apr 2007
18:36:40 -0000 1.3.2.8
@@ -52,7 +52,8 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a href="<!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML
--></a>
+ <!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
@@ -80,7 +81,8 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a href="<!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML
--></a>
+ <!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=\'<!-- TMPL_VAR
NAME="link" -->\'&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
@@ -108,7 +110,8 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a href="<!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML
--></a>
+ <!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=\'<!-- TMPL_VAR
NAME="link" -->\'&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
@@ -136,7 +139,8 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a href="<!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML
--></a>
+ <!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=\'<!-- TMPL_VAR
NAME="link" -->\'&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
@@ -164,7 +168,8 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a href="<!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML
--></a>
+ <!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=\'<!-- TMPL_VAR
NAME="link" -->\'&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
@@ -192,7 +197,7 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a href="<!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML
--></a> <!-- TMPL_ELSE --><!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=\'<!-- TMPL_VAR
NAME="link" -->\'&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
@@ -220,7 +225,8 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a
href="<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_VAR
NAME="marc_value" ESCAPE=HTML --></a>
+ <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=\'<!-- TMPL_VAR
NAME="link" -->\'&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
@@ -248,7 +254,8 @@
<label class="labelsubfield">
<!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_lib"
--></label>
- <!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML -->
+ <!-- TMPL_IF NAME="isurl" --><a
href="<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->"><!-- TMPL_IF
NAME="linktext" --><!-- TMPL_VAR NAME="linktext" --><!-- TMPL_ELSE --><!--
TMPL_VAR NAME="marc_value" ESCAPE=HTML --><!-- /TMPL_IF --></a>
+ <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value"
ESCAPE=HTML --><!-- /TMPL_IF -->
<!-- TMPL_IF name="link" -->
<a
href="search.marc/search.pl?op=do_search&marclist=\'<!-- TMPL_VAR
NAME="link" -->\'&operator==&type=intranet&value=<!-- TMPL_VAR
NAME="marc_value" ESCAPE=URL -->">
<img border="0"
src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme"
-->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR
name="marc_value" -->">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha MARCdetail.pl koha-tmpl/intranet-tmpl/npl/... [rel_2_2],
Ryan Higgins <=