aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/css/conversation.css2
-rwxr-xr-xview/tpl/jot-header.tpl4
-rwxr-xr-xview/tpl/jot.tpl13
3 files changed, 11 insertions, 8 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index e6324b30d..3ad9ed57f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -31,7 +31,7 @@
position: relative;
}
-#profile-jot-reset {
+#profile-jot-tools {
position: absolute;
top: 0px;
right: 0px;
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index dd64c3454..be09fbebf 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -7,7 +7,7 @@ var pretext = '{{$pretext}}';
function initEditor(cb){
if(editor == false){
$("#profile-jot-text-loading").show();
- $("#profile-jot-reset").removeClass('d-none');
+ $("#profile-jot-tools").removeClass('d-none');
{{$geotag}}
if(plaintext == 'none') {
$("#profile-jot-text-loading").hide();
@@ -308,7 +308,7 @@ var activeCommentText = '';
{{if $reset}}
$(".jothidden").hide();
$("#profile-jot-text").removeClass('jot-expanded');
- $("#profile-jot-reset").addClass('d-none');
+ $("#profile-jot-tools").addClass('d-none');
$("#jot-preview-content").html('').hide();
editor = false;
{{else}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 0d1b4bd0d..2137baf9b 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -42,11 +42,14 @@
</div>
{{/if}}
<div id="jot-text-wrap">
- {{if $reset}}
- <button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm d-none border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
- <i class="fa fa-close"></i>
- </button>
- {{/if}}
+ <div id="profile-jot-tools" class="btn-group d-none">
+ <a id="profile-jot-settings" class="btn btn-outline-secondary btn-sm border-0" href="/settings/editor/?f=&rpath=/{{$return_path}}"><i class="fa fa-cog"></i></a>
+ {{if $reset}}
+ <button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm border-0" title="{{$reset}}" onclick="itemCancel(); return false;">
+ <i class="fa fa-close"></i>
+ </button>
+ {{/if}}
+ </div>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
</div>
{{if $attachment}}