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

[Owen Leonard]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Owen Leonard <oleonard>	06/10/17 01:04:57

Modified files:
	koha-tmpl/opac-tmpl/npl/en: opac-main.tmpl opac-search.tmpl 

Log message:
	Synching with default templates

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.15&r2=1.3.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.14&r2=1.1.2.15

Patches:
Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3.2.15
retrieving revision 1.3.2.16
diff -u -b -r1.3.2.15 -r1.3.2.16
--- opac-main.tmpl	22 May 2006 12:22:27 -0000	1.3.2.15
+++ opac-main.tmpl	17 Oct 2006 01:04:57 -0000	1.3.2.16
@@ -28,6 +28,19 @@
 			<input type="hidden" name="excluding" value="" />
 			<input type="hidden" name="operator" value="contains" />
 			<input type="text" size="27" name="value" id="value" /></p>
+		 <!--TMPL_IF Name="mylibraryfirst"--><p>
+				in Branch
+				<input type="hidden" name="marclist" value="items.holdingbranch" />
+				<input type="hidden" name="and_or" value="and" />
+				<input type="hidden" name="excluding" value="" />
+				<input type="hidden" name="operator" value="=" />  
+                <select name="value">
+                    <option value="">Any Branch</option>
+                        <!-- TMPL_LOOP name="branchloop" -->
+                    <option value="<!-- TMPL_VAR name="value" -->" <!--TMPL_IF Name="selected"-->selected<!--/TMPL_IF-->> <!-- TMPL_VAR name="branchname" -->  </option>
+                        <!-- /TMPL_LOOP -->
+                </select>
+            </p><!-- /TMPL_IF -->
 		<p><input type="submit" value="Search" class="submit" /></p>
 		<p>
 			<a href="/cgi-bin/koha/opac-search.pl">Advanced Search (More Options)</a>

Index: opac-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- opac-search.tmpl	21 Apr 2006 21:22:59 -0000	1.1.2.14
+++ opac-search.tmpl	17 Oct 2006 01:04:57 -0000	1.1.2.15
@@ -32,11 +32,7 @@
 		</select>
 		</p>
 </div>
-<!-- Display for NPL <div class="sidebar-box">
-			<h3>More Searches:</h3>
-			<h4><a href="/opac-format-search.php">Search by Format and Date</a></h4>
-			<p>Find the latest additions</p>
-</div> /Display for NPL --></div>
+</div>
 
 <table>
 <tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
@@ -80,7 +76,12 @@
 				<input type="hidden" name="and_or" value="and" />
 				<input type="hidden" name="excluding" value="" />
 				<input type="hidden" name="operator" value="=" />  
-				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
+				 <select name="value" id="branch">
+                    <option value="">Any Branch</option>
+                        <!-- TMPL_LOOP name="branchloop" -->
+                    <option value="<!-- TMPL_VAR name="value" -->"<!--TMPL_IF Name="selected"-->selected="selected"<!--/TMPL_IF-->> <!-- TMPL_VAR name="branchname" -->  </option>
+                        <!-- /TMPL_LOOP -->
+                </select></td></tr>
 </table>			
 <p><input type="submit" value="Search" class="submit" /></p>
 <table>