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

13 files changed, 127 insertions, 66 deletions

diff --git a/include/comanche.php b/include/comanche.php
index e0d3af985..c1a98ed6c 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -155,7 +155,7 @@ function comanche_block($s) {
 			dbesc($name)
 		);
 		if($r) {
-			$o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock">');
+			$o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock widget">');
 			if($r[0]['title'])
 				$o .= '<h3>' . $r[0]['title'] . '</h3>';
 
diff --git a/include/conversation.php b/include/conversation.php
index 19c5bda14..42ce140a6 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1200,6 +1200,7 @@ function status_editor($a, $x, $popup = false) {
 		'$shortnoloc' => t('clear location'),
 		'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
 		'$placeholdertitle' => t('Title (optional)'),
+		'$hidetitle' => ((x($x, 'hidetitle')) ? $x['hidetitle'] : false),
 		'$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''),
 		'$category' => "",
 		'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
diff --git a/mod/blocks.php b/mod/blocks.php
index f609164e0..23a66f8d9 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -106,7 +106,7 @@ function blocks_content(&$a) {
 
 	$editor = status_editor($a,$x);
 
-	$r = q("select * from item_id left join item on item_id.iid = item.id
+	$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
 		where item_id.uid = %d and service = 'BUILDBLOCK' order by item.created desc",
 		intval($owner)
 	);
@@ -118,6 +118,7 @@ function blocks_content(&$a) {
 		foreach($r as $rr) {
 			$element_arr = array(
 				'type'      => 'block',
+				'title'	    => $rr['title'],
 				'body'      => $rr['body'],
 				'created'   => $rr['created'],
 				'edited'    => $rr['edited'],
@@ -127,7 +128,8 @@ function blocks_content(&$a) {
 			);
 			$pages[$rr['iid']][] = array(
 				'url' => $rr['iid'],
-				'title' => $rr['sid'],
+				'name' => $rr['sid'],
+				'title' => $rr['title'],
 				'created' => $rr['created'],
 				'edited' => $rr['edited'],
 				'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
@@ -142,6 +144,7 @@ function blocks_content(&$a) {
 		'$baseurl' => $url,
 		'$title' => t('Blocks'),
 		'$name' => t('Block Name'),
+		'$blocktitle' => t('Block Title'),
 		'$created' => t('Created'),
 		'$edited' => t('Edited'),
 		'$create' => t('Create'),
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 437c164c1..5c9b62cbb 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -23,7 +23,6 @@ function editlayout_init(&$a) {
 
 function editlayout_content(&$a) {
 
-
 	if(! $a->profile) {
 		notice( t('Requested profile is not available.') . EOL );
 		$a->error = 404;
@@ -69,7 +68,6 @@ function editlayout_content(&$a) {
 
 	$o = '';
 
-
 	// Figure out which post we're editing
 	$post_id = ((argc() > 2) ? intval(argv(2)) : 0);
 
@@ -105,7 +103,9 @@ function editlayout_content(&$a) {
 	$plaintext = true;
 
 	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Layout')
+		'$title' => t('Edit Layout'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id']
 	));
 	
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
@@ -176,27 +176,6 @@ function editlayout_content(&$a) {
 		'$feature_expire'      => false,
 		'$expires'             => t('Set expiration date'),
 	));
-	
-
-	if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash))
-		$o .= '<br /><br /><a class="layout-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
-
-
-	$x = array(
-		'type'      => 'layout',
-		'title'     => $itm[0]['title'],
-		'body'      => $itm[0]['body'],
-		'term'      => $itm[0]['term'],
-		'created'   => $itm[0]['created'],
-		'edited'    => $itm[0]['edited'],
-		'mimetype'  => $itm[0]['mimetype'],
-		'pagetitle' => $page_title,
-		'mid'       => $itm[0]['mid']
-	);
-
-	$o .= EOL . EOL . t('Share') . EOL . '<textarea onclick="this.select();" class="shareable_element_text" >[element]' . base64url_encode(json_encode($x)) . '[/element]</textarea>' . EOL . EOL; 
-
-
 
 	return $o;
 
diff --git a/mod/impel.php b/mod/impel.php
index 1b641b301..f4d40f7a8 100644
--- a/mod/impel.php
+++ b/mod/impel.php
@@ -118,4 +118,4 @@ function impel_init(&$a) {
 
 	json_return_and_die(true);
 
-}
\ No newline at end of file
+}
diff --git a/mod/layouts.php b/mod/layouts.php
index 04d81f91e..57300777a 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -88,6 +88,9 @@ function layouts_content(&$a) {
 		return;
 	}
 
+	//This feature is not exposed in redbasic ui since it is not clear why one would want to
+	//download a json encoded pdl file - we dont have a possibility to import it.
+	//Use the buildin share/install feature instead.
 	if((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
 		$r = q("select sid, service, mimetype, title, body  from item_id 
 			left join item on item.id = item_id.iid 
@@ -103,18 +106,6 @@ function layouts_content(&$a) {
 		}
 	}
 
-	$tabs = array(
-		array(
-		'label' => t('Layout Help'),
-		'url'   => 'help/Comanche',
-		'sel'   => '',
-		'title' => t('Help with this feature'),
-		'id'    => 'layout-help-tab',
-	));
-
-	//$o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
-
-
 	// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
 	// Nickname is set to the observers xchan, and profile_uid to the owners.  
 	// This lets you post pages at other people's channels.
@@ -123,8 +114,6 @@ function layouts_content(&$a) {
 		'webpage'     => ITEM_PDL,
 		'is_owner'    => true,
 		'nickname'    => $a->profile['channel_address'],
-		//do we need that at this place?
-		//'lockstate'   => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 		'bang'        => '',
 		'showacl'     => false,
 		'visitor'     => false,
@@ -141,11 +130,10 @@ function layouts_content(&$a) {
 	if($_REQUEST['pagetitle'])
 		$x['pagetitle'] = $_REQUEST['pagetitle'];
 
-
 	$editor = status_editor($a,$x);
 
-	$r = q("select iid, sid, mid from item_id left join item on item.id = item_id.iid 
-		where item_id.uid = %d and service = 'PDL' order by sid asc",
+	$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
+		where item_id.uid = %d and service = 'PDL' order by item.created desc",
 		intval($owner)
 	);
 
@@ -154,10 +142,23 @@ function layouts_content(&$a) {
 	if($r) {
 		$pages = array();
 		foreach($r as $rr) {
+			$element_arr = array(
+				'type'      => 'layout',
+				'title'     => $rr['title'],
+				'body'      => $rr['body'],
+				'created'   => $rr['created'],
+				'edited'    => $rr['edited'],
+				'mimetype'  => $rr['mimetype'],
+				'pagetitle' => $rr['sid'],
+				'mid'       => $rr['mid']
+			);
 			$pages[$rr['iid']][] = array(
 				'url' => $rr['iid'],
 				'title' => $rr['sid'], 
-				'mid' => $rr['mid']
+				'mid' => $rr['mid'],
+				'created' => $rr['created'],
+				'edited' => $rr['edited'],
+				'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
 			);
 		}
 	}
@@ -171,8 +172,12 @@ function layouts_content(&$a) {
 		'$help'    => array('text' => t('Help'), 'url' => 'help/Comanche', 'title' => t('Comanche page description language help')),
 		'$editor'  => $editor,
 		'$baseurl' => $url,
+		'$name' => t('Layout Name'),
+		'$created' => t('Created'),
+		'$edited' => t('Edited'),
 		'$edit'    => t('Edit'),
 		'$share'   => t('Share'),
+		'$download'   => t('Download PDL file'),
 		'$pages'   => $pages,
 		'$channel' => $which,
 		'$view'    => t('View'),
diff --git a/mod/webpages.php b/mod/webpages.php
index 121971b12..24d7b88b3 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -149,7 +149,6 @@ function webpages_content(&$a) {
 				'type'		=> 'webpage',
 				'title'		=> $rr['title'],
 				'body'		=> $rr['body'],
-				'term'		=> $rr['term'],
 				'created'	=> $rr['created'],
 				'edited'	=> $rr['edited'],
 				'mimetype'	=> $rr['mimetype'],
diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css
index c930f5dc8..36a12e1d1 100644
--- a/view/css/mod_blocks.css
+++ b/view/css/mod_blocks.css
@@ -15,14 +15,18 @@
 	padding: 7px 3px 7px 10px;
 }
 
-#block-list-table th:nth-child(5),
-#block-list-table td:nth-child(5){
-	padding: 7px 3px;
+#block-list-table th:nth-child(2){
 	white-space: nowrap;
 }
 
 #block-list-table th:nth-child(6),
 #block-list-table td:nth-child(6){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#block-list-table th:nth-child(7),
+#block-list-table td:nth-child(7){
 	padding: 7px 10px 7px 7px;
 	white-space: nowrap;
 }
diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css
index 7f65713e7..5a3c86733 100644
--- a/view/css/mod_layouts.css
+++ b/view/css/mod_layouts.css
@@ -1,3 +1,32 @@
 #layout-editor {
 	display: none;
 }
+
+#layout-list-table {
+	width: 100%;
+}
+
+#layout-list-table th:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+#layout-list-table td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#layout-list-table th:nth-child(5),
+#layout-list-table td:nth-child(5){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(6),
+#layout-list-table td:nth-child(6){
+	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
+}
+
+.webpage-list-tool {
+	padding: 7px 10px;
+}
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index d88657c69..1c6ec4aea 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -15,6 +15,10 @@
 	padding: 7px 3px 7px 10px;
 }
 
+#webpage-list-table th:nth-child(2){
+	white-space: nowrap;
+}
+
 #webpage-list-table th:nth-child(7),
 #webpage-list-table td:nth-child(7){
 	padding: 7px 3px;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 28d443c74..a5e5dffdb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1938,6 +1938,7 @@ nav .dropdown-menu {
 
 [id^="webpage-list-item-"]:hover td,
 [id^="block-list-item-"]:hover td,
+[id^="layout-list-item-"]:hover td,
 [id^="menu-list-item-"]:hover td,
 [id^="mitem-list-item-"]:hover td {
 	background-color: $item_colour;
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
index f599aade7..f653ef59d 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -16,7 +16,8 @@
 <div id="pagelist-content-wrapper" class="section-content-wrapper-np">
 	<table id="block-list-table">
 		<tr>
-			<th width="97%">{{$name}}</th>
+			<th width="1%">{{$name}}</th>
+			<th width="94%">{{$blocktitle}}</th>
 			<th width="1%"></th>
 			<th width="1%"></th>
 			<th width="1%"></th>
@@ -28,11 +29,14 @@
 		<tr id="block-list-item-{{$item.url}}">
 			<td>
 				{{if $view}}
-				<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+				<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.name}}</a>
 				{{else}}
-				{{$item.title}}
+				{{$item.name}}
 				{{/if}}
 			</td>
+			<td>
+				{{$item.title}}
+			</td>
 			<td class="webpage-list-tool">
 				{{if $edit}}
 				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
index cd146377d..6812cf95b 100644
--- a/view/tpl/layoutlist.tpl
+++ b/view/tpl/layoutlist.tpl
@@ -15,19 +15,51 @@
 {{/if}}
 
 {{if $pages}}
-	   <div id="pagelist-content-wrapper" class="generic-content-wrapper">
+<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+	<table id="layout-list-table">
+		<tr>
+			<th width="97%">{{$name}}</th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%" class="hidden-xs">{{$created}}</th>
+			<th width="1%" class="hidden-xs">{{$edited}}</th>
+		</tr>
 		{{foreach $pages as $key => $items}} 
-				{{foreach $items as $item}}
-					<div class="page-list-item">
-					{{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.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}}
-					{{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons btn btn-default"></i></a> {{/if}}
-					{{*if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if*}}
-					{{$item.title}}
-					</div>
-				{{/foreach}}
+		{{foreach $items as $item}}
+		<tr id="layout-list-item-{{$item.url}}">
+			<td>
+				{{if $view}}
+				<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+				{{else}}
+				{{$item.title}}
+				{{/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}}', '#layout-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}}
-	   </div>
-	
-	   <div class="clear"></div>
+		{{/foreach}}
+	</table>
+</div>
+<div class="clear"></div>
 {{/if}}