maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

merged more of the re-design files to current state

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-08 13:17:24 +01:00
parent 43770d37e1
commit bee19fabfa
12 changed files with 121 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/functions/output/function.getTemplate.php
View File

@@ -28,16 +28,21 @@
function getTemplate($template, $noarea = 0)
{
global $templatecache;
global $templatecache, $theme;
if(!isset($theme) || $theme == '')
{
$theme = 'Froxlor';
}
if($noarea != 1)
{
$template = AREA . '/' . $template;
}
if(!isset($templatecache[$template]))
if(!isset($templatecache[$theme][$template]))
{
$filename = './templates/' . $template . '.tpl';
$filename = './templates/' . $theme . '/' . $template . '.tpl';
if(file_exists($filename)
&& is_readable($filename))
@@ -56,8 +61,9 @@ function getTemplate($template, $noarea = 0)
$templatefile = 'TEMPLATE NOT FOUND: ' . $filename;
}
$templatecache[$template] = $templatefile;
$output = $templatefile; // Minify_HTML::minify($templatefile, array('cssMinifier', 'jsMinifier'));
$templatecache[$theme][$template] = $output;
}
return $templatecache[$template];
return $templatecache[$theme][$template];
}

2
lib/functions/output/function.makeyesno.php
View File

@@ -39,5 +39,5 @@ function makeyesno($name, $yesvalue, $novalue = '', $yesselected = '', $disabled
} else {
$d = '';
}
return '<select class="dropdown_noborder" name="' . $name . '"'.$d.'><option value="' . $yesvalue . '"' . ($yesselected ? ' selected="selected"' : '') . '>' . $lng['panel']['yes'] . '</option><option value="' . $novalue . '"' . ($yesselected ? '' : ' selected="selected"') . '>' . $lng['panel']['no'] . '</option></select>';
return '<select class="dropdown_noborder" id="' . $name . '" name="' . $name . '"'.$d.'><option value="' . $yesvalue . '"' . ($yesselected ? ' selected="selected"' : '') . '>' . $lng['panel']['yes'] . '</option><option value="' . $novalue . '"' . ($yesselected ? '' : ' selected="selected"') . '>' . $lng['panel']['no'] . '</option></select>';
}