Commit 73906dde authored by Andrew Vincent Pover's avatar Andrew Vincent Pover
Browse files

Merge branch 'master' into 'master'

Removed google search bar closes #16

Removed the google search bar as I suggested in issue #16

See merge request !8
parents 29cb5ed3 442c04fe
......@@ -3,9 +3,6 @@
<div id="navigation">
{include file="menu.tpl"}
{include file="search.tpl"}
{if $session->loggedin}
<div style="resize: both;">
{include file="feedback.tpl"}
......@@ -29,7 +26,7 @@
</div>
{if $action=="edit"}
<!--
<!--
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script language="javascript" type="text/javascript" src="{$baseurl}/js/tiny_mce.js"></script>
--!>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment