new theme from evonne

htdocs/theme/default/templates/header.tpl

@@ -36,14 +36,20 @@
 			</ul></div>
 {/if}
 			<div id="header">
-				<div class="cornertopright"><img src="{image_path imagelocation='images/header_corner_topright.gif'}" border="0"></div>
+				<div class="cornertopright"><img src="{image_path imagelocation='images/header_corner_topright.gif'}" border="0"></div>		
+				<div class="searchbox">
+				<table><tr><td>
+				{$searchform}
+				</td></tr>
+				<tr><td>
+				<a href="{$WWWROOT}user/search.php">{str tag=advancedsearch}</a>
+				</tr></td></table>
+				</div>
 				<div class="logo"><a href="{$WWWROOT}"><img src="{image_path imagelocation='images/logo.gif'}" border="0"></a></div>
 				<h1 class="hiddenStructure"><a href="{$WWWROOT}">{$heading|default:"Mahara"|escape}</a></h1>
-				
 			</div>
 		</div>
 		<div id="mainwrapper">
-			<div id="maincontentwrapper">	
 {if $MAINNAV}
         <ul id="mainnav"><span class="mainnav-left"><img src="{image_path imagelocation='images/navbg_left.gif'}" border="0"></span><span class="mainnav-right"><img src="{image_path imagelocation='images/navbg_right.gif'}" border="0"></span>
 {foreach from=$MAINNAV item=item}
@@ -66,6 +72,7 @@
         </ul>
     {/if}
 {/if}
+			<div id="maincontentwrapper">	
         {insert name="messages"}
 		
 	
\ No newline at end of file

htdocs/theme/default/templates/index.tpl

 {include file="header.tpl"}
 
+<div id="column-right">
 {if !$LOGGEDIN}
-<div class="sidebar" id="loginbox">
+<div id="loginbox">
 <noscript><p>{str tag="javascriptnotenabled"}</p></noscript>
 
 {$login_form}
 	<div class="sidebar-botcorners"><img src="{image_path imagelocation='images/sidebox_bot.gif'}" border="0"></div>
 </div>
-{else}
-{include file="searchbox.tpl"}
 {/if}
 
 {include file="adminmenu.tpl"}
+
+</div>
+
+
+<div id="column-left">
 <div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span 
-class="cnr-bl"><span class="cnr-br">
-	<div class="maincontent">
+<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+<div class="maincontent">
 	
-    {$page_content}
+  {$page_content}
 	
-	</div>
-</span></span></span></span></div>	
 </div>
+</span></span></span></span></div>
+</div>
+</div>
+
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/login.tpl

 {include file="header.tpl"}
 
-<div class="sidebar" id="loginbox">
+<div id="loginbox">
 <noscript><p>{str tag="javascriptnotenabled"}</p></noscript>
 
 {$login_form}

htdocs/theme/default/templates/sitepage.tpl

 {include file="header.tpl"}
 
-{include file="searchbox.tpl"}
-
 {include file="adminmenu.tpl"}
 
 <div class="content">

htdocs/theme/default/templates/user/view.tpl

 {include file="header.tpl"}
-{include file="searchbox.tpl"}
 {include file="adminmenu.tpl"}
 
 <div class="content">

htdocs/theme/default/templates/view/index.tpl

 {include file="header.tpl"}
 
-{include file="searchbox.tpl"}
-
 {include file="adminmenu.tpl"}
 
 <div class="content">