fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX to load properly css and js files for mafe project on designer template

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-02-18 18:03:10 -04:00
parent f186f3e601
commit 763e0d520b
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/controllers/designer.php
View File

@@ -45,11 +45,24 @@ class Designer extends Controller
throw new Exception("Error: Development JS Files were are not generated!, please execute: \$rake pmBuildDebug in MichelangeloFE project"); throw new Exception("Error: Development JS Files were are not generated!, please execute: \$rake pmBuildDebug in MichelangeloFE project");
} }
$mafeFiles = file(PATH_HTML . "lib-dev/mafe/build.cache", FILE_IGNORE_NEW_LINES);
$mafeCssFiles = array();
$mafeJsFiles = array();
foreach ($mafeFiles as $file) {
if (substr($file, -3) == ".js") {
$mafeJsFiles[] = $file;
} else {
$mafeCssFiles[] = $file;
}
}
$this->setVar('pmuiJsCacheFile', file(PATH_HTML . "lib-dev/pmUI/build.cache", FILE_IGNORE_NEW_LINES)); $this->setVar('pmuiJsCacheFile', file(PATH_HTML . "lib-dev/pmUI/build.cache", FILE_IGNORE_NEW_LINES));
$this->setVar('pmuiCssCacheFile', file(PATH_HTML . "lib-dev/pmUI/css.cache", FILE_IGNORE_NEW_LINES)); $this->setVar('pmuiCssCacheFile', file(PATH_HTML . "lib-dev/pmUI/css.cache", FILE_IGNORE_NEW_LINES));
$this->setVar('designerCacheFile', file(PATH_HTML . "lib-dev/mafe/applications.cache", FILE_IGNORE_NEW_LINES)); $this->setVar('designerCacheFile', file(PATH_HTML . "lib-dev/mafe/applications.cache", FILE_IGNORE_NEW_LINES));
$this->setVar('mafeCacheFile', file(PATH_HTML . "lib-dev/mafe/build.cache", FILE_IGNORE_NEW_LINES)); $this->setVar('mafeJsFiles', $mafeJsFiles);
$this->setVar('mafeCssFiles', $mafeCssFiles);
} }
$this->setView('designer/index'); $this->setView('designer/index');

7
workflow/engine/templates/designer/index.html
View File

@@ -5,8 +5,9 @@
<link rel="stylesheet" type="text/css" href="/lib-dev/pmUI/{$file}" /> <link rel="stylesheet" type="text/css" href="/lib-dev/pmUI/{$file}" />
{/foreach} {/foreach}
<!-- files that are built into mafe.css--> <!-- files that are built into mafe.css-->
<link rel="stylesheet" type="text/css" href="/lib-dev/mafe/toolbarpanel.css" /> {foreach from=$mafeCssFiles item=file}
<link rel="stylesheet" type="text/css" href="/lib-dev/mafe/bpmn.css" /> <link rel="stylesheet" type="text/css" href="/lib-dev/mafe/{$file}" />
{/foreach}
<link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery.layout.css" /> <link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery.layout.css" />
<link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery-ui-1.10.3.custom.min.css" /> <link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery-ui-1.10.3.custom.min.css" />
@@ -30,7 +31,7 @@
{/foreach} {/foreach}
<!-- files that are built into mafe.js--> <!-- files that are built into mafe.js-->
{foreach from=$mafeCacheFile item=file} {foreach from=$mafeJsFiles item=file}
<script type="text/javascript" src="/lib-dev/mafe/{$file}"></script> <script type="text/javascript" src="/lib-dev/mafe/{$file}"></script>
{/foreach} {/foreach}
<!-- files that are built into designer.js--> <!-- files that are built into designer.js-->