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

Merge pull request #743 from norahmollo/BUG-8557

Browse Source 
BUG 8557 Widen the Trigger editing box from 85 to 100 characters and move insert variable button below the textarea SOLVED
This commit is contained in:
julceslauhub
2012-10-16 06:29:45 -07:00
parent 06966ad548 c71aa82fcc
commit ea6045342a
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/xmlform/triggers/triggersCustom.xml
View File

@@ -19,7 +19,7 @@
<en>Description</en> <en>Description</en>
</TRI_DESCRIPTION> </TRI_DESCRIPTION>
<TRI_WEBBOT type="textareapm" class="formLabel" cols="50" rows="15" width="100%" height="380px" showVars="1" process="@#PRO_UID"> <TRI_WEBBOT type="textareapm" class="formLabel" cols="60" rows="15" width="100%" height="380px" showVars="1" process="@#PRO_UID">
</TRI_WEBBOT> </TRI_WEBBOT>
<SAVE type="button" onclick="triggerSave1(this.form);"> <SAVE type="button" onclick="triggerSave1(this.form);">
<en>Save</en> <en>Save</en>

2
workflow/engine/xmlform/triggers/triggers_Edit.xml
View File

@@ -7,7 +7,7 @@
<TRI_TYPE type="hidden"/> <TRI_TYPE type="hidden"/>
<TRI_WEBBOT type="textareapm" class="formLabel" cols="110" rows="28" width="100%" height="380px" showVars="1" process="@#PRO_UID"> <TRI_WEBBOT type="textareapm" class="formLabel" cols="115" rows="28" width="100%" height="380px" showVars="1" process="@#PRO_UID">
</TRI_WEBBOT> </TRI_WEBBOT>
<BTN_CANCEL type="button" onclick="cancel();"> <BTN_CANCEL type="button" onclick="cancel();">

17
workflow/engine/xmlform/triggers/triggers_Options.xml
View File

@@ -29,7 +29,6 @@
<triggerNewGoogleCreateEvent type="private" defaultValue="../triggers/triggers_CreateGoogleEvent"/> <triggerNewGoogleCreateEvent type="private" defaultValue="../triggers/triggers_CreateGoogleEvent"/>
<PAGED_TABLE_ID type="private"/> <PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/> <PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
@@ -70,7 +69,7 @@
} }
function triggerEdit(sUID) { function triggerEdit(sUID) {
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID , 900, 600); popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID , 930, 600);
} }
function triggerProperties( sUID ) { function triggerProperties( sUID ) {
@@ -119,10 +118,9 @@
@#PAGED_TABLE_ID.refresh(); @#PAGED_TABLE_ID.refresh();
} }
}else{ }else{
ajax_post(form.action, form, 'POST');
ajax_post(form.action, form, 'POST'); currentPopupWindow.remove();
currentPopupWindow.remove(); @#PAGED_TABLE_ID.refresh();
@#PAGED_TABLE_ID.refresh();
} }
} }
//with this function, we are removing the spaces after and before of a string //with this function, we are removing the spaces after and before of a string
@@ -155,8 +153,6 @@
@#PAGED_TABLE_ID.refresh(); @#PAGED_TABLE_ID.refresh();
} }
} }
//end for trigger no wirzard //end for trigger no wirzard
function triggerDelete(sUID) { function triggerDelete(sUID) {
@@ -188,7 +184,8 @@
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
} }
function triggerNewWizard(nameFunction, library) {//alert('@G::encryptlink(@#triggerNewWizard)?PRO_UID=@%PRO_UID&amp;NAME_FUN='+nameFunction+'&amp;PARAMETERS_FUN='+parametersFunct+'&amp;PAGED_TABLE_ID='+@#PAGED_TABLE_ID);return;
function triggerNewWizard(nameFunction, library) {//alert('@G::encryptlink(@#triggerNewWizard)?PRO_UID=@%PRO_UID&amp;NAME_FUN='+nameFunction+'&amp; PARAMETERS_FUN='+parametersFunct+'&amp;PAGED_TABLE_ID='+@#PAGED_TABLE_ID);return;
popupWindow('@G::LoadTranslation(ID_NEW_TRIGGERS)', '@G::encryptlink(@#triggerNewWizard)?PRO_UID=@%PRO_UID&NAME_FUN='+nameFunction+'&LIBRARY='+library+'&PAGED_TABLE_ID='+@#PAGED_TABLE_ID , 600, 600); popupWindow('@G::LoadTranslation(ID_NEW_TRIGGERS)', '@G::encryptlink(@#triggerNewWizard)?PRO_UID=@%PRO_UID&NAME_FUN='+nameFunction+'&LIBRARY='+library+'&PAGED_TABLE_ID='+@#PAGED_TABLE_ID , 600, 600);
} }
@@ -202,4 +199,4 @@
<SEARCH_FILTER_FORM type="private"/> <SEARCH_FILTER_FORM type="private"/>
</dynaForm> </dynaForm>