tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

StyleSheet: Load all available module stylesheets 

refs #9702
This commit is contained in:
Johannes Meyer 2015-08-06 15:14:29 +02:00
parent 712d545f48
commit 9cea83242c
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Icinga/Web/LessCompiler.php
View File

@ -93,14 +93,21 @@ class LessCompiler
public function addModule($name, $module) public function addModule($name, $module)
{ {
if ($module->hasCss()) { if ($module->hasCss()) {
$this->source .= "\n/* CSS: modules/$name/module.less */\n" $contents = array();
foreach ($module->getCssFiles() as $path) {
if (file_exists($path)) {
$contents[] = "/* CSS: modules/$name/$path */\n" . file_get_contents($path);
}
}
$this->source .= ''
. '.icinga-module.module-' . '.icinga-module.module-'
. $name . $name
. " {\n" . " {\n"
. file_get_contents($module->getCssFilename()) . join("\n\n", $contents)
. "}\n\n" . "}\n\n";
;
} }
return $this; return $this;
} }

6
library/Icinga/Web/StyleSheet.php
View File

@ -76,7 +76,11 @@ class StyleSheet
$files = $lessFiles; $files = $lessFiles;
foreach ($app->getModuleManager()->getLoadedModules() as $name => $module) { foreach ($app->getModuleManager()->getLoadedModules() as $name => $module) {
if ($module->hasCss()) { if ($module->hasCss()) {
$files[] = $module->getCssFilename(); foreach ($module->getCssFiles() as $path) {
if (file_exists($path)) {
$files[] = $path;
}
}
} }
} }