From 9245847699638178ec88b07192eafdb0113163c2 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 2 Nov 2012 17:45:35 +0000 Subject: [PATCH] ordered CSS includes --- lam/style/500_layout.css | 6 +++--- lam/templates/config/conflogin.php | 12 ++++++++++-- lam/templates/config/confmain.php | 12 ++++++++++-- lam/templates/config/confmodules.php | 15 ++++++++++----- lam/templates/config/conftypes.php | 15 ++++++++++----- lam/templates/config/index.php | 12 ++++++++++-- lam/templates/config/mainlogin.php | 12 ++++++++++-- lam/templates/config/mainmanage.php | 12 ++++++++++-- lam/templates/config/moduleSettings.php | 15 ++++++++++----- lam/templates/config/profmanage.php | 12 ++++++++++-- lam/templates/login.php | 12 ++++++++++-- lam/templates/main_header.php | 12 ++++++++++-- 12 files changed, 113 insertions(+), 34 deletions(-) diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css index e606484b..d331d3be 100644 --- a/lam/style/500_layout.css +++ b/lam/style/500_layout.css @@ -45,17 +45,17 @@ body { /* links */ a { -color: blue; +color: #222222; text-decoration: none; } a:link { -color: blue; +color: #222222; text-decoration: none; } a:visited { -color: blue; +color: #222222; text-decoration: none; } diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php index 018c63f3..22e7d107 100644 --- a/lam/templates/config/conflogin.php +++ b/lam/templates/config/conflogin.php @@ -66,8 +66,16 @@ echo $_SESSION['header']; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); - while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + $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 "\n"; } ?> diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index 1ea5003f..7b6aaed2 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -129,8 +129,16 @@ echo ("" . _("LDAP Account Manager Configuration") . "\n"); // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); -while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; +$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 "\n"; } diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php index 87ba89a1..655dfc5a 100644 --- a/lam/templates/config/confmodules.php +++ b/lam/templates/config/confmodules.php @@ -99,15 +99,20 @@ echo "" . _("LDAP Account Manager Configuration") . "\n"; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); -while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; +$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 "\n"; } echo "\n"; -for ($i = 0; $i < sizeof($types); $i++){ - echo "\n"; -} echo "\n"; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; diff --git a/lam/templates/config/conftypes.php b/lam/templates/config/conftypes.php index a2f6ba21..ff4540c6 100644 --- a/lam/templates/config/conftypes.php +++ b/lam/templates/config/conftypes.php @@ -117,15 +117,20 @@ echo "" . _("LDAP Account Manager Configuration") . "\n"; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); -while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; +$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 "\n"; } echo "\n"; -for ($i = 0; $i < sizeof($allTypes); $i++){ - echo "\n"; -} echo "\n"; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; diff --git a/lam/templates/config/index.php b/lam/templates/config/index.php index 62177885..c30467ff 100644 --- a/lam/templates/config/index.php +++ b/lam/templates/config/index.php @@ -54,8 +54,16 @@ echo $_SESSION['header']; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); - while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + $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 "\n"; } ?> diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index 4118ea5c..2a17ad28 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -74,8 +74,16 @@ echo $_SESSION['header']; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); - while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + $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 "\n"; } ?> diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php index 7f0b60eb..668fb529 100644 --- a/lam/templates/config/mainmanage.php +++ b/lam/templates/config/mainmanage.php @@ -138,8 +138,16 @@ echo $_SESSION['header']; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); - while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + $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 "\n"; } ?> diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php index e0a1df07..73b3c2c3 100644 --- a/lam/templates/config/moduleSettings.php +++ b/lam/templates/config/moduleSettings.php @@ -98,15 +98,20 @@ echo "" . _("LDAP Account Manager Configuration") . "\n"; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); -while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; +$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 "\n"; } echo "\n"; -for ($i = 0; $i < sizeof($allTypes); $i++){ - echo "\n"; -} echo "\n"; // include all JavaScript files $jsDirName = dirname(__FILE__) . '/../lib'; diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php index 468e4251..3dbbd4ea 100644 --- a/lam/templates/config/profmanage.php +++ b/lam/templates/config/profmanage.php @@ -152,8 +152,16 @@ echo $_SESSION['header']; // include all CSS files $cssDirName = dirname(__FILE__) . '/../../style'; $cssDir = dir($cssDirName); - while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + $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 "\n"; } ?> diff --git a/lam/templates/login.php b/lam/templates/login.php index 642e353e..801f5161 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -157,8 +157,16 @@ function display_LoginPage($config_object) { // include all CSS files $cssDirName = dirname(__FILE__) . '/../style'; $cssDir = dir($cssDirName); - while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; + $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 "\n"; } ?> diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php index 87be2d0c..3a4cb53e 100644 --- a/lam/templates/main_header.php +++ b/lam/templates/main_header.php @@ -51,8 +51,16 @@ echo "LDAP Account Manager" . $pro . " (" . str_replace(array('ldap://', // include all CSS files $cssDirName = dirname(__FILE__) . '/../style'; $cssDir = dir($cssDirName); -while ($cssEntry = $cssDir->read()) { - if (substr($cssEntry, strlen($cssEntry) - 4, 4) != '.css') continue; +$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 "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . $headerPrefix . "../style/" . $cssEntry . "\">\n"; }