From: rangi <rangi>
Date: Sat, 3 May 2003 03:06:01 +0000 (+0000)
Subject: Fix for 418
X-Git-Tag: R_1-9-3~82
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=7683a424ce74035ef46bd6f6e38ce4b6c4d18cc3;p=koha_fer

Fix for 418
---

diff --git a/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
index 819d313e5f..2ea4239471 100644
--- a/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
@@ -79,7 +79,8 @@ circulation.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-circulation
 			<td background="" colspan=5><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" onMouseOver="if(document.images)document.search.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-search.gif'" 		onMouseOut="if(document.images)document.search.src='<TMPL_VAR NAME='themelang'>/images/front-search.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-search.gif" width=320 	height=37 name="search"
 			hspace=0 vspace=0 border=0></a></td>
 		</tr>
-		<FORM ACTION="/cgi-bin/koha/loadmodules.pl" method=post>
+
+
 		<tr valign=top >
 			<td background="" rowspan=3 align="right" colspan=5>
 				<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
@@ -90,6 +91,8 @@ circulation.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-circulation
 			<td></td>
 			<td></td>
 			<td background="" colspan=3>
+		 <TMPL_IF NAME="NOTMARC">
+		                <FORM ACTION="/cgi-bin/koha/loadmodules.pl" method=post>
 				<input type="hidden" name="module" value="search">
 				<input type="hidden" name="type" value="intranet">
 				<input type=text size="27" name="keyword"><input type=reset value="clr"><br>
@@ -99,12 +102,11 @@ circulation.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-circulation
 			<font size=2 face="arial narrow,arial,helvetica">
 			<img src="<TMPL_VAR NAME='themelang'>/images/front-arrow-purple.gif" width=27 height=22
 			alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
-
+			</form>
+		  </TMPL_IF>
 			<img src="/images/holder.gif" width=1 height=8
 			alt=" " hspace=0 vspace=0></td>
-
-		</tr>
-		</form>
+		</tr>		
 
 		<!--------MEMBER SEARCH----->
 
diff --git a/mainpage.pl b/mainpage.pl
index cf3b48601d..b94354942e 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -18,4 +18,7 @@ my ($template, $loggedinuser, $cookie)
 			     debug => 1,
 			     });
 
+my $marc_p = C4::Context->boolean_preference("marc");
+$template->param(NOTMARC => !$marc_p);
+
 output_html_with_http_headers $query, $cookie, $template->output;