[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/AuthoritiesMarc.pm koha-tmpl/intranet-t... [rel_3_0]
|
From: |
Henri-Damien LAURENT |
|
Subject: |
[Koha-cvs] koha C4/AuthoritiesMarc.pm koha-tmpl/intranet-t... [rel_3_0] |
|
Date: |
Mon, 05 Feb 2007 13:16:09 +0000 |
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_3_0
Changes by: Henri-Damien LAURENT <hdl> 07/02/05 13:16:09
Modified files:
C4 : AuthoritiesMarc.pm
koha-tmpl/intranet-tmpl/prog/en/authorities:
searchresultlist.tmpl
koha-tmpl/opac-tmpl/prog/en: opac-authorities-home.tmpl
opac-authoritiessearchresultlist.tmpl
Added files:
koha-tmpl/opac-tmpl/prog/en: opac-authoritiesdetail.tmpl
Log message:
Removing Link from AuthoritiesMARC summary (caused a problem owed to
the API differences between opac and intranet)
+ removing $dbh in authoritysearch
+ adding links in templates on summaries to go to full view.
(no more links in popup authorities. or should we add it ?)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/AuthoritiesMarc.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.16&r2=1.28.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1
Patches:
Index: C4/AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.28.2.16
retrieving revision 1.28.2.17
diff -u -b -r1.28.2.16 -r1.28.2.17
--- C4/AuthoritiesMarc.pm 2 Feb 2007 18:07:42 -0000 1.28.2.16
+++ C4/AuthoritiesMarc.pm 5 Feb 2007 13:16:08 -0000 1.28.2.17
@@ -66,7 +66,8 @@
return ($tagfield,$tagsubfield);
}
sub authoritysearch {
- my ($dbh, $tags, $and_or, $excluding, $operator, $value,
$offset,$length,$authtypecode,$sortby) = @_;
+ my ($tags, $and_or, $excluding, $operator, $value,
$offset,$length,$authtypecode,$sortby) = @_;
+ my $dbh=C4::Context->dbh;
my $query;
my $attr;
# the marclist may contain "mainentry". In this case, search the
tag_to_report, that depends on
@@ -186,7 +187,8 @@
# }#
my $summary=getsummary($authrecord,$authid,$authtypecode);
- $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>";
+# $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>" if
($intranet);
+# $summary="<a href='detail.pl?authid=$authid'>".$summary.".</a>" if
($intranet);
# if ($linkid && $linksummary ne " ".$separator){
# $summary="<b>".$summary."</b>".$linksummary;
# }
@@ -946,8 +948,14 @@
=cut
-# $Id: AuthoritiesMarc.pm,v 1.28.2.16 2007/02/02 18:07:42 hdl Exp $
+# $Id: AuthoritiesMarc.pm,v 1.28.2.17 2007/02/05 13:16:08 hdl Exp $
# $Log: AuthoritiesMarc.pm,v $
+# Revision 1.28.2.17 2007/02/05 13:16:08 hdl
+# Removing Link from AuthoritiesMARC summary (caused a problem owed to the API
differences between opac and intranet)
+# + removing $dbh in authoritysearch
+# + adding links in templates on summaries to go to full view.
+# (no more links in popup authorities. or should we add it ?)
+#
# Revision 1.28.2.16 2007/02/02 18:07:42 hdl
# Sorting and searching for exact term now works.
#
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl 9 Jan
2007 15:18:10 -0000 1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl 5 Feb
2007 13:16:08 -0000 1.1.2.4
@@ -29,7 +29,7 @@
</tr>
<!-- TMPL_LOOP NAME="result" -->
<tr>
- <td><!-- TMPL_VAR NAME="summary" --></td>
+ <td><a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->"><!--
TMPL_VAR NAME="summary" --></a></td>
<!-- TMPL_UNLESS name="isEDITORS" -->
<td>
<a
href="../catalogue/search.pl?type=intranet&op=do_search&q=an=<!--TMPL_VAR
Name="authid" -->" class="button authority"><!-- TMPL_VAR NAME="used" -->
biblio(s)</a>
Index: koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-authorities-home.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl 7 Dec 2006
15:42:15 -0000 1.1.2.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-authorities-home.tmpl 5 Feb 2007
13:16:09 -0000 1.1.2.4
@@ -25,10 +25,11 @@
<label class="label100">Main entry ($a only)</label>
<select name="operator">
<option value="contains">contains</option>
- <option value="start">start by</option>
+ <option value="start">starts by</option>
+ <option value="is">is exactly</option>
</select>
<input type="text" name="value" value="<!-- TMPL_VAR
NAME="value" -->">
- <input type="hidden" name="marclist" value="$a">
+ <input type="hidden" name="marclist" value="mainmainentry">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
</p>
@@ -36,7 +37,8 @@
<label class="label100">Main entry</label>
<select name="operator">
<option value="contains">contains</option>
- <option value="start">start by</option>
+ <option value="start">starts by</option>
+ <option value="is">is exactly</option>
</select>
<input type="text" name="value" value="<!-- TMPL_VAR
NAME="value" -->">
<input type="hidden" name="marclist" value="mainentry">
@@ -47,7 +49,9 @@
<label class="label100">Anywhere</label>
<select name="operator">
<option value="contains">contains</option>
- <option value="start">start by</option>
+ <option value="start">starts by</option>
+ <option value="is">is exactly</option>
+
</select>
<input type="text" name="value" value="<!-- TMPL_VAR
NAME="value" -->">
<input type="hidden" name="marclist" value="">
Index: koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-authoritiessearchresultlist.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl 11 Jan
2007 14:38:18 -0000 1.1.2.4
+++ koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl 5 Feb
2007 13:16:09 -0000 1.1.2.5
@@ -42,7 +42,7 @@
</tr>
<!-- TMPL_LOOP NAME="result" -->
<tr>
- <td><!-- TMPL_VAR NAME="summary"
--></td>
+ <td><a
href="opac-authoritiesdetail.pl?authid=<!-- TMPL_VAR NAME="authid" -->"><!--
TMPL_VAR NAME="summary" --></a></td>
<td>
<!-- TMPL_VAR NAME="authtype" -->
Index: koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl
===================================================================
RCS file: koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl
diff -N koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/opac-tmpl/prog/en/opac-authoritiesdetail.tmpl 5 Feb 2007
13:16:09 -0000 1.1.2.1
@@ -0,0 +1,23 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName"
--> Catalog -- Advanced Search
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<body<!-- TMPL_IF NAME="OpacNav" --> id="withnav"<!-- /TMPL_IF -->>
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
+
+<div id="main">
+<div class="tabbed">
+ <h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR
name="authtypetext" -->)</h1>
+ <a href="opac-search.pl?type=opac&op=do_search&marclist=<!--
TMPL_VAR NAME="biblio_fields" -->&operator==&value=<!-- TMPL_VAR
NAME="authid" -->&and_or=and&excluding="><!-- TMPL_VAR name="count" -->
biblios</a>
+</div>
+<table border="0"><!-- TMPL_LOOP name="0XX" -->
+ <tr noborder ><td colspan="3" class="marctag"><b><!-- TMPL_VAR
name="tag" --></b></td></tr>
+ <!-- TMPL_LOOP name="subfield" -->
+ <tr><td class="marcsubfieldletter" ><!-- TMPL_VAR
name="marc_subfield" --></td>
+ <td class="marcsubfieldname" ><!-- TMPL_VAR
name="marc_lib" --></td>
+ <td class="subfieldvalue" ><!-- TMPL_VAR name="marc_value"
--></td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+</table>
+</div>
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/AuthoritiesMarc.pm koha-tmpl/intranet-t... [rel_3_0],
Henri-Damien LAURENT <=