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, 70 insertions, 34 deletions

diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 8335ebd62..77fb09492 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -1,38 +1,74 @@
-{{$listtitle}}
+<div class="section-title-wrapper">
+	{{if $editor}}
+	<div class="pull-right">
+		<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+	</div>
+	{{/if}}
+	<h2>{{$listtitle}}</h2>
+	<div class="clear"></div>
+</div>
+{{if $editor}}
+<div id="webpage-editor" class="section-content-tools-wrapper">
+	{{$editor}}
+</div>
+{{/if}}
 {{if $pages}}
-
-	   <div id="pagelist-content-wrapper" class="generic-content-wrapper-styled">
-		<table class="webpage-list-table">
-		<tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr>
+<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+	<table id="webpage-list-table">
+		<tr>
+			<th width="1%">{{$pagelink_txt}}</th>
+			<th width="95%">{{$title_txt}}</th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%" class="hidden-xs">{{$created_txt}}</th>
+			<th width="1%" class="hidden-xs">{{$edited_txt}}</th>
+		</tr>
 		{{foreach $pages as $key => $items}} 
-				{{foreach $items as $item}}
-					<tr>
-					<td>
-					{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}}
-					{{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}}
-					{{if $preview}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn btn-default"></i></a> {{/if}}
-					</td>
-					<td>
-					{{if $view}}<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
-					{{else}}{{$item.pagetitle}}
-					{{/if}}
-					</td>
-					<td>
-					{{$item.title}}
-					</td>
-					<td>
-					{{$item.created}}
-					</td>
-					<td>
-					{{$item.edited}}
-					</td>
-					</tr>
-				{{/foreach}}
+		{{foreach $items as $item}}
+		<tr id="webpage-list-item-{{$item.url}}">
+			<td>
+				{{if $view}}
+				<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+				{{else}}
+				{{$item.pagetitle}}
+				{{/if}}
+			</td>
+			<td>
+				{{$item.title}}
+			</td>
+			<td class="webpage-list-tool dropdown">
+				{{if $item.lockstate=='lock'}}
+				<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
+				<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $edit}}
+				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $item.bb_element}}
+				<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $edit}}
+				<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+				{{/if}}
+			</td>
+			<td class="hidden-xs">
+				{{$item.created}}
+			</td>
+			<td class="hidden-xs">
+				{{$item.edited}}
+			</td>
+		</tr>
+		{{/foreach}}
 		{{/foreach}}
-
-		</table>
-	   </div>
-	
-	   <div class="clear"></div>
-
+	</table>
+</div>
+<div class="clear"></div>
 {{/if}}