fernando/luos
1
0
Fork 0
Code Releases 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

4
gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php vendored
View File

@@ -67,10 +67,12 @@ function displayUploadForm()
$html = " $html = "
<div id=\"containerDataForm\"> <div id=\"containerDataForm\">
<form method=\"post\" enctype=\"multipart/form-data\" action=\"uploader.php?" . $_SERVER["QUERY_STRING"] . "&q=upload\" onsubmit=\"return validateForm();\"> <form method=\"post\" enctype=\"multipart/form-data\" action=\"uploader.php?" . $_SERVER["QUERY_STRING"] . "&q=upload\" onsubmit=\"return validateForm();\">
<br/>
File:&nbsp; File:&nbsp;
<input type=\"file\" id=\"File1\" name=\"upload_file\" />&nbsp;(*.html, *.htm) <input type=\"file\" id=\"File1\" name=\"upload_file\" />&nbsp;(*.html, *.htm)
<br/><br/> <br/>
<input type=\"submit\" name=\"Upload File\" value=\"Upload File\" style=\"border: 1px solid #1ba385; float: right; margin-top: 30px; margin-right: -4px; font-size: 10px; display: inline-block; text-decoration: none; padding: 8px 24px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; background-color: #1fbc99; color: white;\" /> <input type=\"submit\" name=\"Upload File\" value=\"Upload File\" style=\"border: 1px solid #1ba385; float: right; margin-top: 30px; margin-right: -4px; font-size: 10px; display: inline-block; text-decoration: none; padding: 8px 24px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; background-color: #1fbc99; color: white;\" />
<input type=\"button\" onclick=\"tinyMCEPopup.close();\"name=\"Cancel\" value=\"Cancel\" style=\"border: 1px solid #e14333; float: right; margin-top: 30px; margin-right: 8px; font-size: 10px; display: inline-block; text-decoration: none; padding: 8px 24px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; background-color: #e4655f; color: white;\" />
</form> </form>
</div> </div>

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

@@ -151,12 +151,16 @@
<a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a> <a href="#" class="btn_create mafe-menu-databaseconnections-create"><span></span></a>
</li> </li>
<li> <li>
<a href="#" class="mafe-menu-permissions"></a> <a href="#" class="mafe-menu-templates"></a>
<a href="#" class="btn_create mafe-menu-permissions-create"><span></span></a> <a href="#" class="btn_create mafe-menu-templates-create"><span></span></a>
</li> </li>
<li> <li>
<a href="#" class="mafe-menu-filemanager"></a> <a href="#" class="mafe-menu-public"></a>
<a href="#" class="btn_create mafe-menu-filemanager-create"><span></span></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> </li>
</ul> </ul>
</div> </div>

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

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