diff options
| author | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
| commit | bafbf0416462c6f18c3fb6c8c06a063c8d6fdae6 (patch) | |
| tree | 8929845be585b09d0f420621281c5531e1efad3e /view/php | |
| parent | 6f93d9848c43019d43ea76c27d42d657ba031cd7 (diff) | |
| parent | fdefa101d84dc2a9424eaedbdb003a4c30ec5d01 (diff) | |
| download | volse-hubzilla-5.0.tar.gz volse-hubzilla-5.0.tar.bz2 volse-hubzilla-5.0.zip | |
Merge branch '5.0RC'5.0
Diffstat (limited to 'view/php')
| -rw-r--r-- | view/php/default.php | 2 | ||||
| -rw-r--r-- | view/php/theme_init.php | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/view/php/default.php b/view/php/default.php index 388c94382..df9b02c4e 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -17,7 +17,7 @@ <div id="page-footer"></div> <div id="pause"></div> </section> - <aside id="region_3" class="d-none d-xl-table-cell"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside> + <aside id="region_3" class="d-none d-xl-block"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside> </div> </div> </main> diff --git a/view/php/theme_init.php b/view/php/theme_init.php index d683a3b58..a0118fa71 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -22,10 +22,8 @@ head_add_js('/library/jquery.timeago.js'); head_add_js('/library/readmore.js/readmore.js'); head_add_js('/library/sticky-kit/sticky-kit.min.js'); head_add_js('/library/jgrowl/jquery.jgrowl.min.js'); -head_add_js('/library/cryptojs/components/core-min.js'); -head_add_js('/library/cryptojs/rollups/aes.js'); -head_add_js('/library/cryptojs/rollups/rabbit.js'); -head_add_js('/library/cryptojs/rollups/tripledes.js'); + +head_add_js('/library/sjcl/sjcl.js'); head_add_js('acl.js'); head_add_js('webtoolkit.base64.js'); @@ -37,6 +35,7 @@ head_add_js('/library/colorbox/jquery.colorbox-min.js'); head_add_js('/library/jquery.AreYouSure/jquery.are-you-sure.js'); head_add_js('/library/tableofcontents/jquery.toc.js'); head_add_js('/vendor/desandro/imagesloaded/imagesloaded.pkgd.min.js'); + /** * Those who require this feature will know what to do with it. * Those who don't, won't. |