diff options
author | zotlabs <mike@macgirvin.com> | 2017-09-27 20:43:47 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-09-27 20:43:47 -0700 |
commit | 0f36916fb40ae963652aa150e7b3aa22a9572d15 (patch) | |
tree | 146701f0742f27bbdd2e22830f13ed859f781779 /view/tpl/prv_message.tpl | |
parent | b9664f6980452390b120e0c7443fd773d527b3bd (diff) | |
parent | 1fd2b6f5b673b78af594f778db5f30954897adce (diff) | |
download | volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.tar.gz volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.tar.bz2 volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl/prv_message.tpl')
-rwxr-xr-x | view/tpl/prv_message.tpl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index af6315c7e..59472f7d4 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -5,7 +5,7 @@ </div> <div class="section-content-wrapper"> {{/if}} - <div id="prvmail-wrapper" > + <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}}" /> @@ -31,12 +31,12 @@ <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="form-group"> + <div id="prvmail-submit-wrapper" class="form-group clearfix"> <div id="prvmail-submit" class="float-right 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 float-left"> + <div id="prvmail-tools" class="btn-toolbar"> <div class="btn-group mr-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> @@ -63,7 +63,7 @@ </button> </div> {{if $feature_expire || $feature_encrypt}} - <div class="btn-group d-none d-lg-flex mr-2"> + <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> @@ -90,11 +90,12 @@ {{/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 id="prvmail-rotator-wrapper" class="float-left"> - <div id="prvmail-rotator"></div> - </div> - <div class="clear"></div> </div> <div id="mail-preview-content" style="display: none;"></div> </form> |