From 86ac9c0d6b56651cb79c60a616f8340524d1573e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 16 Apr 2015 10:43:14 +0200 Subject: move share webpage element from editwebpage to webpages and make it shareable with rpost --- mod/editwebpage.php | 15 --------------- mod/webpages.php | 19 ++++++++++++++++--- view/css/mod_webpages.css | 8 ++++---- view/tpl/webpagelist.tpl | 4 ++++ 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/mod/editwebpage.php b/mod/editwebpage.php index e30a33171..55cd3b4ef 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -221,21 +221,6 @@ logger('canwrite: ' . (perm_is_allowed($owner, get_observer_hash(), 'post_photos if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) $o .= '

' . t('Delete Webpage') . '
'; - - $x = array( - 'type' => 'webpage', - '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 . '' . EOL . EOL; - return $o; } diff --git a/mod/webpages.php b/mod/webpages.php index e2b5eb3a4..75803e908 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -124,7 +124,7 @@ function webpages_content(&$a) { if($_REQUEST['pagetitle']) $x['pagetitle'] = $_REQUEST['pagetitle']; - $editor .= status_editor($a,$x); + $editor = status_editor($a,$x); // Get a list of webpages. We can't display all them because endless scroll makes that unusable, // so just list titles and an edit link. @@ -141,12 +141,24 @@ function webpages_content(&$a) { $pages = array(); foreach($r as $rr) { unobscure($rr); + $element_arr = array( + 'type' => 'webpage', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'term' => $rr['term'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'pagetitle' => $rr['sid'], + 'mid' => $rr['mid'] + ); $pages[$rr['iid']][] = array( 'url' => $rr['iid'], 'pagetitle' => $rr['sid'], 'title' => $rr['title'], 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']), - 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']) + 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']), + 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' ); } } @@ -158,8 +170,9 @@ function webpages_content(&$a) { $o .= replace_macros(get_markup_template('webpagelist.tpl'), array( '$listtitle' => t('Webpages'), '$baseurl' => $url, - '$create' => t('Create'), + '$create' => t('Create'), '$edit' => t('Edit'), + '$share' => t('Share'), '$delete' => t('Delete'), '$pages' => $pages, '$channel' => $which, diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css index 32291adc7..7e4dbf569 100644 --- a/view/css/mod_webpages.css +++ b/view/css/mod_webpages.css @@ -15,14 +15,14 @@ padding: 7px 3px 7px 10px; } -#webpage-list-table th:nth-child(5), -#webpage-list-table td:nth-child(5){ +#webpage-list-table th:nth-child(6), +#webpage-list-table td:nth-child(6){ padding: 7px 3px; white-space: nowrap; } -#webpage-list-table th:nth-child(6), -#webpage-list-table td:nth-child(6){ +#webpage-list-table th:nth-child(7), +#webpage-list-table td:nth-child(7){ padding: 7px 10px 7px 7px; white-space: nowrap; } diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 9d440eb64..154ac019a 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -20,6 +20,7 @@ {{$title_txt}} + {{$created_txt}} {{$edited_txt}} @@ -40,6 +41,9 @@ {{if $edit}}{{/if}} + {{if $item.bb_element}}{{/if}} + + {{if $edit}}{{/if}} -- cgit v1.2.3 From b42bb09635c6040945bcc65e7b7e6218870b92ea Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 16 Apr 2015 10:46:59 +0200 Subject: whitespace --- mod/webpages.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mod/webpages.php b/mod/webpages.php index 75803e908..5013d803a 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -142,23 +142,23 @@ function webpages_content(&$a) { foreach($r as $rr) { unobscure($rr); $element_arr = array( - 'type' => 'webpage', - 'title' => $rr['title'], - 'body' => $rr['body'], - 'term' => $rr['term'], - 'created' => $rr['created'], - 'edited' => $rr['edited'], - 'mimetype' => $rr['mimetype'], - 'pagetitle' => $rr['sid'], - 'mid' => $rr['mid'] + 'type' => 'webpage', + 'title' => $rr['title'], + 'body' => $rr['body'], + 'term' => $rr['term'], + 'created' => $rr['created'], + 'edited' => $rr['edited'], + 'mimetype' => $rr['mimetype'], + 'pagetitle' => $rr['sid'], + 'mid' => $rr['mid'] ); $pages[$rr['iid']][] = array( - 'url' => $rr['iid'], - 'pagetitle' => $rr['sid'], - 'title' => $rr['title'], - 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']), - 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']), - 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' + 'url' => $rr['iid'], + 'pagetitle' => $rr['sid'], + 'title' => $rr['title'], + 'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']), + 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']), + 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' ); } } -- cgit v1.2.3 From 90d3a6c02dd12317c72ad790a1b6810f885f638c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 16 Apr 2015 11:15:04 +0200 Subject: make rpost respect default post permissions --- mod/rpost.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mod/rpost.php b/mod/rpost.php index 10ae6b8ab..1bde121e4 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -94,6 +94,13 @@ function rpost_content(&$a) { $channel = $a->get_channel(); + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post') )); @@ -111,7 +118,7 @@ function rpost_content(&$a) { 'nickname' => $channel['channel_address'], 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel), + 'acl' => populate_acl($channel_acl), 'bang' => '', 'visitor' => true, 'profile_uid' => local_channel(), -- cgit v1.2.3 From 9addc4581edf594996151eaf514927d271f04da5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 16 Apr 2015 23:26:11 +0200 Subject: provide a separate input field for rpost attachments --- include/conversation.php | 1 + mod/item.php | 2 +- mod/rpost.php | 1 + view/css/conversation.css | 7 ++++++- view/tpl/attach_edit.tpl | 6 +++--- view/tpl/jot-header.tpl | 3 +++ view/tpl/jot.tpl | 14 ++++++++++---- view/tpl/webpagelist.tpl | 2 +- 8 files changed, 26 insertions(+), 10 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 05898cfce..cdb7807b6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1208,6 +1208,7 @@ function status_editor($a, $x, $popup = false) { '$shortpermset' => t('permissions'), '$ptyp' => (($notes_cid) ? 'note' : 'wall'), '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), + '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$post_id' => '', '$baseurl' => $a->get_baseurl(true), '$defloc' => $x['default_location'], diff --git a/mod/item.php b/mod/item.php index 53064132c..d80241f2d 100644 --- a/mod/item.php +++ b/mod/item.php @@ -22,7 +22,6 @@ require_once('include/attach.php'); function item_post(&$a) { - // This will change. Figure out who the observer is and whether or not // they have permission to post here. Else ignore the post. @@ -399,6 +398,7 @@ function item_post(&$a) { $verb = notags(trim($_REQUEST['verb'])); $title = escape_tags(trim($_REQUEST['title'])); $body = trim($_REQUEST['body']); + $body .= trim($_REQUEST['attachment']); $postopts = ''; $private = ( diff --git a/mod/rpost.php b/mod/rpost.php index 1bde121e4..737d705f6 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -124,6 +124,7 @@ function rpost_content(&$a) { 'profile_uid' => local_channel(), 'title' => $_REQUEST['title'], 'body' => $_REQUEST['body'], + 'attachment' => $_REQUEST['attachment'], 'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), 'return_path' => 'rpost/return' ); diff --git a/view/css/conversation.css b/view/css/conversation.css index d94a08b3e..009a2a55d 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -25,12 +25,17 @@ code { margin-bottom: 5px; } -#profile-jot-text { +.profile-jot-text { height: 39px; padding: 8px; width: 100%; } +.jot-attachment { + padding: 8px; + width: 100%; +} + #profile-jot-text-loading { float: left; padding: 30px 0px 0px 12px; diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index f4be58db0..44d230ae0 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -7,12 +7,12 @@ {{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
{{if !$isadir}} - - + + {{/if}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 0ffed7163..f9ce65a86 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -107,6 +107,9 @@ function enableOnUser(){ /* enable tinymce on focus and click */ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); + + if($("#jot-attachment").val()) enableOnUser(); + var upload_title = $('#wall-image-upload').attr('title'); var attach_title = $('#wall-file-upload').attr('title'); try { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 927b3a5b9..24fea70f1 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -10,7 +10,8 @@ - + + {{if $showacl}}{{$acl}}{{/if}} {{$mimeselect}} {{$layoutselect}} @@ -20,21 +21,26 @@
{{/if}} {{if $webpage}} -