diff options
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | mod/rpost.php | 1 | ||||
| -rw-r--r-- | view/css/conversation.css | 7 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 14 | ||||
| -rw-r--r-- | 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}} <div id="attach-edit-tools-share" class="btn-group form-group"> {{if !$isadir}} - <a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}"> - <i class="icon-paperclip jot-icons"></i> + <a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}"> + <i class="icon-share jot-icons"></i> </a> {{/if}} <button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}"> - <i class="icon-share jot-icons"></i> + <i class="icon-link jot-icons"></i> </button> </div> <div id="attach-edit-perms" class="btn-group pull-right"> 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 @@ <input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="post_id" value="{{$post_id}}" /> <input type="hidden" name="webpage" value="{{$webpage}}" /> - <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> + <input type="hidden" name="preview" id="jot-preview" value="0" /> + <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> {{if $showacl}}{{$acl}}{{/if}} {{$mimeselect}} {{$layoutselect}} @@ -20,21 +21,26 @@ </div> {{/if}} {{if $webpage}} - <div id="jot-pagetitle-wrap" class="jothidden" style="display:none"> + <div id="jot-pagetitle-wrap" class="jothidden"> <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"> </div> {{/if}} - <div id="jot-title-wrap" class="jothidden" style="display:none"> + <div id="jot-title-wrap" class="jothidden"> <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex=1 value="{{$title}}"> </div> {{if $catsenabled}} - <div id="jot-category-wrap" class="jothidden" style="display:none"> + <div id="jot-category-wrap" class="jothidden"> <input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput"> </div> {{/if}} <div id="jot-text-wrap"> <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}">{{$content}}</textarea> </div> + {{if $attachment}} + <div id="jot-attachment-wrap"> + <input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();"> + </div> + {{/if}} <div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> <div class="btn-group"> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 154ac019a..a3d42b0b4 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -41,7 +41,7 @@ {{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?body={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>{{/if}} + {{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}} |