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

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2917

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-06-12 10:12:32 -04:00
parent d8d3b32d42 134ffa6e77
commit 5abc524709
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,12 +151,16 @@
<a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a>
</li>
<li>
<a href="#" class="mafe-menu-permissions"></a>
<a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a>
<a href="#" class="mafe-menu-templates"></a>
<a href="#" class="btn_create mafe-menu-templates-create"><span></span></a>
</li>
<li>
<a href="#" class="mafe-menu-filemanager"></a>
<a href="#" class="btn_create mafe-menu-filemanager-create"><span></span></a>
<a href="#" class="mafe-menu-public"></a>
<a href="#" class="btn_create mafe-menu-public-create"><span></span></a>
</li>
<li>
<a href="#" class="mafe-menu-permissions"></a>
<a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a>
</li>
</ul>
</div>
@@ -164,5 +168,5 @@
<div class="head"></div>
</div>
</section>
</body>

2
workflow/engine/templates/users/usersLoad.php
View File

@@ -28,7 +28,7 @@
{
oCasesFrame = document.getElementById('frameMain');
oClientWinSize = getClientWindowSize();
height = oClientWinSize.height - 105;
height = oClientWinSize.height - 70 + "px";
oCasesFrame.style.height = height;
}
function getStyle(targetElement,styleProp)