Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 17 insertions, 11 deletions

diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index 5ade55870..d2562f080 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}}
@@ -26,7 +27,7 @@
 
    <div class='field checkbox'>
    <label class="mainlabel" for='id_nofinish'>{{$n_text}}</label>
-   <div><input type="checkbox" name='nofinish' id='id_nofinish' value="1" {{$n_checked}} onclick="showHideFinishDate(); return true;" >
+   <div class="pull-right"><input type="checkbox" name='nofinish' id='id_nofinish' value="1" {{$n_checked}} onclick="showHideFinishDate(); return true;" >
 	<label class="switchlabel" for='id_nofinish'> <span class="onoffswitch-inner" data-on='' data-off='' ></span>
 	<span class="onoffswitch-switch"></span> </label></div><span class='field_help'></span>
     </div>
@@ -48,7 +49,7 @@
 
 {{if $catsenabled}}
 <div id="event-category-wrap">
-	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" data-role="tagsinput"  />
+	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" data-role="cat-tagsinput"  />
 </div>
 {{/if}}
 
@@ -138,28 +139,27 @@
 		<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>
 
 
 
 <br />
+
 <div class="clear event-form-location-end"></div>
 
+{{if ! $eid}}
 
    <div class='field checkbox'>
    <label class="mainlabel" for='id_share'>{{$sh_text}}</label>
-   <div><input type="checkbox" name='share' id='id_share' value="1" {{$sh_checked}} >
+   <div class="pull-right"><input type="checkbox" name='share' id='id_share' value="1" {{$sh_checked}} >
 	<label class="switchlabel" for='id_share'> <span class="onoffswitch-inner" data-on='' data-off='' ></span>
 	<span class="onoffswitch-switch"></span> </label></div><span class='field_help'></span>
     </div>
@@ -168,10 +168,16 @@
 <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}}
 
+{{/if}}
+
 <div class="clear"></div>
+
+<button id="event-edit-preview-btn" class="btn btn-default" title="{{$preview}}" onclick="doEventPreview(); return false;"><i class="icon-eye-open" ></i></button>
+
 <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>