Commit e656fc62 authored by Vincent Calame's avatar Vincent Calame

Renommage de html en frameworks

parent e6743774
......@@ -93,6 +93,7 @@ function initFramework() {
$framework = 'bootstrap3';
if (isset($_REQUEST['framework'])) {
switch($_REQUEST['framework']) {
case 'standalone':
case 'bootstrap3':
case 'bootstrap2':
$framework = $_REQUEST['framework'];
......
......@@ -37,7 +37,7 @@ function getPermalinkPattern() {
return $permalink;
}
function includeL10N($dirPath) {
function includeL10N($dirPath) {
$files = scandir($dirPath);
$count = count($files);
$jsString = "var SCRUTARI_L10N = {\n";
......@@ -61,9 +61,9 @@ function getPermalinkPattern() {
}
$jsString .= "endfile: true\n};\n";
return $jsString;
}
}
function escapeQuote($value) {
function escapeQuote($value) {
$value = str_replace('"', '\"', $value);
return $value;
}
......@@ -182,7 +182,7 @@ if ($GLOBALS['scrutari']['dev']) {
} else {
echo '<script src="static/scrutarijs/scrutarijs.js"></script>';
echo "\n".'<script src="static/scrutarijs/l10n/'.$GLOBALS['scrutari']['l10n'].'.js"></script>';
echo "\n".'<script src="static/scrutarijs/html/'.$GLOBALS['scrutari']['framework'].'.js"></script>';
echo "\n".'<script src="static/scrutarijs/frameworks/'.$GLOBALS['scrutari']['framework'].'.js"></script>';
}
$count = count($GLOBALS['scrutari']['engine']['js-links']);
for($i = 0; $i < $count; $i++) {
......@@ -202,7 +202,7 @@ for($i = 0; $i < $count; $i++) {
<script>
<?php if ($GLOBALS['scrutari']['dev']) {
echo includeL10N($GLOBALS['scrutari']['conf']['dev-path']."src/l10n/".$GLOBALS['scrutari']['l10n']);
echo includeHTML($GLOBALS['scrutari']['conf']['dev-path']."src/html/".$GLOBALS['scrutari']['framework']."/", $GLOBALS['scrutari']['conf']['dev-path']."src/html/_default/");
echo includeHTML($GLOBALS['scrutari']['conf']['dev-path']."src/frameworks/".$GLOBALS['scrutari']['framework']."/", $GLOBALS['scrutari']['conf']['dev-path']."src/frameworks/_default/");
}?>
var scrutari_client = null;
function setCurrentFicheBlock(code, scroll) {
......@@ -293,4 +293,4 @@ if (file_exists($customFile)) {
<div class="container" id="mainContainer">
</div>
</body>
</html>
\ No newline at end of file
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment