summaryrefslogtreecommitdiffstats
path: root/inc/render.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2017-11-29 11:31:26 +0100
committerSimon Rettberg2017-11-29 11:31:26 +0100
commit4d120b829ad657dc329282ae6969cf1b988e544c (patch)
tree4f3c1d35eead4dfaf3caad8caaf06e64562c1d49 /inc/render.inc.php
parent[runmode] Implement delete-machine action (diff)
downloadslx-admin-4d120b829ad657dc329282ae6969cf1b988e544c.tar.gz
slx-admin-4d120b829ad657dc329282ae6969cf1b988e544c.tar.xz
slx-admin-4d120b829ad657dc329282ae6969cf1b988e544c.zip
[js] Move all our fixes into one file, add browser history/URL fix for messages
Hides all the ugly message[]= entries from the URL string, so copy/paste won't show the message out of context again
Diffstat (limited to 'inc/render.inc.php')
-rw-r--r--inc/render.inc.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/inc/render.inc.php b/inc/render.inc.php
index 53e2f314..13262c1d 100644
--- a/inc/render.inc.php
+++ b/inc/render.inc.php
@@ -107,8 +107,7 @@ 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>
- <script src="script/collapse.js"></script>
+ <script src="script/slx-fixes.js"></script>
';
foreach ($modules as $module) {
$files = $module->getScripts($module != $pageModule);
@@ -213,7 +212,7 @@ class Render
*/
public static function parse($template, $params = false, $module = false)
{
- if ($module === false) {
+ if ($module === false && class_exists('Page')) {
$module = Page::getModule()->getIdentifier();
}
// Load html snippet