diff options
author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
---|---|---|
committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /view/tpl/prv_message.tpl | |
parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'view/tpl/prv_message.tpl')
-rwxr-xr-x | view/tpl/prv_message.tpl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 3330a338f..118bd846f 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -37,14 +37,16 @@ <div id="prvmail-link-wrapper" > <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i> </div> - - <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}};" > + {{if $feature_expire}} + <div id="prvmail-expire-wrapper" > + <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i> + </div> + {{/if}} + {{if $feature_encrypt}} + <div id="prvmail-encrypt-wrapper" > <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i> </div> - + {{/if}} <div id="prvmail-rotator-wrapper" > <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> </div> |