diff options
| author | friendica <info@friendica.com> | 2013-11-10 23:19:44 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-10 23:19:44 -0800 |
| commit | ca4103debef7ecf36d93842750667e70c2a1e42a (patch) | |
| tree | bbc416e54992236f36c98f6b04d56d899f68829e /view | |
| parent | c39200429046cdde16edbcb6e28c5cf3c7434d4a (diff) | |
| download | volse-hubzilla-ca4103debef7ecf36d93842750667e70c2a1e42a.tar.gz volse-hubzilla-ca4103debef7ecf36d93842750667e70c2a1e42a.tar.bz2 volse-hubzilla-ca4103debef7ecf36d93842750667e70c2a1e42a.zip | |
e2ee
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/theme_init.php | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0cb5d4d68..ab28180f2 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -25,6 +25,7 @@ head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js'); +head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('js/acl.js'); head_add_js('js/webtoolkit.base64.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c75672202..9190e8a95 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -321,6 +321,7 @@ footer { #profile-link, #profile-title, #profile-expires, +#profile-encrypt, #wall-image-upload, #wall-file-upload, #profile-upload-wrapper, @@ -1142,6 +1143,10 @@ footer { float: left; margin-left: 15px; } +#profile-encrypt-wrapper { + float: left; + margin-left: 15px; +} #jot-preview-link { float: left; margin-left: 45px; diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c04880cf7..0618e7491 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -54,9 +54,9 @@ <div id="profile-expire-wrapper" style="display: {{$feature_expire}};" > <i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i> </div> - <!-- div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" > - <i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('aes256','profile-jot-text',$('#profile-jot-text').val());return false;"></i> - </div --> + <div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" > + <i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('aes256','#profile-jot-text',$('#profile-jot-text').val());return false;"></i> + </div> <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > |