Added js.d inclusion from master

Marius Cramer

2014-05-08 f70cd8ed6d468729be35d3ba5f7704d90bf420e6

Added js.d inclusion from master

 interface/web/index.php

@@ -60,6 +60,22 @@
    unset($_SESSION['show_error_msg']);
}

// read js.d files
$js_d = ISPC_WEB_PATH . '/js/js.d';
$js_d_files = array();
if(@is_dir($js_d)) {
    $dir = opendir($js_d);
    while($file = readdir($dir)) {
        $filename = $js_d . '/' . $file;
        if($file === '.' || $file === '..' || !is_file($filename)) continue;
        if(substr($file, -3) !== '.js') continue;
        $js_d_files[] = array('file' => $file);
    }
    closedir($dir);
}

if (!empty($js_d_files)) $app->tpl->setLoop('js_d_includes', $js_d_files);
unset($js_d_files);

$app->tpl_defaults();
$app->tpl->pparse();

 interface/web/themes/default/templates/main.tpl.htm

@@ -18,6 +18,9 @@
        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
        <script type="text/javascript" src="js/jquery.tipsy.js"></script>
        <tmpl_loop name="js_d_includes">
            <script type="text/javascript" src="js/js.d/<tmpl_var name='file'>"></script>
        </tmpl_loop>
        <script language="JavaScript" type="text/javascript">
            jQuery(document).ready(function() {
                loadInitContent();