diff options
| author | friendica <info@friendica.com> | 2013-11-13 23:10:29 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-13 23:10:29 -0800 |
| commit | ee629534d5245443152797bae81768680b5dda85 (patch) | |
| tree | f0a249c9d459ae809b714181090425023318430f /view | |
| parent | 412ebdade716d9c903a264916c53e15b2981042a (diff) | |
| download | volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.tar.gz volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.tar.bz2 volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.zip | |
E2EE on private mail (also fixed autocomplete results dropdown for recipient which was positioned below the navbar instead of next to the recipient input box)
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f5ff8e49a..e6fa952d5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1721,6 +1721,7 @@ tr.mceLast { #prvmail-attach-wrapper, #prvmail-link-wrapper, #prvmail-expire-wrapper, +#prvmail-encrypt-wrapper, #prvmail-rotator-wrapper { float: left; margin-top: 10px; @@ -2897,11 +2898,6 @@ div.jGrowl div.info { } -.autocomplete-w1 { - position: fixed; - top: 24px; -} - .autocomplete { color: $font_colour; border: 1px solid $nav_bg_1; diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 621f56be7..b7654dc2d 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -15,6 +15,7 @@ {{/if}} <input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" /> +<input type="hidden" name="media_str" id="jot-media" value="" /> <div id="prvmail-subject-label">{{$subject}}</div> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" /> @@ -40,7 +41,9 @@ <div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" > <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i> </div> - + <div id="prvmail-encrypt-wrapper" style="display: {{$feature_encrypt}};" > + <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i> + </div> <div id="prvmail-rotator-wrapper" > <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> |