diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-28 19:58:05 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-28 19:58:05 -0700 |
| commit | ae5c10a71cd29722f63b379b62801dea52a9ab8f (patch) | |
| tree | 5c9c0c6668369f5ffbd4f5c7b635c9c1ec96b996 /view/php | |
| parent | 2d4b75428a87038b9a637bf49fc0a91c91b392fb (diff) | |
| parent | 4d5202353fbce12f19fbe578205259d2a7bd3f04 (diff) | |
| download | volse-hubzilla-1.10.tar.gz volse-hubzilla-1.10.tar.bz2 volse-hubzilla-1.10.zip | |
Merge branch '1.10RC'1.10
Diffstat (limited to 'view/php')
| -rw-r--r-- | view/php/default.php | 2 | ||||
| -rw-r--r-- | view/php/theme_init.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/view/php/default.php b/view/php/default.php index ad6b7a3d1..f5be4fa35 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -5,7 +5,7 @@ <script>var baseurl="<?php echo z_root() ?>";</script> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> </head> -<body> +<body <?php if($page['direction']) echo 'dir="rtl"' ?> > <?php if(x($page,'banner')) echo $page['banner']; ?> <header><?php if(x($page,'header')) echo $page['header']; ?></header> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 648b144b3..46aadaa7d 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,9 +10,10 @@ head_add_css('view/css/conversation.css'); head_add_css('view/css/widgets.css'); head_add_css('view/css/colorbox.css'); head_add_css('library/justifiedGallery/justifiedGallery.min.css'); +head_add_css('library/Text_Highlighter/sample.css'); head_add_js('jquery.js'); -//head_add_js('jquery-migrate-1.1.1.js'); +//head_add_js('jquery.migrate-3.0.0.js'); head_add_js('library/justifiedGallery/jquery.justifiedGallery.min.js'); head_add_js('library/sprintf.js/dist/sprintf.min.js'); |