Skip to content

Commit f70cd8e

Browse files
author
Marius Cramer
committed
Added js.d inclusion from master
1 parent 6f833c8 commit f70cd8e

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

interface/web/index.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,22 @@
6060
unset($_SESSION['show_error_msg']);
6161
}
6262

63+
// read js.d files
64+
$js_d = ISPC_WEB_PATH . '/js/js.d';
65+
$js_d_files = array();
66+
if(@is_dir($js_d)) {
67+
$dir = opendir($js_d);
68+
while($file = readdir($dir)) {
69+
$filename = $js_d . '/' . $file;
70+
if($file === '.' || $file === '..' || !is_file($filename)) continue;
71+
if(substr($file, -3) !== '.js') continue;
72+
$js_d_files[] = array('file' => $file);
73+
}
74+
closedir($dir);
75+
}
76+
77+
if (!empty($js_d_files)) $app->tpl->setLoop('js_d_includes', $js_d_files);
78+
unset($js_d_files);
6379

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
1919
<script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
2020
<script type="text/javascript" src="js/jquery.tipsy.js"></script>
21+
<tmpl_loop name="js_d_includes">
22+
<script type="text/javascript" src="js/js.d/<tmpl_var name='file'>"></script>
23+
</tmpl_loop>
2124
<script language="JavaScript" type="text/javascript">
2225
jQuery(document).ready(function() {
2326
loadInitContent();

0 commit comments

Comments
 (0)