[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-authoritie... [rel_2_2]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch: 	rel_2_2
Changes by:	Joshua Ferraro <kados at savannah.gnu.org>	06/04/10 20:30:06

Modified files:
	koha-tmpl/opac-tmpl/npl/en: opac-authoritiesdetail.tmpl 

Log message:
	fixing prob with last commit, also fixes search link (print link still
	not working)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.3&tr2=1.1.2.4&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl:1.1.2.3 koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl:1.1.2.4
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl:1.1.2.3	Mon Apr 10 20:22:22 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-authoritiesdetail.tmpl	Mon Apr 10 20:30:06 2006
@@ -6,9 +6,8 @@
 <div id="main">
 <div class="tabbed">
 	<h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
-<<<<<<< opac-authoritiesdetail.tmpl
-	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')">Print</a>
-	<a href="../search.marc/search.pl?type=opac&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR name="count" --> biblios</a>
+	<a href="javascript:Dopop('opac-detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')">Print</a>
+	<a href="opac-search.pl?type=opac&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR name="count" --> biblios</a>
 </div>
 <table><!-- TMPL_LOOP name="0XX" -->
         <tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
@@ -20,25 +19,6 @@
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_LOOP -->
 </table>
-=======
-	</div>
-
-<div name="0XX" id="0XX" class="tab" style="visibility:visible">
-	<!-- TMPL_LOOP NAME="0XX" -->
-			<p class="MARCtag">
-				<!-- TMPL_VAR NAME="tag" -->
-			</p>
-		<!-- TMPL_LOOP NAME="subfield" -->
-			<p>
-				<label class="labelsubfield">
-				<!-- TMPL_VAR NAME="marc_subfield" -->
-				<!-- TMPL_VAR NAME="marc_lib" --></label>
-				<!-- TMPL_VAR NAME="marc_value" -->
-			</p>
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-</div>
->>>>>>> 1.1.2.2
 </div>	
 </body>
 </html>