From 987619130b99bf4548d5d31ac453cdf48c818eff Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 24 Nov 2015 14:15:28 +0100
Subject: some event heavy lifting - please test and report issues

---
 view/tpl/events-js.tpl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'view/tpl/events-js.tpl')

diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index d481af2e9..b2de90da1 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,8 +1,8 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button class="btn btn-default btn-xs" onclick="openClose('event-tools');"><i class="icon-cog"></i></button>
-			<button class="btn btn-success btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button>
+			<button class="btn btn-default btn-xs" onclick="openClose('event-tools'); closeMenu('form');"><i class="icon-cog"></i></button>
+			<button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
 
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
@@ -13,6 +13,9 @@
 		<h2 id="title"></h2>
 		<div class="clear"></div>
 	</div>
+	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
+		{{$form}}
+	</div>
 	<div id="event-tools" class="section-content-tools-wrapper" style="display:none;">
 		<div class="form-group">
 			<button class="btn btn-primary btn-xs" onclick="exportDate(); return false;"><i class="icon-download"></i>&nbsp;{{$export.1}}</button>
-- 
cgit v1.2.3