From 5ea4d42e052b4ce563784e1bdcc1e7df4ef8e3b3 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 23 Jun 2014 18:42:44 +0200 Subject: Some minor html fixes/improvements --- apis/init.inc.php | 1 + inc/render.inc.php | 1 - index.php | 2 + modules/sysconfig.inc.php | 2 +- templates/page-sysconfig-main.html | 114 ----------------------------------- templates/serversetup/ipaddress.html | 2 +- templates/sysconfig/_page.html | 114 +++++++++++++++++++++++++++++++++++ 7 files changed, 119 insertions(+), 117 deletions(-) delete mode 100644 templates/page-sysconfig-main.html create mode 100644 templates/sysconfig/_page.html diff --git a/apis/init.inc.php b/apis/init.inc.php index 11c910c9..d24b2cca 100644 --- a/apis/init.inc.php +++ b/apis/init.inc.php @@ -6,3 +6,4 @@ if ($_SERVER['REMOTE_ADDR'] !== '127.0.0.1') Trigger::ldadp(); Trigger::mount(); Trigger::autoUpdateServerIp(); +Trigger::ipxe(); diff --git a/inc/render.inc.php b/inc/render.inc.php index 802944f4..5eabdaca 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -65,7 +65,6 @@ class Render ' - ', self::$footer diff --git a/index.php b/index.php index a14bda6a..4b83baaa 100644 --- a/index.php +++ b/index.php @@ -121,7 +121,9 @@ Message::renderList(); Page::render(); if (defined('CONFIG_DEBUG') && CONFIG_DEBUG) { + Render::openTag('div', array('class' => 'container')); Message::addWarning('debug-mode'); + Render::closeTag('div'); } // Send page to client. diff --git a/modules/sysconfig.inc.php b/modules/sysconfig.inc.php index 5e483e55..8be001e6 100644 --- a/modules/sysconfig.inc.php +++ b/modules/sysconfig.inc.php @@ -142,7 +142,7 @@ class Page_SysConfig extends Page 'module' => $row['title'] ); } - Render::addTemplate('page-sysconfig-main', array( + Render::addTemplate('sysconfig/_page', array( 'configs' => $configs, 'modules' => $modules )); diff --git a/templates/page-sysconfig-main.html b/templates/page-sysconfig-main.html deleted file mode 100644 index 84f98408..00000000 --- a/templates/page-sysconfig-main.html +++ /dev/null @@ -1,114 +0,0 @@ -