diff options
author | Simon Rettberg | 2014-06-23 18:42:44 +0200 |
---|---|---|
committer | Simon Rettberg | 2014-06-23 18:42:44 +0200 |
commit | 5ea4d42e052b4ce563784e1bdcc1e7df4ef8e3b3 (patch) | |
tree | 2485d21affc4defbceb7eb8ff9c66e434c0fddd4 | |
parent | Try to autpmatically detect server ip on init-api (diff) | |
download | slx-admin-5ea4d42e052b4ce563784e1bdcc1e7df4ef8e3b3.tar.gz slx-admin-5ea4d42e052b4ce563784e1bdcc1e7df4ef8e3b3.tar.xz slx-admin-5ea4d42e052b4ce563784e1bdcc1e7df4ef8e3b3.zip |
Some minor html fixes/improvements
-rw-r--r-- | apis/init.inc.php | 1 | ||||
-rw-r--r-- | inc/render.inc.php | 1 | ||||
-rw-r--r-- | index.php | 2 | ||||
-rw-r--r-- | modules/sysconfig.inc.php | 2 | ||||
-rw-r--r-- | templates/serversetup/ipaddress.html | 2 | ||||
-rw-r--r-- | templates/sysconfig/_page.html (renamed from templates/page-sysconfig-main.html) | 0 |
6 files changed, 5 insertions, 3 deletions
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 ' </div> <script src="script/jquery.js"></script> <script src="script/bootstrap.min.js"></script> - <script src="script/bootstrap-tagsinput.min.js"></script> <script src="script/taskmanager.js"></script> ', self::$footer @@ -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/serversetup/ipaddress.html b/templates/serversetup/ipaddress.html index 264dc6d0..013c6785 100644 --- a/templates/serversetup/ipaddress.html +++ b/templates/serversetup/ipaddress.html @@ -11,7 +11,7 @@ <form method="post" action="?do=ServerSetup"> <input type="hidden" name="action" value="ip"> <input type="hidden" name="token" value="{{token}}"> - <table> + <table class="slx-table"> {{#ips}} <tr> <td>{{ip}}</td> diff --git a/templates/page-sysconfig-main.html b/templates/sysconfig/_page.html index 84f98408..84f98408 100644 --- a/templates/page-sysconfig-main.html +++ b/templates/sysconfig/_page.html |