From 9addc4581edf594996151eaf514927d271f04da5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 16 Apr 2015 23:26:11 +0200
Subject: provide a separate input field for rpost attachments

---
 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 +-
 5 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'view')

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}}
-- 
cgit v1.2.3