fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
jennylee
2014-04-22 17:05:42 -04:00
parent 5193a261b9 2fc686f1e1
commit ccbe3de551
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build-vendor.php
View File

@@ -101,6 +101,7 @@ $jsFiles = array (
"workflow/public_html/lib/js/underscore-min.js",
"workflow/public_html/lib/js/jquery-ui-1.10.3.custom.min.js",
"workflow/public_html/lib/js/jquery.layout.min.js",
"workflow/public_html/lib/js/modernizr.js",
"workflow/public_html/lib/js/restclient.min.js",
"workflow/public_html/lib/pmUI/pmui.min.js",
"workflow/public_html/lib/mafe/mafe.min.js",

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

@@ -23,7 +23,7 @@
<script type="text/javascript" src="/lib-dev/js/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="/lib-dev/js/jquery.layout.min.js"></script>
<script type="text/javascript" src="/lib-dev/js/restclient.min.js"></script>
<!--<script type="text/javascript" src="/lib/js/jquery.dataTables.min.js"></script>-->
<script type="text/javascript" src="/lib-dev/js/modernizr.js"></script>
<!-- files that are built into pmui.js-->
{foreach from=$pmuiJsCacheFile item=file}
@@ -85,13 +85,13 @@
<section class="content">
<div class="bpmn_shapes">
<div class="head"><span class="mafe-shapes-collapse-icon"></span></div>
<div class="head"></div>
</div>
<div class="content_controls">
<div class="head"><span class="mafe-controls-collapse-icon"></span></div>
<div class="head"></div>
<ul>
<li>
<a href="" class="mafe-menu-dynaform"></a>
<a href="#" class="mafe-menu-dynaform"></a>
<a href="#" class="btn_create mafe-menu-dynaform-create"><span></span></a>
</li>
<li>
@@ -114,10 +114,6 @@
<a href="#" class="mafe-menu-databaseconnections"></a>
<a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a>
</li>
<!--<li>
<a href="#" class="mefe-menu-casescheduler"></a>
<a href="#" class="btn_create mafe-menu-casescheduler-create"><span></span></a>
</li>-->
</ul>
</div>
</section>