From 0becd907f69c816afe83e68e540938971136d1b1 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 4 Nov 2017 11:29:38 +0100 Subject: [PATCH] use central function to include CSS/JS --- lam/lib/account.inc | 30 ++++++++-------- lam/templates/config/index.php | 31 +---------------- lam/templates/config/mainlogin.php | 31 +---------------- lam/templates/config/mainmanage.php | 43 ++--------------------- lam/templates/login.php | 53 ++--------------------------- lam/templates/login2Factor.php | 42 ++--------------------- 6 files changed, 25 insertions(+), 205 deletions(-) diff --git a/lam/lib/account.inc b/lam/lib/account.inc index b3f44ac8..9dedfb57 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -1522,21 +1522,6 @@ function printHeaderContents($title, $prefix) { echo ''; echo $title; echo ''; - // include all CSS files - $cssDirName = dirname(__FILE__) . '/../style'; - $cssDir = dir($cssDirName); - $cssFiles = array(); - $cssEntry = $cssDir->read(); - while ($cssEntry !== false) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') { - $cssFiles[] = $cssEntry; - } - $cssEntry = $cssDir->read(); - } - sort($cssFiles); - foreach ($cssFiles as $cssEntry) { - echo ""; - } // include responsive CSS $cssDirName = dirname(__FILE__) . '/../style/responsive'; $cssDir = dir($cssDirName); @@ -1552,6 +1537,21 @@ function printHeaderContents($title, $prefix) { foreach ($cssFiles as $cssEntry) { echo ""; } + // include all other CSS files + $cssDirName = dirname(__FILE__) . '/../style'; + $cssDir = dir($cssDirName); + $cssFiles = array(); + $cssEntry = $cssDir->read(); + while ($cssEntry !== false) { + if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') { + $cssFiles[] = $cssEntry; + } + $cssEntry = $cssDir->read(); + } + sort($cssFiles); + foreach ($cssFiles as $cssEntry) { + echo ""; + } echo ''; echo ''; } diff --git a/lam/templates/config/index.php b/lam/templates/config/index.php index e6d34b5c..0c5c416b 100644 --- a/lam/templates/config/index.php +++ b/lam/templates/config/index.php @@ -42,37 +42,8 @@ if (strtolower(session_module_name()) == 'files') { setlanguage(); echo $_SESSION['header']; - +printHeaderContents(_("Configuration overview"), '../..'); ?> - - - - <?php - echo _("Configuration overview"); - ?> - - - - - read(); - while ($cssEntry !== false) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') { - $cssFiles[] = $cssEntry; - } - $cssEntry = $cssDir->read(); - } - sort($cssFiles); - foreach ($cssFiles as $cssEntry) { - echo "\n"; - } - ?> - - diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index aef9b470..5f1f3860 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -67,37 +67,8 @@ if (isset($_POST['passwd'])) { } echo $_SESSION['header']; - +printHeaderContents(_("Login"), '../..'); ?> - - - - <?php - echo _("Login"); - ?> - - - - - read(); - while ($cssEntry !== false) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') { - $cssFiles[] = $cssEntry; - } - $cssEntry = $cssDir->read(); - } - sort($cssFiles); - foreach ($cssFiles as $cssEntry) { - echo "\n"; - } - ?> - - - - - - <?php - echo _("Edit general settings"); - ?> - - - - - read(); - while ($cssEntry !== false) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') { - $cssFiles[] = $cssEntry; - } - $cssEntry = $cssDir->read(); - } - sort($cssFiles); - foreach ($cssFiles as $cssEntry) { - echo "\n"; - } - ?> - -
@@ -288,17 +259,7 @@ echo $_SESSION['header']; read()) { - if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; - $jsFiles[] = $jsEntry; -} -sort($jsFiles); -foreach ($jsFiles as $jsEntry) { - echo "\n"; -} +printJsIncludes('../..'); $tabindex = 1; diff --git a/lam/templates/login.php b/lam/templates/login.php index b91f2c80..62568e4c 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -193,46 +193,13 @@ function display_LoginPage(LAMConfig $config_object, LAMCfgMain $cfgMain, $licen setlanguage(); // setting correct language echo $_SESSION["header"]; + printHeaderContents('LDAP Account Manager', '..'); ?> - - LDAP Account Manager - - - - read(); - while ($cssEntry !== false) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') { - $cssFiles[] = $cssEntry; - } - $cssEntry = $cssDir->read(); - } - sort($cssFiles); - foreach ($cssFiles as $cssEntry) { - echo "\n"; - } - ?> - - read()) { - if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; - $jsFiles[] = $jsEntry; - } - sort($jsFiles); - foreach ($jsFiles as $jsEntry) { - echo "\n"; - } + printJsIncludes('..'); // upgrade if pdf/profiles contain single files if (containsFiles('../config/profiles') || containsFiles('../config/pdf')) { @@ -264,23 +231,11 @@ function display_LoginPage(LAMConfig $config_object, LAMCfgMain $cfgMain, $licen echo "myElement.focus();\n"; } echo "}\n"; - ?> - jQuery(document).ready(function() { - jQuery('#loginButton').button(); - }); - \n"; echo "\n"; } ?> - -
@@ -393,8 +348,7 @@ function display_LoginPage(LAMConfig $config_object, LAMCfgMain $cfgMain, $licen $userSelect = new htmlSelect('username', $adminList, $selectedAdmin); $userSelect->setHasDescriptiveElements(true); $userSelect->setTransformSingleSelect(false); - $userSelect->alignment = htmlElement::ALIGN_LEFT; - $row->addField($userSelect); + $row->addField(new htmlDiv(null, $userSelect)); } else { if ($config_object->getHttpAuthentication() == 'true') { @@ -421,7 +375,6 @@ function display_LoginPage(LAMConfig $config_object, LAMCfgMain $cfgMain, $licen else { $passwordInput = new htmlInputField('passwd'); $passwordInput->setIsPassword(true); - $passwordInput->setFieldSize('20px'); $row->addField($passwordInput); } // language diff --git a/lam/templates/login2Factor.php b/lam/templates/login2Factor.php index 1cac6135..fe6ae012 100644 --- a/lam/templates/login2Factor.php +++ b/lam/templates/login2Factor.php @@ -117,51 +117,15 @@ if (isset($_POST['submit'])) { } } +echo $_SESSION['header']; +printHeaderContents(_("Login"), '..'); ?> - - - - - - - - <?php echo _("Login"); ?> - - - - read(); - while ($cssEntry !== false) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) == '.css') { - $cssFiles[] = $cssEntry; - } - $cssEntry = $cssDir->read(); - } - sort($cssFiles); - foreach ($cssFiles as $cssEntry) { - echo "\n"; - } - ?> read()) { - if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue; - $jsFiles[] = $jsEntry; -} -sort($jsFiles); -foreach ($jsFiles as $jsEntry) { - echo "\n"; -} +printJsIncludes('..'); ?>