[Koha-cvs] koha/koha-tmpl intranet-tmpl/npl/en/parameterss... [rel_2_2]

Owen Leonard oleonard at athenscounty.lib.oh.us
Thu Jun 15 18:58:18 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Owen Leonard <oleonard>	06/06/15 16:58:18

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/parameters: 
	                                           systempreferences.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/search.marc: result.tmpl 
	koha-tmpl/opac-tmpl/npl/en: opac-dictionary.tmpl 
	                            opac-searchresults.tmpl 

Log message:
	A few random minor changes to sync npl with default templates

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.5&r2=1.3.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.4&r2=1.5.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.11&r2=1.1.2.12

Patches:
Index: intranet-tmpl/npl/en/parameters/systempreferences.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/systempreferences.tmpl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -b -r1.3.2.5 -r1.3.2.6
--- intranet-tmpl/npl/en/parameters/systempreferences.tmpl	26 Jan 2006 21:47:09 -0000	1.3.2.5
+++ intranet-tmpl/npl/en/parameters/systempreferences.tmpl	15 Jun 2006 16:58:17 -0000	1.3.2.6
@@ -198,6 +198,11 @@
 					</a>
 				<!--/TMPL_IF-->
 			</li>
+	<!--TMPL_IF Name="Librarian"-->
+			<li><a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="here">Intranet</a></li>
+	<!--TMPL_ELSE-->
+			<li><a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet</a></li>
+	<!--/TMPL_IF-->
 			<li>
 				<!--TMPL_IF Name="Members"-->
 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="here">Members

Index: intranet-tmpl/npl/en/search.marc/result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -b -r1.5.2.4 -r1.5.2.5
--- intranet-tmpl/npl/en/search.marc/result.tmpl	20 Apr 2006 21:44:59 -0000	1.5.2.4
+++ intranet-tmpl/npl/en/search.marc/result.tmpl	15 Jun 2006 16:58:17 -0000	1.5.2.5
@@ -46,7 +46,7 @@
 					</p></td>
 					<td><!-- TMPL_VAR NAME="classification" --></td>
 			<td><!-- TMPL_VAR NAME="totitem" --></td>
-<td><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR NAME="holdingbranch" --><!-- TMPL_IF name="date_due" --> (due <!-- TMPL_VAR NAME="date_due" -->)	<!-- TMPL_ELSE --><!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS --></td>
+<td><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR NAME="holdingbranch" --><!-- TMPL_IF name="date_due" --> (due <!-- TMPL_VAR NAME="date_due" -->)	<!-- TMPL_ELSE --><!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- TMPL_IF name="cnt" --> x <!-- TMPL_VAR name="cnt" --> <!--/TMPL_IF--><!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS --></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table></div>

Index: opac-tmpl/npl/en/opac-dictionary.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-dictionary.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- opac-tmpl/npl/en/opac-dictionary.tmpl	11 Apr 2006 21:22:24 -0000	1.1.2.5
+++ opac-tmpl/npl/en/opac-dictionary.tmpl	15 Jun 2006 16:58:17 -0000	1.1.2.6
@@ -120,6 +120,9 @@
 	<!-- /TMPL_IF -->
 	<script language="JavaScript" type="text/javascript">
 	function SelectEntry(myentry, myindex, wclose){
+		re = /<.*?>/
+		myentry=myentry.replace(/<.*?>/g,"");
+		myentry=myentry.replace(/<\/.*?>/,"");
 		if (window.opener.document.getElementById(myindex).value!=""){ 
 			window.opener.document.getElementById(myindex).value = window.opener.document.getElementById(myindex).value+" "+myentry
 		} else {

Index: opac-tmpl/npl/en/opac-searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- opac-tmpl/npl/en/opac-searchresults.tmpl	27 Apr 2006 17:02:20 -0000	1.1.2.11
+++ opac-tmpl/npl/en/opac-searchresults.tmpl	15 Jun 2006 16:58:17 -0000	1.1.2.12
@@ -70,7 +70,7 @@
 					<td><a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search"><!-- TMPL_VAR NAME="author" --></a></td>
 <td><!-- TMPL_VAR NAME="classification" --></td>
 				<td><!-- TMPL_VAR name="totitem" -->
-				</td><td><!-- TMPL_LOOP name="CN" --><!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" -->	<!-- TMPL_IF name="date_due" -->	<i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i><!-- TMPL_ELSE --><!-- TMPL_IF name="itemcallnumber" --> (<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td></tr><!-- /TMPL_LOOP -->
+				</td><td><!-- TMPL_LOOP name="CN" --><!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" --><!-- TMPL_IF name="cnt" -->(<!-- TMPL_VAR name="cnt" -->)<!--/TMPL_IF-->	<!-- TMPL_IF name="date_due" -->	<i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i><!-- TMPL_ELSE --><!-- TMPL_IF name="itemcallnumber" --> (<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td></tr><!-- /TMPL_LOOP -->
 	</table>
 </form>
 





More information about the Koha-cvs mailing list