diff options
author | Mario <mario@mariovavti.com> | 2021-10-12 11:25:44 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-10-12 11:25:44 +0000 |
commit | 3e503ec3a35e4226a566c1986bf570afc7c8a53f (patch) | |
tree | 36ac7c4941af669010e7684f77324be24b610bee /view | |
parent | e455fae334c4b5f8d5a563e099add1482749c92f (diff) | |
download | volse-hubzilla-3e503ec3a35e4226a566c1986bf570afc7c8a53f.tar.gz volse-hubzilla-3e503ec3a35e4226a566c1986bf570afc7c8a53f.tar.bz2 volse-hubzilla-3e503ec3a35e4226a566c1986bf570afc7c8a53f.zip |
Revert "httpsig: add parentheses"
This reverts commit e455fae334c4b5f8d5a563e099add1482749c92f.
Diffstat (limited to 'view')
-rw-r--r-- | view/css/conversation.css | 2 | ||||
-rw-r--r-- | view/css/widgets.css | 18 | ||||
-rw-r--r-- | view/tpl/notes.tpl | 103 |
3 files changed, 14 insertions, 109 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 88081c2c6..dbb930fc7 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -313,7 +313,7 @@ code { } code.inline-code { - padding: 0.2em; + padding: 0px 4px; display: inline; } diff --git a/view/css/widgets.css b/view/css/widgets.css index b78725919..a67c10ed2 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -41,23 +41,13 @@ li:hover .widget-nav-pills-icons { /* notes */ #note-text { - padding: 7px 10px; + border: 1px solid rgba(0,0,0,.125); + padding: 5px; width: 100%; resize: vertical; min-height: 250px; - overflow-y: auto; - overflow-x: hidden; -} - -#note-text-html { - padding: 7px 10px; - height: 250px; - width: 100%; - resize: vertical; - min-height: 250px; - overflow-y: auto; - overflow-x: hidden; - + overflow: auto; + outline: none; } /* saved searches */ diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index 22a249fd9..0ae0604ef 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -1,122 +1,37 @@ {{if $app}} <div id="personal-notes" class="generic-content-wrapper{{if $hidden}} d-none{{/if}}"> - <div class="section-title-wrapper clearfix"> - <div class="float-end rounded border border-secondary p-1 text-muted small note-mode" title="Double click into note for edit mode">Read mode</div> + <div class="section-title-wrapper"> <h2>{{$banner}}</h2> </div> - <div class="section-content-wrapper-np"> + <div class="section-content-wrapper"> {{else}} <div id="personal-notes" class="widget{{if $hidden}} d-none{{/if}}"> - <div class="float-end rounded border border-secondary mb-1 ps-1 pe-1 text-muted small note-mode" title="Double click note for edit mode">Read mode</div> - <h3 class="float-start">{{$banner}}</h3> + <h3>{{$banner}}</h3> {{/if}} - <textarea name="note_text" id="note-text" class="form-control{{if $app}} border-0{{else}} p-1{{/if}}" style="display: none;">{{$text}}</textarea> - <div id="note-text-html" class="{{if !$app}}border rounded p-1{{/if}}">{{$html}}</div> + <textarea name="note_text" id="note-text" class="{{if $app}}form-control border-0{{/if}}">{{$text}}</textarea> <script> var noteSaveTimer = null; var noteText = $('#note-text'); - var noteTextHTML = $('#note-text-html'); - var noteMode = $('.note-mode'); - var noteEditing = false; - - noteText.bbco_autocomplete('bbcode'); $(document).on('focusout',"#note-text",function(e){ if(noteSaveTimer) clearTimeout(noteSaveTimer); - - noteEditing = false; notePostFinal(); noteSaveTimer = null; - setNoteMode(noteMode, 'saving'); }); - $(document).on('dblclick',"#note-text-html",function(e){ - noteEditing = 1; - noteText.show().focusin(); - noteText.height(noteTextHTML.outerHeight()); - noteText.scrollTop(noteTextHTML.scrollTop()); - noteTextHTML.hide(); - setNoteMode(noteMode, 'edit'); - - $(document).one('click', function(e) { - if (e.target.id !== 'note-text') { - noteTextHTML.show(); - noteTextHTML.height(noteText.outerHeight()); - noteTextHTML.scrollTop(noteText.scrollTop()); - noteText.hide(); - setNoteMode(noteMode, 'read'); - } - }); - - $(document).one('click', '#note-text', function(e){ - noteEditing = 2; - setNoteMode(noteMode, 'editing'); - noteSaveTimer = setTimeout(noteSaveChanges,10000); - }); - + $(document).on('focusin',"#note-text",function(e){ + noteSaveTimer = setTimeout(noteSaveChanges,10000); }); - - function notePostFinal() { - $.post( - 'notes/sync', - { - 'note_text' : noteText.val() - }, - function (data) { - noteTextHTML.html(data.html); - noteTextHTML.show(); - noteTextHTML.height(noteText.outerHeight()); - noteTextHTML.scrollTop(noteText.scrollTop()); - noteText.hide(); - setNoteMode(noteMode, 'saved'); - } - ); + $.post('notes/sync', { 'note_text' : $('#note-text').val() }); } function noteSaveChanges() { - $.post('notes', { 'note_text' : noteText.val() }); - noteSaveTimer = setTimeout(noteSaveChanges, 10000); + $.post('notes', { 'note_text' : $('#note-text').val() }); + noteSaveTimer = setTimeout(noteSaveChanges,10000); } - - function setNoteMode (obj, mode) { - switch(mode) { - case 'edit': - obj.removeClass('border-secondary border-success text-muted text-success') - obj.addClass('border-danger text-danger') - obj.html('Edit mode'); - break; - case 'editing': - obj.removeClass('border-secondary border-success text-muted text-success') - obj.addClass('border-danger text-danger') - obj.html('Editing...'); - break; - case 'saving': - obj.removeClass('border-secondary border-danger text-muted text-danger') - obj.addClass('border-success text-success') - obj.html('Saving...'); - break; - case 'saved': - obj.removeClass('border-secondary border-danger text-muted text-danger') - obj.addClass('border-success text-success') - obj.html('Saved'); - setTimeout(function () { - if(noteEditing) { - setNoteMode(noteMode, noteEditing === 1 ? 'edit' : 'editing'); - } - else { - setNoteMode(noteMode, 'read'); - } - }, 3000); - break; - case 'read': - default: - obj.removeClass('border-success border-danger text-success text-danger').addClass('border-secondary text-muted').html('Read mode'); - } - } - </script> {{if $app}} </div> |