diff options
| author | zotlabs <mike@macgirvin.com> | 2017-02-19 16:50:41 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-02-19 16:50:41 -0800 |
| commit | 573846707ceade4d00a4dfe3184d9f8004a3112b (patch) | |
| tree | 501d9508c22be518894cb18dfec13416412073cb /view/theme | |
| parent | 02e487f30687a1602bd257e2acf2b9954aab6e98 (diff) | |
| download | volse-hubzilla-573846707ceade4d00a4dfe3184d9f8004a3112b.tar.gz volse-hubzilla-573846707ceade4d00a4dfe3184d9f8004a3112b.tar.bz2 volse-hubzilla-573846707ceade4d00a4dfe3184d9f8004a3112b.zip | |
fix several places where head_add_(css|js) functions have been used incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work:
- if there is no preceding / character, we look for the file within all the appropriate theme directories.
- otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir
- files beginning with // are considered to be schemeless URLs.
Therefore 'foo.css' means find the best theme-able representation of foo.css.
'/library/foo.css' means only use the version of foo.css that is in /library.
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 3179c7078..020bda363 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -1,19 +1,17 @@ <?php -head_add_css('library/font_awesome/css/font-awesome.min.css'); -head_add_css('library/bootstrap/css/bootstrap.min.css'); -head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css'); -head_add_css('view/css/bootstrap-red.css'); -head_add_css('library/datetimepicker/jquery.datetimepicker.css'); -//head_add_css('library/colorpicker/css/colorpicker.css'); -head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); +head_add_css('/library/font_awesome/css/font-awesome.min.css'); +head_add_css('/library/bootstrap/css/bootstrap.min.css'); +head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css'); +head_add_css('/view/css/bootstrap-red.css'); +head_add_css('/library/datetimepicker/jquery.datetimepicker.css'); +head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); require_once('view/php/theme_init.php'); -head_add_js('library/bootstrap/js/bootstrap.min.js'); -head_add_js('library/bootbox/bootbox.min.js'); -head_add_js('library/bootstrap-tagsinput/bootstrap-tagsinput.js'); -head_add_js('library/datetimepicker/jquery.datetimepicker.js'); -//head_add_js('library/colorpicker/js/colorpicker.js'); -head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); -//head_add_js('library/bootstrap-colorpicker/src/js/docs.js'); +head_add_js('/library/bootstrap/js/bootstrap.min.js'); +head_add_js('/library/bootbox/bootbox.min.js'); +head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js'); +head_add_js('/library/datetimepicker/jquery.datetimepicker.js'); +head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); + |