3 files changed, 22 insertions, 8 deletions
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index e2439e844..f57c06a9d 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -36,4 +36,8 @@
 
 #event-desc-text, #event-location-text, .event-form-location-end {
 	margin-top: 15px;
+}
+
+#event-edit-preview-btn {
+	margin-right: 15px;
 }
 \ No newline at end of file
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index 5ade55870..4f5736ddc 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -6,12 +6,13 @@
 {{$desc}}
 </p>
 
-<form action="{{$post}}" method="post" >
+<form id="event-edit-form" action="{{$post}}" method="post" >
 
 <input type="hidden" name="event_id" value="{{$eid}}" />
 <input type="hidden" name="event_hash" value="{{$event_hash}}" />
 <input type="hidden" name="xchan" value="{{$xchan}}" />
 <input type="hidden" name="mid" value="{{$mid}}" />
+<input type="hidden" name="preview" id="event-edit-preview" value="0" />
 
 <div id="event-summary-text">{{$t_text}}</div>
 <input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />{{$required}}
@@ -138,17 +139,14 @@
 		<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', 'loc'); return false;">
 			<i class="icon-facetime-video comment-icon"></i>
 		</button>
+		<button class="btn btn-default btn-xs" title="{{$mapper}}" onclick="insertbbcomment('{{$comment}}','map','loc'); return false;">
+			<i class="icon-globe comment-icon"></i>
+		</button>
 	</div>
 	
 	</div>
 					
-<!--	<div class="btn-group pull-right" id="comment-edit-submit-wrapper-loc">
-	{{if $preview}}
-	<button id="comment-edit-submit-loc" class="btn btn-default btn-xs" onclick="preview_comment(loc); return false;" title="{{$preview}}">
-		<i class="icon-eye-open comment-icon" ></i>
-	</button>
-	{{/if}}
--->
+
 </div>
 
 
@@ -168,10 +166,14 @@
 <div id="event-share-break"></div>
 
 
+
 <button id="event-permissions-button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
 {{$acl}}
 
 <div class="clear"></div>
+
+<button id="event-edit-preview-btn" class="btn btn-default btn-xs" title="{{$preview}}" onclick="doEventPreview(); return false;"><i class="icon-eye-open" ></i></button>
+
 <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
 
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 11dba2f9d..77e693b07 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -12,6 +12,14 @@
 		);			
 	}
 	
+	function doEventPreview() {
+		$('#event-edit-preview').val(1);
+		$.post('events',$('#event-edit-form').serialize(), function(data) {
+			$.colorbox({ html: data });
+		});
+	}
+
+
 	$(document).ready(function() {
 		$('#events-calendar').fullCalendar({
 			events: '{{$baseurl}}/events/json/',