Merge https://github.com/redmatrix/redmatrix into pending_merge

7 files changed, 88 insertions, 79 deletions

diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index da5b1e859..4794c0b83 100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -25,8 +25,8 @@
 		'croppa',
 		{
 			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
+			minWidth: 300,
+			minHeight: 300,
 			maxWidth: 640,
 			maxHeight: 640,
 			ratioDim: { x: 100, y:100 },
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 20e597909..3be40e978 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1,12 +1,14 @@
-<div class="section-title-wrapper">
-	{{if $delete}}
-	<div class="pull-right">
-		<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $delete}}
+		<div class="pull-right">
+			<a  href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="webpage-editor" class="section-content-tools-wrapper">
+		{{$editor}}
 	</div>
-	{{/if}}
-	<h2>{{$title}}</h2>
-	<div class="clear"></div>
-</div>
-<div id="webpage-editor" class="section-content-tools-wrapper">
-	{{$editor}}
 </div>
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 7fc17471c..0e5df2c47 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -1,4 +1,5 @@
 {{if $header}}
+<div class="generic-content-wrapper">
 <div class="section-title-wrapper">
 	{{if $menu_id}}
 	<div class="pull-right">
@@ -27,3 +28,6 @@
 		<div class="clear"></div>
 	</form>
 </div>
+{{if $header}}
+</div>
+{{/if}}
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index cdc022c5c..8715d6391 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -1,37 +1,42 @@
 {{if $header}}
-<div class="section-title-wrapper">
-	<h2>{{$header}}</h2>
-</div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
 {{/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}}
-		{{if $menu_names}}
-		<datalist id="menu-names">
-			{{foreach $menu_names as $menu_name}}
-			<option value="{{$menu_name}}">
-			{{/foreach}}
-		</datalist>
-		{{/if}}
-		{{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 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 class="icon-caret-right"></i></button>
-				{{/if}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+	<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}}
+			{{if $menu_names}}
+			<datalist id="menu-names">
+				{{foreach $menu_names as $menu_name}}
+				<option value="{{$menu_name}}">
+				{{/foreach}}
+			</datalist>
+			{{/if}}
+			{{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 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 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>
-			{{$aclselect}}
-		</div>
-	</form>
+			<div class="clear"></div>
+		</form>
+	</div>
+{{if $header}}
 </div>
+{{/if}}
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 4e606654f..8686d4204 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -1,35 +1,34 @@
-<div class="section-title-wrapper">
-	<div class="pull-right">
-		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+		</div>
+		<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
+		<div class="clear"></div>
 	</div>
-	<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
-	<div class="clear"></div>
-</div>
 
-{{$create}}
+	{{$create}}
 
-{{if $mlist }}
-<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
-	<table id="mitem-list-table">
-		<tr>
-			<th width="1%">{{$nametitle}}</th>
-			<th width="96%">{{$targettitle}}</th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-			<th width="1%"></th>
-		</tr>
-		{{foreach $mlist as $m }}
-		<tr id="mitem-list-item-{{$m.mitem_id}}">
-			<td width="1%">{{$m.mitem_desc}}</td>
-			<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
-			<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
-			<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
-			<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
-		</tr>
-		{{/foreach}}
-	</table>
+	{{if $mlist }}
+	<div id="mitemlist-content-wrapper" class="section-content-wrapper-np">
+		<table id="mitem-list-table">
+			<tr>
+				<th width="1%">{{$nametitle}}</th>
+				<th width="96%">{{$targettitle}}</th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+				<th width="1%"></th>
+			</tr>
+			{{foreach $mlist as $m }}
+			<tr id="mitem-list-item-{{$m.mitem_id}}">
+				<td width="1%">{{$m.mitem_desc}}</td>
+				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
+				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
+				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+			</tr>
+			{{/foreach}}
+		</table>
+	</div>
+	{{/if}}
 </div>
-{{/if}}
-
- 
-
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 2964d9c4b..9eac48c6d 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,5 @@
 <div class="vcard">
-
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 	{{if $profile.edit}}
 	<div class="dropdown">
 	<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
@@ -18,7 +18,6 @@
 	<div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
 	{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}		
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
 
 
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index ca0fe76be..2acbb24e4 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,6 +1,6 @@
 <div class="vcard">
-<div class="fn">{{$name}}</div>
 <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+<div class="fn">{{$name}}</div>
 </div>