aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-01-20 10:03:02 +0000
committerMario <mario@mariovavti.com>2022-01-20 10:03:02 +0000
commit717a547c4044647794de7eeee36c7cbf52308ec3 (patch)
tree28e46218af9444aa2e3fb9928570992347ab3b35
parent5b19418e48892315733e99455771dd05d1d1c87e (diff)
parentec491e87abadbf7e0f275a7c0ae99b45fbf9068c (diff)
downloadvolse-hubzilla-717a547c4044647794de7eeee36c7cbf52308ec3.tar.gz
volse-hubzilla-717a547c4044647794de7eeee36c7cbf52308ec3.tar.bz2
volse-hubzilla-717a547c4044647794de7eeee36c7cbf52308ec3.zip
Merge branch 'dev' into 7.0RC
-rw-r--r--view/tpl/profile_advanced.tpl4
-rw-r--r--view/tpl/prv_message.tpl110
2 files changed, 2 insertions, 112 deletions
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index dab2db4ac..2ee5e9d09 100644
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -33,11 +33,11 @@
<a class="btn btn-primary btn-sm" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
</div>
{{/if}}
- {{if $exportlink}}
+ {{** if $exportlink}}
<div class="btn-group">
<a class="btn btn-outline-secondary btn-sm" href="{{$exportlink}}" ><i class="fa fa-vcard"></i>&nbsp;{{$export}}</a>
</div>
- {{/if}}
+ {{/if **}}
</div>
<h2>{{$title}}</h2>
<div class="clear"></div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
deleted file mode 100644
index 4646d9f88..000000000
--- a/view/tpl/prv_message.tpl
+++ /dev/null
@@ -1,110 +0,0 @@
-{{**
-
-{{if $new}}
-<div class="generic-content-wrapper">
- <div class="section-title-wrapper">
- <h2>{{$header}}</h2>
- </div>
- <div class="section-content-wrapper">
-{{/if}}
- <div id="prvmail-wrapper">
- <input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
- <form id="prvmail-form" action="mail" method="post" >
- <input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
- <input type="hidden" name="media_str" id="jot-media" value="" />
- <input type="hidden" name="preview" id="mail-preview" value="0" />
- <input type="hidden" name="signature" id="mail-sig" value="" />
- {{if $new}}
- <div class="mb-3">
- <label for="recip">{{$to}}</label>
- <input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" />
- <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
- </div>
- <div class="mb-3">
- <label for="prvmail-subject">{{$subject}}</label>
- <input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" />
- </div>
- {{/if}}
- {{if $reply}}
- <input type="hidden" name="replyto" value="{{$parent}}" />
- <input type="hidden" name="messageto" value="{{$recphash}}" />
- <input type="hidden" name="subject" value="{{$subjtxt}}" />
- {{/if}}
- <div class="mb-3">
- <label for="prvmail-text">{{$yourmessage}}</label>
- <textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
- </div>
- <div id="prvmail-submit-wrapper" class="mb-3 clearfix">
- <div id="prvmail-submit" class="float-end btn-group">
- <button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button>
- <button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
- </div>
- <div id="prvmail-tools" class="btn-toolbar">
- <div class="btn-group me-2">
- <button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
- <i class="fa fa-bold jot-icons"></i>
- </button>
- <button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
- <i class="fa fa-italic jot-icons"></i>
- </button>
- <button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
- <i class="fa fa-underline jot-icons"></i>
- </button>
- <button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
- <i class="fa fa-quote-left jot-icons"></i>
- </button>
- <button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
- <i class="fa fa-terminal jot-icons"></i>
- </button>
- </div>
- <div class="btn-group d-none d-lg-flex me-2">
- <button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" >
- <i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i>
- </button>
- <button id="prvmail-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailJotGetLink(); return false;" >
- <i id="prvmail-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
- </button>
- </div>
- {{if $feature_expire || $feature_encrypt}}
- <div class="btn-group d-none d-lg-flex">
- {{if $feature_expire}}
- <button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" >
- <i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
- </button>
- {{/if}}
- {{if $feature_encrypt}}
- <button id="prvmail-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
- <i id="prvmail-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
- </button>
- {{/if}}
- </div>
- {{/if}}
- <div class="btn-group d-lg-none">
- <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
- <i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
- </button>
- <div class="dropdown-menu dropdown-menu-end" role="menu">
- <a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a>
- <a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a>
- {{if $feature_expire || $feature_encrypt}}
- <div class="dropdown-divider"></div>
- <a class="dropdown-item" href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i>&nbsp;{{$expires}}</a>
- <a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a>
- {{/if}}
- </div>
- </div>
- <div class="btn-group">
- <div id="prvmail-rotator" class="m-2 spinner-wrapper">
- <div class="spinner s"></div>
- </div>
- </div>
- </div>
- </div>
- <div id="mail-preview-content" style="display: none;"></div>
- </form>
- </div>
-{{if $new}}
- </div>
-</div>
-{{/if}}
-**}}