fernando/luos
1
0
Fork 0
Code Releases Activity

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-05-07 13:49:37 -04:00
parent aaf4502cdb 672c6b9bf8
commit fa6a3e57b4
5 changed files with 84 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -464,7 +464,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$APP_UID = $filter->xssFilterHard($_POST['APP_UID']);
$DEL_INDEX = $filter->xssFilterHard($_POST['DEL_INDEX']);
$_GET['APP_UID'] = $APP_UID
$_GET['APP_UID'] = $APP_UID;
$_GET['DEL_INDEX'] = $DEL_INDEX;
$G_PUBLISH = new Publisher();

40
workflow/engine/templates/cases/cases_Load.php
View File

@@ -26,18 +26,34 @@ $_POST['qs'] = $filter->xssFilterHard($_POST['qs']);
function autoResizeScreen() {
oCasesFrame = document.getElementById('casesFrame');
height = getClientWindowSize().height-90;
oCasesFrame.style.height = height + 'px';;
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
if(oCasesSubFrame){
oCasesSubFrame.style.height = (height-5) + 'px';;
}
else {
setTimeout('autoResizeScreen()', 2000);
}
var containerList1, containerList2;
oCasesFrame = document.getElementById('casesFrame');
oClientWinSize = getClientWindowSize();
containerList1 = document.getElementById("pm_header");
if (document.getElementById("mainMenuBG") &&
document.getElementById("mainMenuBG").parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode){
containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode;
}
if (containerList1 === containerList2) {
height = oClientWinSize.height - containerList1.clientHeight;
oCasesFrame.style.height = height;
if (oCasesFrame.height ) {
oCasesFrame.height = height;
}
} else {
height = getClientWindowSize().height-90;
oCasesFrame.style.height = height + 'px';
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
if(oCasesSubFrame){
oCasesSubFrame.style.height = (height-5) + 'px';;
} else {
setTimeout('autoResizeScreen()', 2000);
}
}
}
</script>
</html>

40
workflow/engine/templates/dashboard/load.php
View File

@@ -22,18 +22,34 @@
function autoResizeScreen() {
oCasesFrame = document.getElementById('casesFrame');
height = getClientWindowSize().height-90;
oCasesFrame.style.height = height;
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
if(oCasesSubFrame){
oCasesSubFrame.style.height = height-5;
}
else {
setTimeout('autoResizeScreen()', 2000);
}
var containerList1, containerList2;
oCasesFrame = document.getElementById('casesFrame');
containerList1 = document.getElementById("pm_header");
if (document.getElementById("mainMenuBG") &&
document.getElementById("mainMenuBG").parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode){
containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode;
}
if (containerList1 === containerList2) {
height = oClientWinSize.height - containerList1.clientHeight;
oCasesFrame.style.height = height;
if (oCasesFrame.height ) {
oCasesFrame.height = height;
}
}else{
height = getClientWindowSize().height-90;
oCasesFrame.style.height = height;
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
if(oCasesSubFrame){
oCasesSubFrame.style.height = height-5;
}
else {
setTimeout('autoResizeScreen()', 2000);
}
}
}
</script>
</html>

2
workflow/engine/templates/services/login_getStarted.html
View File

@@ -94,7 +94,7 @@
<a target="_blank" href="http://www.processmaker.com"><img src="/images/get_started.png" border="0" width="163" height="438"></a>
</td>
<td class="cell2" valign="top">
<p><b><span class="cLow">Welcome to ProcessMaker 3.</span></b></p><br/>
<p><b><span class="cLow">Welcome to ProcessMaker</span></b></p><br/>
<p style="text-align: justify;"><span class="cLow-min">This new version features a new process designer based upon the Business Process Management Notation 2 standard. It offers a new form designer with flexible layouts for desktops, tablets and cellphones and a new REST API to remotely access ProcessMaker.</span></p>
<p style="text-align: justify;"><span class="cLow-min">To get started, log in using the following credentials. You can change them later:</span></p>
<span class="cNeg">Username:</span><span class="cLow"> {name}</span><br>

35
workflow/engine/templates/setup/main_Load.php
View File

@@ -15,16 +15,33 @@
document.documentElement.style.overflowY = 'hidden';
function autoResizeScreen() {
oCasesFrame = document.getElementById('adminFrame');
oClientWinSize = getClientWindowSize();
height = oClientWinSize.height-90;
oCasesFrame.style.height = height;
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('setup-frame');
var containerList1, containerList2;
oCasesFrame = document.getElementById('adminFrame');
containerList1 = document.getElementById("pm_header");
if (document.getElementById("mainMenuBG") &&
document.getElementById("mainMenuBG").parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode){
containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode;
}
if (containerList1 === containerList2) {
height = oClientWinSize.height - containerList1.clientHeight;
oCasesFrame.style.height = height;
if (oCasesFrame.height ) {
oCasesFrame.height = height;
}
} else {
oClientWinSize = getClientWindowSize();
height = oClientWinSize.height-90;
oCasesFrame.style.height = height;
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('setup-frame');
if(oCasesSubFrame)
oCasesSubFrame.style.height = height-5;
else
setTimeout('autoResizeScreen()', 2000);
if(oCasesSubFrame)
oCasesSubFrame.style.height = height-5;
else
setTimeout('autoResizeScreen()', 2000);
}
}
</script>
</html>