aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorfriendica <redmatrix@redmatrix.me>2015-04-16 15:41:43 -0700
committerfriendica <redmatrix@redmatrix.me>2015-04-16 15:41:43 -0700
commit507d04a98772ca73d9d1c1b4fb324159cff1d8ae (patch)
treec506762303a8f5940b3d443b6675a7a3c9fa8c68 /view/tpl
parentf09df061303f2f237865441a8d1dde133b33f5f2 (diff)
parent10cc643f650b5ff0954ff988fbf768ea5e061571 (diff)
downloadvolse-hubzilla-507d04a98772ca73d9d1c1b4fb324159cff1d8ae.tar.gz
volse-hubzilla-507d04a98772ca73d9d1c1b4fb324159cff1d8ae.tar.bz2
volse-hubzilla-507d04a98772ca73d9d1c1b4fb324159cff1d8ae.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/attach_edit.tpl6
-rwxr-xr-xview/tpl/jot-header.tpl3
-rwxr-xr-xview/tpl/jot.tpl14
-rw-r--r--view/tpl/webpagelist.tpl4
4 files changed, 20 insertions, 7 deletions
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 9d440eb64..a3d42b0b4 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -20,6 +20,7 @@
<th width="95%">{{$title_txt}}</th>
<th width="1%"></th>
<th width="1%"></th>
+ <th width="1%"></th>
<th width="1%" class="hidden-xs">{{$created_txt}}</th>
<th width="1%" class="hidden-xs">{{$edited_txt}}</th>
</tr>
@@ -40,6 +41,9 @@
{{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}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>{{/if}}
</td>
<td class="hidden-xs">