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, 16 insertions, 2 deletions

diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
index 0a0085497..cd146377d 100644
--- a/view/tpl/layoutlist.tpl
+++ b/view/tpl/layoutlist.tpl
@@ -1,5 +1,20 @@
-{{if $pages}}
+<div class="section-title-wrapper">
+	{{if $editor}}
+	<div class="pull-right">
+		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+		<a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="icon-info"></i>&nbsp;{{$help.text}}</a>
+	</div>
+	{{/if}}
+	<h2>{{$title}}</h2>
+	<div class="clear"></div>
+</div>
+{{if $editor}}
+<div id="layout-editor" class="section-content-tools-wrapper">
+	{{$editor}}
+</div>
+{{/if}}
 
+{{if $pages}}
 	   <div id="pagelist-content-wrapper" class="generic-content-wrapper">
 		{{foreach $pages as $key => $items}} 
 				{{foreach $items as $item}}
@@ -15,5 +30,4 @@
 	   </div>
 	
 	   <div class="clear"></div>
-
 {{/if}}