diff options
| -rw-r--r-- | modules/digibug/helpers/digibug_theme.php | 2 | ||||
| -rw-r--r-- | modules/organize/helpers/organize_theme.php | 8 | ||||
| -rw-r--r-- | modules/server_add/helpers/server_add_theme.php | 6 | ||||
| -rw-r--r-- | modules/tag/helpers/tag_theme.php | 7 | ||||
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 1 | ||||
| -rw-r--r-- | modules/user/helpers/user_theme.php | 5 |
6 files changed, 13 insertions, 16 deletions
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php index 3b5be3b3..f94d07c6 100644 --- a/modules/digibug/helpers/digibug_theme.php +++ b/modules/digibug/helpers/digibug_theme.php @@ -19,6 +19,6 @@ */ class digibug_theme_Core { static function head($theme) { - return html::script("modules/digibug/js/digibug.js"); + $theme->script("modules/digibug/js/digibug.js"); } } diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php index 27f8cdb2..cddc48b6 100644 --- a/modules/organize/helpers/organize_theme.php +++ b/modules/organize/helpers/organize_theme.php @@ -20,11 +20,9 @@ class organize_theme { static function head($theme) { // @tdo remove the addition css and organize.js (just here to test) - $script[] = html::script("modules/organize/js/organize_init.js"); - $script[] = html::script("modules/organize/js/organize.js"); - $script[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . + $theme->script("modules/organize/js/organize_init.js"); + $theme->script("modules/organize/js/organize.js"); + return "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . url::file("modules/organize/css/organize.css") . "\" />"; - return implode("\n", $script); - //return html::script("modules/organize/js/organize_init.js"); } } diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php index 4f307a2e..3df57ee4 100644 --- a/modules/server_add/helpers/server_add_theme.php +++ b/modules/server_add/helpers/server_add_theme.php @@ -20,7 +20,7 @@ class server_add_theme_Core { static function head($theme) { if (user::active()->admin) { - return html::script("modules/server_add/js/server_add.js"); + $theme->script("modules/server_add/js/server_add.js"); } } @@ -33,8 +33,8 @@ class server_add_theme_Core { $csrf = access::csrf_token(); $head[] = "<script> var base_url = \"$base\"; var csrf = \"$csrf\";</script>"; - $head[] = html::script("lib/jquery.autocomplete.js"); - $head[] = html::script("modules/server_add/js/admin.js"); + $theme->script("lib/jquery.autocomplete.js"); + $theme->script("modules/server_add/js/admin.js"); } return implode("\n", $head); diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php index a32d71b6..b48ad178 100644 --- a/modules/tag/helpers/tag_theme.php +++ b/modules/tag/helpers/tag_theme.php @@ -19,8 +19,11 @@ */ class tag_theme_Core { static function head($theme) { - $url = url::file("modules/tag/js/tag.js"); - return "<script src=\"$url\" type=\"text/javascript\"></script>"; + $theme->script("modules/tag/js/tag.js"); + } + + static function admin_head($theme) { + $theme->script("modules/tag/js/tag.js"); } static function sidebar_blocks($theme) { diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 21661c48..7d201da7 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -1,5 +1,4 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<script src="<?= url::file("modules/tag/js/tag.js") ?>" type="text/javascript"></script> <script> var TAG_RENAME_URL = "<?= url::site("admin/tags/rename/__ID__") ?>"; $("document").ready(function() { diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php index 2a4a343a..ad9d4c63 100644 --- a/modules/user/helpers/user_theme.php +++ b/modules/user/helpers/user_theme.php @@ -25,11 +25,8 @@ class user_theme_Core { } static function admin_head($theme) { - $head = array(); if (strpos(Router::$current_uri, "admin/users") !== false) { - $head[] = html::script("lib/gallery.panel.js"); + $theme->script("lib/gallery.panel.js"); } - - return implode("\n", $head); } } |