diff options
author | friendica <redmatrix@redmatrix.me> | 2015-04-24 15:01:59 -0700 |
---|---|---|
committer | friendica <redmatrix@redmatrix.me> | 2015-04-24 15:01:59 -0700 |
commit | e01873b4cf3c217f7ee0baafbee1ba9dd42e0408 (patch) | |
tree | 21aacbacaf2b3d41a0fb06ce725444b49cdd8fad /mod/layouts.php | |
parent | 268307b5346674159ef8f6d3fbfadaf41a7443f0 (diff) | |
parent | fcaa980a3f8c0c8a98ba6912826b694371cdd26a (diff) | |
download | volse-hubzilla-e01873b4cf3c217f7ee0baafbee1ba9dd42e0408.tar.gz volse-hubzilla-e01873b4cf3c217f7ee0baafbee1ba9dd42e0408.tar.bz2 volse-hubzilla-e01873b4cf3c217f7ee0baafbee1ba9dd42e0408.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'mod/layouts.php')
-rw-r--r-- | mod/layouts.php | 41 |
1 files changed, 23 insertions, 18 deletions
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'), |