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

Merge pull request #627 from hector-cortez/BUG-8484

Browse Source 
BUG 8484 Move "Enable HTML Editing" checkbox, "Restore Original HTML" SOLVED
This commit is contained in:
julceslauhub
2012-10-01 16:16:57 -07:00
parent aa7bc5a4a9 dd1b914ee8
commit bfdcf264d7
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html
View File

@@ -6,16 +6,16 @@
<tr> <tr>
<td valign='top'> <td valign='top'>
<table cellspacing="0" cellpadding="0" border="0" width="100%"> <table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$HTML}</td>
<td class='FormFieldContent' >{$form.HTML}</td>
</tr>
<tr> <tr>
<td class='FormLabel' width="{$form_labelWidth}"></td> <td class='FormLabel' width="{$form_labelWidth}"></td>
<td class='FormButton'> <td class='FormButton'>
<span style="float:left;">{$form.PME_HTML_ENABLETEMPLATE}{$PME_HTML_ENABLETEMPLATE}</span><span style="float:right;">{$form.PME_REFRESH_VIEW}</span><span style="float:right;">{$form.PME_RESTORE_HTML}</span> <span style="float:left;">{$form.PME_HTML_ENABLETEMPLATE}{$PME_HTML_ENABLETEMPLATE}</span><span style="float:right;">{$form.PME_REFRESH_VIEW}</span><span style="float:right;">{$form.PME_RESTORE_HTML}</span>
</td> </td>
</tr> </tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$HTML}</td>
<td class='FormFieldContent' >{$form.HTML}</td>
</tr>
<tr> <tr>
<td class='FormLabel' width="{$form_labelWidth}">{$HTML2}</td> <td class='FormLabel' width="{$form_labelWidth}">{$HTML2}</td>
<td class='FormFieldContent' >{$form.HTML2}</td> <td class='FormFieldContent' >{$form.HTML2}</td>

21
workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml
View File

@@ -5,10 +5,6 @@
<URL type="phpvariable"/> <URL type="phpvariable"/>
<HTML type="html" width="100%" height="350px" toolbarSet="toolbar2lines">
<en>HTML View</en>
</HTML>
<PME_HTML_ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0"> <PME_HTML_ENABLETEMPLATE type="checkbox" value="1" defaultvalue="0" labelOnRight="0">
<en>Enable HTML Editing</en> <en>Enable HTML Editing</en>
</PME_HTML_ENABLETEMPLATE> </PME_HTML_ENABLETEMPLATE>
@@ -21,6 +17,10 @@
<en>Refresh View</en> <en>Refresh View</en>
</PME_REFRESH_VIEW> </PME_REFRESH_VIEW>
<HTML type="html" width="100%" height="300px" toolbarSet="toolbar2lines">
<en>HTML View</en>
</HTML>
<HTML2 type="textarea" cols="120" rows="16" style="width:100%;" className="htmleditor"> <HTML2 type="textarea" cols="120" rows="16" style="width:100%;" className="htmleditor">
<en>HTML Code</en> <en>HTML Code</en>
</HTML2> </HTML2>
@@ -73,7 +73,18 @@ getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").onclick=function()
{ {
/*getField("ENABLETEMPLATE","dynaforms_Properties").checked=this.checked; /*getField("ENABLETEMPLATE","dynaforms_Properties").checked=this.checked;
dynaformEditor.saveProperties();*/ dynaformEditor.saveProperties();*/
dynaformEditor.setEnableTemplate( this.checked ); if (getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked == true) {
new leimnud.module.app.confirm().make(
{
label: "@G::LoadTranslation(ID_MSG_ENABLE_HTML_EDITING)",
size:{ w: 350, h: 150 },
action: function() { },
cancel: function() {
getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked = false;
}
});
dynaformEditor.setEnableTemplate( this.checked );
}
} }
]]></PME_RESIZE_JS> ]]></PME_RESIZE_JS>