diff options
author | Simon Rettberg | 2016-05-18 18:04:56 +0200 |
---|---|---|
committer | Simon Rettberg | 2016-05-18 18:04:56 +0200 |
commit | 2e18b36a287ad9b25619f9e2a073dcedf6d620ee (patch) | |
tree | 96d802fdc1c21ee9aa9b4d89a6611db7d8502433 /inc/render.inc.php | |
parent | Modularized baseconfig fetching (api) (diff) | |
download | slx-admin-2e18b36a287ad9b25619f9e2a073dcedf6d620ee.tar.gz slx-admin-2e18b36a287ad9b25619f9e2a073dcedf6d620ee.tar.xz slx-admin-2e18b36a287ad9b25619f9e2a073dcedf6d620ee.zip |
MORE WMORK
Diffstat (limited to 'inc/render.inc.php')
-rw-r--r-- | inc/render.inc.php | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/inc/render.inc.php b/inc/render.inc.php index 5fc5be92..b422d7f9 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -46,9 +46,8 @@ class Render public static function output() { Header('Content-Type: text/html; charset=utf-8'); - $zip = isset($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false); - if ($zip) - ob_start(); + $modules = Module::getActivated(); + ob_start('ob_gzhandler'); echo '<!DOCTYPE html> <html> @@ -59,9 +58,16 @@ class Render <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> <link href="style/bootstrap.min.css" rel="stylesheet" media="screen"> - <link href="style/bootstrap-tagsinput.css" rel="stylesheet" media="screen"> + '; + // Include any module specific styles + foreach ($modules as $module) { + $file = $module->getDir() . '/style.css'; + if (file_exists($file)) { + echo '<link href="', $file, '" rel="stylesheet" media="screen">'; + } + } + echo ' <link href="style/default.css" rel="stylesheet" media="screen"> - <script type="text/javascript"> var TOKEN = "' . Session::get('token') . '"; </script> @@ -80,20 +86,21 @@ class Render <script src="script/jquery.js"></script> <script src="script/bootstrap.min.js"></script> <script src="script/taskmanager.js"></script> - ', + <script src="script/fileselect.js"></script> + '; + foreach ($modules as $module) { + $file = $module->getDir() . '/clientscript.js'; + if (file_exists($file)) { + echo '<script src="', $file, '"></script>'; + } + } + echo self::$footer , '</body> </html>' ; - if ($zip) { - Header('Content-Encoding: gzip'); - ob_implicit_flush(false); - $gzip_contents = ob_get_contents(); - ob_end_clean(); - echo "\x1f\x8b\x08\x00\x00\x00\x00\x00"; - echo substr(gzcompress($gzip_contents, 5), 0, -4); - } + ob_end_flush(); } /** @@ -127,7 +134,7 @@ class Render */ public static function addScriptTop($file) { - self::addHeader('<script src="script/' . $file . '.js"></script>'); + trigger_error('Ignoring addScriptTop for ' . $file . ': Deprecated, use module-specific clientscript.js', E_USER_WARNING); } /** @@ -137,7 +144,7 @@ class Render */ public static function addScriptBottom($file) { - self::addFooter('<script src="script/' . $file . '.js"></script>'); + trigger_error('Ignoring addScriptBottom for ' . $file . ': Deprecated, use module-specific clientscript.js', E_USER_WARNING); } /** |