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, 28 insertions, 30 deletions

diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index a18fbb0ef..3200766ca 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -1,32 +1,30 @@
-
-<h2>{{$header}}</h2>
-
-<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
-
-<input type="hidden" name="menu_id" value="{{$menu_id}}" />
-
-{{if $mitem_id}}
-<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
-{{/if}}
-
-{{include file="field_input.tpl" field=$mitem_desc}} 
-{{include file="field_input.tpl" field=$mitem_link}}
-{{include file="field_input.tpl" field=$mitem_order}}
-{{include file="field_checkbox.tpl" field=$usezid}}
-{{include file="field_checkbox.tpl" field=$newwin}}
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
-	{{$aclselect}}
-	<div id="settings-default-perms-menu-end"></div>
+{{if $header}}
+<div class="section-title-wrapper">
+	<h2>{{$header}}</h2>
 </div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-
-
-<div class="mitemedit-submit-wrapper" >
-<input id="dbtn-submit" type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" />
+{{/if}}
+<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
+	<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" >
+		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
+		{{if $mitem_id}}
+		<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
+		{{/if}}
+		{{include file="field_input.tpl" field=$mitem_desc}}
+		{{include file="field_input.tpl" field=$mitem_link}}
+		{{include file="field_input.tpl" field=$mitem_order}}
+		{{include file="field_checkbox.tpl" field=$usezid}}
+		{{include file="field_checkbox.tpl" field=$newwin}}
+		<div class="pull-right btn-group form-group">
+			<div class="btn-group">
+				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+				</button>
+				{{if $submit_more}}
+				<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i id="jot-perms-icon" class="icon-caret-right"></i></button>
+				{{/if}}
+				<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+			</div>
+			{{$aclselect}}
+		</div>
+	</form>
 </div>
-
-</form>