0000857: Customized form blocks were not using "form_row" design resulting fatal error

Index: admin_templates/categories/ci_blocks.tpl =================================================================== --- admin_templates/categories/ci_blocks.tpl (revision 13919) +++ admin_templates/categories/ci_blocks.tpl (working copy) @@ -53,18 +53,14 @@ </inp2:m_DefineElement> <inp2:m_DefineElement name="inp_edit_relation"> ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:m_if check="{$prefix}_Field" field="$field">~~ ~~- <img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/>~~ ~~- <inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>)~~ ~~- </inp2:m_if>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> + <td class="control-cell"> + <inp2:m_if check="{$prefix}_Field" field="$field"> + <img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/> + <inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>) + </inp2:m_if> + </td> + </inp2:m_RenderElement> </inp2:m_DefineElement> <inp2:m_DefineElement name="structure_reload_element"> Index: admin_templates/languages/email_message_settings.tpl =================================================================== --- admin_templates/languages/email_message_settings.tpl (revision 13919) +++ admin_templates/languages/email_message_settings.tpl (working copy) @@ -54,60 +54,56 @@ <inp2:emailevents_ErrorWarning name="form_error_warning"/> <inp2:m_DefineElement name="inp_edit_combo_target" caption_render_as="default_field_caption_element" read_only="0" has_empty="" hint_label=""> ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" id="<inp2:$prefix_InputName field='$field'/>_row">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" caption_render_as="$caption_render_as" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:m_if check="m_Param" name="read_only">~~ ~~- <inp2:$prefix_Field name="{$field}Type"/>: "<inp2:$prefix_Field name="$field"/>"~~ ~~- <inp2:m_else/>~~ ~~- <select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='{$field}Type'/>" id="<inp2:{$prefix}_InputName field='{$field}Type'/>">~~ ~~- <inp2:{$prefix}_PredefinedOptions field="{$field}Type" block="inp_option_phrase" selected="selected" has_empty="$has_empty"/>~~ ~~- </select>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> + <td class="control-cell"> + <inp2:m_if check="m_Param" name="read_only"> + <inp2:$prefix_Field name="{$field}Type"/>: "<inp2:$prefix_Field name="$field"/>" + <inp2:m_else/> + <select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='{$field}Type'/>" id="<inp2:{$prefix}_InputName field='{$field}Type'/>"> + <inp2:{$prefix}_PredefinedOptions field="{$field}Type" block="inp_option_phrase" selected="selected" has_empty="$has_empty"/> + </select> - <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" style="width: 250px;"/> ~~- </inp2:m_if>~~ + <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" style="width: 250px;"/> + </inp2:m_if> ~~- <script type="text/javascript">~~ ~~- fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>Type'] = '<inp2:m_phrase label="{$title}Type" js_escape="1"/>'~~ + <script type="text/javascript"> + fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>Type'] = '<inp2:m_phrase label="{$title}Type" js_escape="1"/>' ~~- new AJAXDropDown(~~ ~~- '<inp2:$prefix_InputName name="$field" js_escape="1"/>',~~ ~~- function(cur_value) {~~ ~~- var $type = $( jq('#<inp2:$prefix_InputName name="{$field}Type" js_escape="1"/>') ).val();~~ + new AJAXDropDown( + '<inp2:$prefix_InputName name="$field" js_escape="1"/>', + function(cur_value) { + var $type = $( jq('#<inp2:$prefix_InputName name="{$field}Type" js_escape="1"/>') ).val(); ~~- if ( !isNaN( parseInt($type) ) ) {~~ ~~- var $url = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnSuggestAddress" value="#VALUE#" type="#TYPE#" no_amp="1"/>';~~ + if ( !isNaN( parseInt($type) ) ) { + var $url = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnSuggestAddress" value="#VALUE#" type="#TYPE#" no_amp="1"/>'; ~~- return $url.replace('#VALUE#', encodeURIComponent(cur_value)).replace('#TYPE#', encodeURIComponent($type));~~ ~~- }~~ - ~~- return false;~~ + return $url.replace('#VALUE#', encodeURIComponent(cur_value)).replace('#TYPE#', encodeURIComponent($type)); } ~~- );~~ ~~- $(document).ready(~~ ~~- function () {~~ ~~- $( jq('#<inp2:$prefix_InputName name="{$field}Type"/>') ).change(~~ ~~- function ($e) {~~ ~~- var $me = $(this);~~ + return false; + } + ); ~~- if ($me.attr('disabled')) {~~ ~~- return ;~~ ~~- }~~ + $(document).ready( + function () { + $( jq('#<inp2:$prefix_InputName name="{$field}Type"/>') ).change( + function ($e) { + var $me = $(this); ~~- var $type_selected = !isNaN( parseInt( $me.val() ) );~~ ~~- $( jq('#<inp2:$prefix_InputName name="$field"/>') ).attr('disabled', $type_selected ? '' : 'disabled');~~ + if ($me.attr('disabled')) { + return ; } ~~- )~~ ~~- .change();~~ ~~- }~~ ~~- );~~ ~~- </script>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + + var $type_selected = !isNaN( parseInt( $me.val() ) ); + $( jq('#<inp2:$prefix_InputName name="$field"/>') ).attr('disabled', $type_selected ? '' : 'disabled'); + } + ) + .change(); + } + ); + </script> + </td> + </inp2:m_RenderElement> </inp2:m_DefineElement> <div id="scroll_container"> Index: admin_templates/mailing_lists/mailing_list_edit.tpl =================================================================== --- admin_templates/mailing_lists/mailing_list_edit.tpl (revision 13919) +++ admin_templates/mailing_lists/mailing_list_edit.tpl (working copy) @@ -86,30 +86,23 @@ <inp2:m_if check="m_Param" name="not_last">; </inp2:m_if> </inp2:m_DefineElement> ~~-<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 100%">~~ ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:m_if check="{$prefix}_IsManualRecipient">~~ - <input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>"> ~~- <inp2:m_else/>~~ ~~- <inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>~~ ~~- <inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>~~ ~~- </inp2:m_if>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ ~~-</inp2:m_DefineElement>~~ - <div id="scroll_container"> <table class="edit-form"> <inp2:m_RenderElement name="subsection" title="la_section_General"/> <inp2:m_RenderElement name="inp_id_label" prefix="mailing-list" field="MailingId" title="la_fld_Id"/> ~~- <inp2:m_RenderElement name="inp_recipient_box" prefix="mailing-list" field="To" title="la_fld_To" size="60"/>~~ + <inp2:m_RenderElement design="form_row" prefix="mailing-list" field="To" title="la_fld_To" size="60"> + <td class="control-cell"> + <inp2:m_if check="{$prefix}_IsManualRecipient"> + <input style="width: 100%;" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>"> + <inp2:m_else/> + <inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/> + <inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/> + </inp2:m_if> + </td> + </inp2:m_RenderElement> + <inp2:m_if check="mailing-list_IsNewItem"> <inp2:m_RenderElement name="inp_edit_box" prefix="mailing-list" field="Subject" title="la_fld_Subject" size="60"/> <inp2:m_RenderElement name="inp_edit_swf_upload" prefix="mailing-list" field="Attachments" title="la_fld_Attachment"/> Index: admin_templates/regional/languages_export.tpl =================================================================== --- admin_templates/regional/languages_export.tpl (revision 13919) +++ admin_templates/regional/languages_export.tpl (working copy) @@ -33,15 +33,11 @@ <table class="edit-form"> <inp2:m_RenderElement name="subsection" title="!la_section_General!"/> ~~- <inp2:m_if check="phrases.export_FieldVisible" field="LangFile">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>~~ ~~- <td class="control-cell">~~ - <inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field='LangFile'/>" id="<inp2:phrases.export_InputName field='LangFile'/>" value="<inp2:phrases.export_Field field='LangFile'/>" /> ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="LangFile"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"> + <td class="control-cell"> + <inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field='LangFile'/>" id="<inp2:phrases.export_InputName field='LangFile'/>" value="<inp2:phrases.export_Field field='LangFile'/>" /> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/> @@ -64,55 +60,51 @@ </tr> </inp2:m_DefineElement> ~~- <inp2:m_if check="phrases.export_FieldVisible" field="PhraseType">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="Module" title="la_fld_ExportModules"/>~~ ~~- <td class="control-cell">~~ ~~- <input type="button" class="button" id="btn-select-all" value="<inp2:m_Phrase name='la_btn_SelectAll' no_editing='1'/>"/>~~ ~~- <input type="button" class="button" id="btn-unselect" value="<inp2:m_Phrase name='la_btn_Unselect' no_editing='1'/>"/>~~ ~~- <br/><br/>~~ + <inp2:m_RenderElement design="form_row" prefix="phrases.export" field="Module" title="la_fld_ExportModules"> + <td class="control-cell"> + <input type="button" class="button" id="btn-select-all" value="<inp2:m_Phrase name='la_btn_SelectAll' no_editing='1'/>"/> + <input type="button" class="button" id="btn-unselect" value="<inp2:m_Phrase name='la_btn_Unselect' no_editing='1'/>"/> + <br/><br/> ~~- <style type="text/css">~~ ~~- table#modules {~~ ~~- border-collapse: collapse;~~ ~~- }~~ + <style type="text/css"> + table#modules { + border-collapse: collapse; + } ~~- table#modules td, table#modules th {~~ ~~- border: 1px solid black;~~ ~~- padding: 3px;~~ ~~- }~~ ~~- </style>~~ + table#modules td, table#modules th { + border: 1px solid black; + padding: 3px; + } + </style> ~~- <table id="modules" border="1">~~ ~~- <tr>~~ ~~- <th align="center" colspan="2"><inp2:m_Phrase name="la_col_Module"/></th>~~ ~~- <th align="center"><inp2:m_Phrase name="la_col_Phrases"/></th>~~ ~~- <th align="center"><inp2:m_Phrase name="la_col_EmailEvents"/></th>~~ ~~- </tr>~~ ~~- <inp2:phrases.export_PredefinedOptions prefix="phrases.export" field="Module" block="export_module_element" no_empty="1" selected="checked"/>~~ ~~- </table>~~ + <table id="modules" border="1"> + <tr> + <th align="center" colspan="2"><inp2:m_Phrase name="la_col_Module"/></th> + <th align="center"><inp2:m_Phrase name="la_col_Phrases"/></th> + <th align="center"><inp2:m_Phrase name="la_col_EmailEvents"/></th> + </tr> + <inp2:phrases.export_PredefinedOptions prefix="phrases.export" field="Module" block="export_module_element" no_empty="1" selected="checked"/> + </table> ~~- <script type="text/javascript">~~ ~~- $(document).ready(~~ ~~- function () {~~ ~~- $('#btn-select-all, #btn-unselect').click(~~ ~~- function ($e) {~~ ~~- var $checked = $(this).attr('id') == 'btn-select-all' ? 'checked' : '';~~ ~~- var $reg_exp = /^<inp2:phrases.export_InputName field='Module' as_preg='1'/>_([0-9A-Za-z-]+)/;~~ + <script type="text/javascript"> + $(document).ready( + function () { + $('#btn-select-all, #btn-unselect').click( + function ($e) { + var $checked = $(this).attr('id') == 'btn-select-all' ? 'checked' : ''; + var $reg_exp = /^<inp2:phrases.export_InputName field='Module' as_preg='1'/>_([0-9A-Za-z-]+)/; ~~- $("input[type='checkbox']", '#modules').attr('checked', $checked);~~ ~~- update_checkbox_options($reg_exp, '<inp2:phrases.export_InputName field='Module'/>');~~ ~~- }~~ ~~- );~~ ~~- }~~ ~~- );~~ ~~- </script>~~ + $("input[type='checkbox']", '#modules').attr('checked', $checked); + update_checkbox_options($reg_exp, '<inp2:phrases.export_InputName field='Module'/>'); + } + ); + } + ); + </script> ~~- <inp2:m_RenderElement prefix="phrases.export" name="inp_edit_hidden" field="Module" db="db"/>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="Module"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement prefix="phrases.export" name="inp_edit_hidden" field="Module" db="db"/> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportPhrases" title="!la_fld_ExportPhrases!" allow_html="0" hint_label="la_hint_ExportPhrases"/> <inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailEvents" title="!la_fld_ExportEmailEvents!" allow_html="0" hint_label="la_hint_ExportEmailEvents"/> Index: admin_templates/site_domains/site_domain_edit.tpl =================================================================== --- admin_templates/site_domains/site_domain_edit.tpl (revision 13919) +++ admin_templates/site_domains/site_domain_edit.tpl (working copy) @@ -59,18 +59,14 @@ <inp2:site-domain_ErrorWarning name="form_error_warning"/> <inp2:m_DefineElement name="inp_edit_regexp_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 400px"> ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ - <input type="hidden" id="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" name="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" value="<inp2:{$prefix}_Field field='{$field}UsesRegExp' db='db'/>"> - <input tabindex="<inp2:m_get param='tab_index'/>" title="<inp2:m_Phrase name='la_hint_UsingRegularExpression' html_escape='1'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" <inp2:{$prefix}_Field field="{$field}UsesRegExp" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>'));"/> + <inp2:m_RenderElement design="form_row" pass_params="1"> + <td class="control-cell"> + <input type="hidden" id="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" name="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" value="<inp2:{$prefix}_Field field='{$field}UsesRegExp' db='db'/>"> + <input tabindex="<inp2:m_get param='tab_index'/>" title="<inp2:m_Phrase name='la_hint_UsingRegularExpression' html_escape='1'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" <inp2:{$prefix}_Field field="{$field}UsesRegExp" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>'));"/> - <input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" maxlength="<inp2:m_param name='maxlength'/>" class="<inp2:m_param name='class'/>" onblur="<inp2:m_Param name='onblur'/>" onkeyup="<inp2:m_Param name='onkeyup'/>" onchange="<inp2:m_Param name='onchange'/>"> ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>" maxlength="<inp2:m_param name='maxlength'/>" class="<inp2:m_param name='class'/>" onblur="<inp2:m_Param name='onblur'/>" onkeyup="<inp2:m_Param name='onkeyup'/>" onchange="<inp2:m_Param name='onchange'/>"> + </td> + </inp2:m_RenderElement> </inp2:m_DefineElement> <div id="scroll_container"> Index: admin_templates/skins/skin_edit.tpl =================================================================== --- admin_templates/skins/skin_edit.tpl (revision 13919) +++ admin_templates/skins/skin_edit.tpl (working copy) @@ -59,18 +59,6 @@ </tbody> </table> ~~-<inp2:m_DefineElement name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">~~ ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" subfield="$subfield" title="$Description" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ ~~- <input style="<inp2:m_Param name='style'/>" type="text"~~ - name="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>][Value]" id="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>]" value="<inp2:m_Param name='Value'/>"> ~~- </td>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ ~~-</inp2:m_DefineElement>~~ - <inp2:m_DefineElement name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%"> <inp2:PrintSerializedFields pass_params="1" field="$field" render_as="$item_render_as"/> </inp2:m_DefineElement> @@ -78,6 +66,10 @@ <inp2:skin_SaveWarning name="grid_save_warning"/> <inp2:skin_ErrorWarning name="form_error_warning"/> +<style type="text/css"> + .skin-table td {width: 90px}; +</style> + <div id="scroll_container"> <table class="edit-form"> <inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/> @@ -88,12 +80,7 @@ <inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoBottom" title="la_fld_LogoBottom"/> <inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoLogin" title="la_fld_LogoLogin"/> ~~- <style type="text/css">~~ ~~- .skin-table td {width: 90px};~~ ~~- </style>~~ - ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>~~ + <inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_HeadFrame"> <td class="control-cell"> <table class="skin-table"> <tr> @@ -126,10 +113,9 @@ </tr> </table> </td> ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_GeneralSections"/>~~ + <inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_GeneralSections"> <td class="control-cell"> <table class="skin-table"> <tr> @@ -162,10 +148,9 @@ </tr> </table> </td> ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid1"/>~~ + <inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_DataGrid1"> <td class="control-cell"> <table class="skin-table"> <tr> @@ -198,10 +183,9 @@ </tr> </table> </td> ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_DataGrid2"/>~~ + <inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_DataGrid2"> <td class="control-cell"> <table class="skin-table"> <tr> @@ -234,10 +218,9 @@ </tr> </table> </td> ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_Trees"/>~~ + <inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_Trees"> <td class="control-cell"> <table class="skin-table"> <tr> @@ -282,9 +265,8 @@ </tr> </table> </td> ~~- </tr>~~ + </inp2:m_RenderElement> ~~- ~~ <inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!" control_options="{min_height: 300}"/> </table> Index: admin_templates/stylesheets/style_editor.tpl =================================================================== --- admin_templates/stylesheets/style_editor.tpl (revision 13919) +++ admin_templates/stylesheets/style_editor.tpl (working copy) @@ -47,8 +47,7 @@ </table> <inp2:m_DefineElement name="inp_edit_color"> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> <td class="control-cell"> <input type="text" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" @@ -65,20 +64,17 @@ updateColor(null,'<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>'); </script> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> </inp2:m_DefineElement> <inp2:m_DefineElement name="inp_edit_options_style"> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title_phrase="$title_phrase" title="$title" is_last="$is_last"/>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> <td class="control-cell"> <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>"> <inp2:{$prefix}_PredefinedOptions field="$field" value_field="$value_field" subfield="$subfield" block="inp_option_item" selected="selected"/> </select> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> </inp2:m_DefineElement> Index: admin_templates/submissions/submission_log_edit.tpl =================================================================== --- admin_templates/submissions/submission_log_edit.tpl (revision 13919) +++ admin_templates/submissions/submission_log_edit.tpl (working copy) @@ -71,28 +71,6 @@ <a href="<inp2:Field field='$field' format='full_url'/>" target="_blank"><inp2:Field field="$field"/></a><br/> </inp2:m_DefineElement> ~~-<inp2:m_DefineElement name="inp_edit_upload_label" is_last="">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:$prefix_IterateFiles render_as="file_element" field="$field"/>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~-</inp2:m_DefineElement>~~ - ~~-<inp2:m_DefineElement name="inp_edit_draft" is_last="">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="la_DraftAvailableFrom" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:draft.related_Field name="CreatedOn"/>~~ ~~- [<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnUseDraft'); return false;"><inp2:m_Phrase name="la_btn_UseDraft"/></a>]~~ ~~-  [<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnDeleteDraft'); return false;"><inp2:m_Phrase name="la_btn_DeleteDraft"/></a>]~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~-</inp2:m_DefineElement>~~ - <input type="hidden" name="client_mode" value="<inp2:m_Get name='client_mode'/>"/> <inp2:submission-log_SaveWarning name="grid_save_warning"/> @@ -112,7 +90,13 @@ <inp2:m_RenderElement name="inp_edit_box" prefix="submission-log" field="Subject" size="80" title="la_fld_Subject"/> <inp2:m_if check="submission-log_HasDraft"> ~~- <inp2:m_RenderElement name="inp_edit_draft" prefix="submission-log" field="DraftId"/>~~ + <inp2:m_RenderElement design="form_row" prefix="submission-log" field="DraftId" title="la_DraftAvailableFrom"> + <td class="control-cell"> + <inp2:draft.related_Field name="CreatedOn"/> + [<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnUseDraft'); return false;"><inp2:m_Phrase name="la_btn_UseDraft"/></a>] +  [<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnDeleteDraft'); return false;"><inp2:m_Phrase name="la_btn_DeleteDraft"/></a>] + </td> + </inp2:m_RenderElement> </inp2:m_if> <inp2:m_RenderElement name="inp_edit_textarea" prefix="submission-log" field="Message" rows="30" cols="100" title="la_fld_Message" allow_html="0"/> @@ -124,8 +108,13 @@ <inp2:m_RenderElement name="inp_label" prefix="submission-log" field="RepliedOn" title="la_fld_RepliedOn"/> <inp2:m_RenderElement name="inp_label" prefix="submission-log" field="SentStatus" title="la_fld_SentStatus"/> <inp2:m_RenderElement name="inp_label" prefix="submission-log" field="SentOn" title="la_fld_SentOn"/> ~~- <inp2:m_RenderElement name="inp_edit_upload_label" prefix="submission-log" field="Attachment" title="la_fld_Attachment"/>~~ + <inp2:m_RenderElement design="form_row" prefix="submission-log" field="Attachment" title="la_fld_Attachment"> + <td class="control-cell"> + <inp2:$prefix_IterateFiles render_as="file_element" field="$field"/> + </td> + </inp2:m_DefineElement> + <inp2:m_if check="submission-log_Field" name="BounceInfo"> <inp2:m_RenderElement name="inp_label" prefix="submission-log" field="BounceInfo" title="la_fld_BounceInfo" nl2br="1"/> </inp2:m_if> Index: admin_templates/submissions/submission_view.tpl =================================================================== --- admin_templates/submissions/submission_view.tpl (revision 13919) +++ admin_templates/submissions/submission_view.tpl (working copy) @@ -109,23 +109,6 @@ <inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_radio_item" selected="checked"/> </inp2:m_DefineElement> ~~-<inp2:m_DefineElement name="inp_edit_merge_to" caption_render_as="default_field_caption_element" is_last="" field_class="" onchange="" hint_label="" onclick="">~~ ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" id="<inp2:$prefix_InputName field='$field'/>_row">~~ - <inp2:m_RenderElement name="inp_edit_field_caption" caption_render_as="$caption_render_as" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last" NamePrefix="_cb_"/> ~~- <td class="control-cell">~~ ~~- <input type="hidden" id="<inp2:{$prefix}_InputName field='Is{$field}'/>" name="<inp2:{$prefix}_InputName field='Is{$field}'/>" value="<inp2:{$prefix}_Field field='Is{$field}' db='db'/>">~~ - <input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" name="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" <inp2:{$prefix}_Field field="Is{$field}" checked="checked" db="db"/> class="<inp2:m_param name='field_class'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Is{$field}'/>'));<inp2:m_param name='onchange'/>" onclick="<inp2:m_param name='onclick'/>"> - - <select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>" style="width: 400px;"> ~~- <inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="1"/>~~ ~~- </select>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ ~~-</inp2:m_DefineElement>~~ - <inp2:formsubs_SaveWarning name="grid_save_warning"/> <inp2:formsubs_ErrorWarning name="form_error_warning"/> @@ -149,7 +132,16 @@ <inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db"> <inp2:m_ifnot check="submission-log_TotalRecords"> ~~- <inp2:m_RenderElement name="inp_edit_merge_to" prefix="formsubs" field="MergeToSubmission" title="la_fld_MergeToSubmission"/>~~ + <inp2:m_RenderElement design="form_row" prefix="formsubs" field="MergeToSubmission" title="la_fld_MergeToSubmission"> + <td class="control-cell"> + <input type="hidden" id="<inp2:{$prefix}_InputName field='Is{$field}'/>" name="<inp2:{$prefix}_InputName field='Is{$field}'/>" value="<inp2:{$prefix}_Field field='Is{$field}' db='db'/>"> + <input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" name="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" <inp2:{$prefix}_Field field="Is{$field}" checked="checked" db="db"/> class="<inp2:m_param name='field_class'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Is{$field}'/>'));<inp2:m_param name='onchange'/>" onclick="<inp2:m_param name='onclick'/>"> + + <select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>" style="width: 400px;"> + <inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="1"/> + </select> + </td> + </inp2:m_RenderElement> </inp2:m_ifnot> </inp2:m_if> <inp2:m_RenderElement name="subsection" title="la_section_Data"/>

Index: in-auction/admin_templates/error_log/error_log_view.tpl =================================================================== --- in-auction/admin_templates/error_log/error_log_view.tpl (revision 13919) +++ in-auction/admin_templates/error_log/error_log_view.tpl (working copy) @@ -51,28 +51,20 @@  <inp2:m_DefineElement name="inp_array_label" is_last="" as_label="" currency="" is_last=""> ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ ~~- <pre><inp2:{$prefix}_PrintArrayField field="$field"/></pre>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> + <td class="control-cell"> + <pre><inp2:{$prefix}_PrintArrayField field="$field"/></pre> + </td> + </inp2:m_RenderElement> </inp2:m_DefineElement> <inp2:m_DefineElement name="inp_file_label" is_last="" as_label="" currency="" is_last=""> ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ ~~- <a href="<inp2:m_BaseURL/>kernel/ebay_logs/<inp2:{$prefix}_Field field="$field"/>"><inp2:{$prefix}_Field field="$field"/></a>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> + <td class="control-cell"> + <a href="<inp2:m_BaseURL/>kernel/ebay_logs/<inp2:{$prefix}_Field field="$field"/>"><inp2:{$prefix}_Field field="$field"/></a> + </td> + </inp2:m_RenderElement> </inp2:m_DefineElement> <inp2:err-ebay_SaveWarning name="grid_save_warning"/> Index: in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl =================================================================== --- in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl (revision 13919) +++ in-commerce/admin_templates/affiliate_plans/affiliate_plans_edit.tpl (working copy) @@ -64,16 +64,12 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="IsPrimary" title="!la_fld_Primary!" onchange="check_status()" /> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()"/> ~~- <inp2:m_if check="ap_FieldVisible" field="MinPaymentAmount">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount" />~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:ap_InputName field='MinPaymentAmount' />" id="<inp2:ap_InputName field='MinPaymentAmount' />" value="<inp2:ap_Field name='MinPaymentAmount' />" tabindex="<inp2:m_get param='tab_index'/>" size="8"> ~~- <span class="small">(<inp2:curr_PrimaryCurrencyISO />)</span>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="ap" field="MinPaymentAmount"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount"> + <td class="control-cell"> + <input type="text" name="<inp2:ap_InputName field='MinPaymentAmount' />" id="<inp2:ap_InputName field='MinPaymentAmount' />" value="<inp2:ap_Field name='MinPaymentAmount' />" tabindex="<inp2:m_get param='tab_index'/>" size="8"> + <span class="small">(<inp2:curr_PrimaryCurrencyISO />)</span> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_filler"/> </table> </div> Index: in-commerce/admin_templates/currencies/currencies_edit.tpl =================================================================== --- in-commerce/admin_templates/currencies/currencies_edit.tpl (revision 13919) +++ in-commerce/admin_templates/currencies/currencies_edit.tpl (working copy) @@ -59,29 +59,21 @@ <inp2:m_RenderElement name="inp_label" prefix="curr" field="CurrencyId" title="!la_fld_Id!"/> <inp2:m_RenderElement name="inp_label" prefix="curr" field="ISO" title="!la_fld_ISOCode!"/> ~~- <inp2:m_if check="curr_FieldVisible" field="RateToPrimary">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="RateToPrimary" title="!la_fld_RateToPrimary!" />~~ ~~- <td class="control-cell">~~ ~~- <input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">~~ ~~- <input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">~~ ~~- <span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="RateToPrimary"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="curr" field="RateToPrimary" title="la_fld_RateToPrimary"> + <td class="control-cell"> + <input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10"> + <input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>"> + <span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span> + </td> + </inp2:m_RenderElement> ~~- <inp2:m_if check="curr_FieldVisible" field="Symbol">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="Symbol" title="!la_fld_CurrencySymbol!"/>~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10"> ~~- <span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>~~ ~~- <inp2:curr_Error field="Symbol"/>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="Symbol"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="curr" field="Symbol" title="la_fld_CurrencySymbol"> + <td class="control-cell"> + <input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10"> + <span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span> + <inp2:curr_Error field="Symbol"/> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_radio" prefix="curr" field="SymbolPosition" title="!la_fld_CurrencySymbolPosition!"/> Index: in-commerce/admin_templates/discounts/coupon_edit.tpl =================================================================== --- in-commerce/admin_templates/discounts/coupon_edit.tpl (revision 13919) +++ in-commerce/admin_templates/discounts/coupon_edit.tpl (working copy) @@ -71,32 +71,6 @@ } </script> ~~-<inp2:m_DefineElement name="inp_edit_box_generate" is_last="0">~~ ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>"> ~~- <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ ~~-</inp2:m_DefineElement>~~ - ~~-<inp2:m_DefineElement name="inp_edit_box_comment" is_last="0">~~ ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>"> ~~- <inp2:m_Phrase label="la_comment_LeaveBlank" />~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ ~~-</inp2:m_DefineElement>~~ - <inp2:coup_SaveWarning name="grid_save_warning"/> <inp2:coup_ErrorWarning name="form_error_warning"/> @@ -106,8 +80,14 @@ <inp2:m_RenderElement name="inp_label" prefix="coup" field="CouponId" title="!la_fld_Id!"/> <inp2:m_RenderElement name="inp_edit_radio" prefix="coup" field="Status" title="!la_fld_Status!"/> <inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Name" title="!la_fld_Name!" size="35"/> ~~- <inp2:m_RenderElement name="inp_edit_box_generate" prefix="coup" field="Code" title="!la_fld_CouponCode!" size="35"/>~~ + <inp2:m_RenderElement design="form_row" prefix="coup" field="Code" title="la_fld_CouponCode" size="35"> + <td class="control-cell"> + <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>"> + <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" /> + </td> + </inp2:m_RenderElement> + <inp2:m_RenderElement name="inp_edit_date_time" prefix="coup" field="Expiration" title="!la_fld_Expiration!" size="10"/> <inp2:m_RenderElement name="inp_edit_options" prefix="coup" field="Type" title="!la_fld_Type!"/> @@ -116,7 +96,13 @@ <inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedBy" title="!la_fld_LastUsedBy!" size="15"/> <inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedOn" title="!la_fld_LastUsedOn!" size="10"/> ~~- <inp2:m_RenderElement name="inp_edit_box_comment" prefix="coup" field="NumberOfUses" title="!la_fld_NumberOfUses!" size="4"/>~~ + <inp2:m_RenderElement design="form_row" prefix="coup" field="NumberOfUses" title="la_fld_NumberOfUses" size="4"> + <td class="control-cell"> + <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>"> + <inp2:m_Phrase label="la_comment_LeaveBlank" /> + </td> + </inp2:m_RenderElement> + <inp2:m_RenderElement name="inp_edit_filler"/> </table> </div> Index: in-commerce/admin_templates/discounts/gift_certificate_edit.tpl =================================================================== --- in-commerce/admin_templates/discounts/gift_certificate_edit.tpl (revision 13919) +++ in-commerce/admin_templates/discounts/gift_certificate_edit.tpl (working copy) @@ -77,19 +77,6 @@ } </script> ~~-<inp2:m_DefineElement name="inp_edit_box_generate" class="" onblur="" maxlength="" is_last="0">~~ ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>"> ~~- <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ ~~-</inp2:m_DefineElement>~~ - <inp2:gc_SaveWarning name="grid_save_warning"/> <inp2:gc_ErrorWarning name="form_error_warning"/> @@ -152,7 +139,13 @@ <inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/> <inp2:m_else/> <inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/> ~~- <inp2:m_RenderElement name="inp_edit_box_generate" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>~~ + + <inp2:m_RenderElement design="form_row" prefix="gc" field="Code" title="la_fld_Code" size="35"> + <td class="control-cell"> + <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>"> + <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" /> + </td> + </inp2:m_RenderElement> </inp2:m_if> <inp2:m_if check="gc_IsNewItem" inverse="inverse"> Index: in-commerce/admin_templates/export.tpl =================================================================== --- in-commerce/admin_templates/export.tpl (revision 13919) +++ in-commerce/admin_templates/export.tpl (working copy) @@ -45,8 +45,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.export" field="ExportColumns" title="la_fld_ExportColumns"/>~~ + <inp2:m_RenderElement design="form_row" prefix="p.export" field="ExportColumns" title="la_fld_ExportColumns"> <td class="control-cell"> <table cellpadding="0" cellspacing="0" border="0"> <tr> @@ -78,11 +77,9 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="p.export" field="ExportColumns"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>~~ + <inp2:m_RenderElement design="form_row" prefix="p.export" field="CategoryFormat" title="la_fld_CategoryFormat"> <td class="control-cell"> <table cellspacing="0" cellpadding="0"> <tr> @@ -113,8 +110,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="p.export" field="CategoryFormat"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse"> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" /> Index: in-commerce/admin_templates/import.tpl =================================================================== --- in-commerce/admin_templates/import.tpl (revision 13919) +++ in-commerce/admin_templates/import.tpl (working copy) @@ -91,9 +91,7 @@ <div id="scroll_container"> <table class="edit-form"> <inp2:m_RenderElement name="subsection" title="!la_section_General!"/> - ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename"/>~~ + <inp2:m_RenderElement design="form_row" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename"> <td class="control-cell"> <table border="0"> <tr> @@ -124,8 +122,7 @@ </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="ImportSource"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/> <inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/> @@ -133,8 +130,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/> <inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns"/>~~ + <inp2:m_RenderElement design="form_row" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns"> <td class="control-cell"> <table cellpadding="0" cellspacing="0" border="0"> <tr> @@ -166,8 +162,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="ExportColumns"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement>  <inp2:m_DefineElement name="root_cat_caption"> @@ -178,22 +173,19 @@ <inp2:m_param name="separator"/><inp2:m_param name="cat_name"/> </inp2:m_DefineElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory"/>~~ + <inp2:m_RenderElement design="form_row" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory"> <td class="control-cell"> <b><inp2:p.import_CategoryPath separator=" > " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b> <input type="hidden" name="<inp2:p.import_InputName field='CategoryId'/>" value="<inp2:p.import_Field field='CategoryId' db='db'/>" /> <a href="javascript:openSelector('p.import', '<inp2:adm_SelectorLink prefix="p.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a> </td> ~~- <td class="error"><inp2:p.import_Error field="CategoryId"/> </td>~~ ~~- </tr>~~ + </inp2:m_RenderElement>  <inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" /> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>~~ + <inp2:m_RenderElement design="form_row" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"> <td class="control-cell"> <table cellspacing="0" cellpadding="0"> <tr> @@ -218,8 +210,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="CheckDuplicatesMethod"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_filler"/> </table> Index: in-commerce/admin_templates/orders/export/export.tpl =================================================================== --- in-commerce/admin_templates/orders/export/export.tpl (revision 13919) +++ in-commerce/admin_templates/orders/export/export.tpl (working copy) @@ -43,8 +43,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets"/>~~ + <inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets"> <td class="control-cell"> <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:ord.export_InputName field="ExportPresets"/>" id="<inp2:ord.export_InputName field="ExportPresets"/>" onchange="update_fields(this.value)"> <inp2:ord.export_PredefinedOptions field="ExportPresets" block="inp_option_item" selected="selected"/> @@ -52,10 +51,9 @@    <input class="button" type="button" value="<inp2:m_Phrase label="la_Text_Delete"/>" onclick="delete_preset()"> </td> ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns"/>~~ + <inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns"> <td class="control-cell"> <table cellpadding="0" cellspacing="0" border="0"> <tr> @@ -87,8 +85,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="ord.export" field="ExportColumns"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="ExportSavePreset" title="la_fld_ExportSavePreset" size="2" maxlength="1" onclick="update_preset_field(this.checked)"/> <inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="ExportPresetName" title="la_fld_ExportPresetName" size="20" /> @@ -113,7 +110,7 @@ $kf.elements['events[ord.export]'].value = tmp; Request.makeRequest('<inp2:m_t ajax="1" ord.export_event="OnDeleteExportPreset" js_escape="1" no_amp="1"/>', delete_busy, '', function() { presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>'); - + for (i=0; i< presets.options.length; i++) { if (presets.options[i].selected) { presets.options.remove[i]; Index: in-commerce/admin_templates/orders/orders_edit.tpl =================================================================== --- in-commerce/admin_templates/orders/orders_edit.tpl (revision 13919) +++ in-commerce/admin_templates/orders/orders_edit.tpl (working copy) @@ -65,17 +65,13 @@ <inp2:m_RenderElement name="inp_id_label" prefix="ord" field="OrderId" title="!la_fld_OrderId!"/> <inp2:m_if check="ord_OrderEditable"> ~~- <inp2:m_if check="ord_FieldVisible" field="Number">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text"> ~~- -<inp2:m_inc param="tab_index" by="1"/>~~ - <input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text"> ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber"> + <td class="control-cell"> + <input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text"> + -<inp2:m_inc param="tab_index" by="1"/> + <input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text"> + </td> + </inp2:m_RenderElement> <inp2:m_if check="m_IsDebugMode" > <inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="!la_fld_Status!"/> @@ -101,15 +97,11 @@ <inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/> <inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/> <inp2:m_else/> ~~- <inp2:m_if check="ord_FieldVisible" field="Number">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:ord_Field field="OrderNumber"/>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber"> + <td class="control-cell"> + <inp2:ord_Field field="OrderNumber"/> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/> <inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="!la_fld_Date!"/> Index: in-commerce/admin_templates/orders/orders_edit_billing.tpl =================================================================== --- in-commerce/admin_templates/orders/orders_edit_billing.tpl (revision 13919) +++ in-commerce/admin_templates/orders/orders_edit_billing.tpl (working copy) @@ -72,14 +72,12 @@ </script> <inp2:m_DefineElement name="inp_gwresults" is_last="" as_label="" currency="" is_last=""> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> <td class="control-cell"> <inp2:m_if check="m_Param" name="display_field"><inp2:m_Param name="display_field"/>: <inp2:Field name="$field" format="$display_field"/></inp2:m_if> <a href="javascript:OpenGWResults('<inp2:m_param name="field"/>')"><inp2:m_Phrase label="la_Details"/></a> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> </inp2:m_DefineElement> <inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/> @@ -115,17 +113,13 @@ <inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!" size="20"/> <inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!" size="20"/> ~~- <inp2:m_if check="ord_FieldVisible" field="PaymentCCExpDate">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>~~ ~~- <td class="control-cell">~~ - <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>"> ~~- /~~ - <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpYear"/>" id="<inp2:ord_InputName field="PaymentCCExpYear"/>" value="<inp2:ord_Field field="PaymentCCExpYear"/>"> ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="PaymentCCExpDate"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate"> + <td class="control-cell"> + <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>"> + / + <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpYear"/>" id="<inp2:ord_InputName field="PaymentCCExpYear"/>" value="<inp2:ord_Field field="PaymentCCExpYear"/>"> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!" size="5" maxlength="5"/> <inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!" size="16"/> @@ -167,15 +161,11 @@ <inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!"/> <inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!"/> ~~- <inp2:m_if check="ord_FieldVisible" field="PaymentCCExpDate">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="PaymentCCExpDate"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate"> + <td class="control-cell"> + <inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!"/> <inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!"/> Index: in-commerce/admin_templates/orders/orders_edit_shipping.tpl =================================================================== --- in-commerce/admin_templates/orders/orders_edit_shipping.tpl (revision 13919) +++ in-commerce/admin_templates/orders/orders_edit_shipping.tpl (working copy) @@ -216,8 +216,7 @@ <inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/> <inp2:m_DefineElement name="inp_shipping_label" is_last="" as_label="" currency="" is_last=""> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>~~ + <inp2:m_RenderElement design="form_row" pass_params="1"> <td valign="top" class="control-cell"> <inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/> @@ -225,7 +224,7 @@    <a href="#" onClick="javascript:submit_event('<inp2:m_Param name="prefix"/>', 'OnDownloadLabel'); return false;"><inp2:m_Phrase label="la_ViewLabel"/></a> </inp2:m_if> </td> ~~- </tr>~~ + </inp2:m_RenderElement> </inp2:m_DefineElement> <inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/> Index: in-commerce/admin_templates/products/products_inventory.tpl =================================================================== --- in-commerce/admin_templates/products/products_inventory.tpl (revision 13919) +++ in-commerce/admin_templates/products/products_inventory.tpl (working copy) @@ -73,23 +73,6 @@ </tbody> </table> ~~-~~ ~~-<inp2:m_DefineElement name="inp_edit_inventory">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" />  ~~- <input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')"> ~~ ~~- <input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')"> ~~ ~~- <input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')"> ~~ ~~- <input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')"> ~~ ~~- <input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')"> ~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~-</inp2:m_DefineElement>~~ ~~-~~ - <inp2:m_ifnot check="p_Field" name="InventoryStatus" equals_to="2" db="db"> <inp2:p_SaveWarning name="grid_save_warning"/> </inp2:m_ifnot> @@ -109,7 +92,17 @@ <inp2:m_RenderElement name="inp_label" prefix="p" field="QtyOnOrder" title="!la_fld_QtyOnOrder!"/> </inp2:m_ifnot> ~~- <inp2:m_RenderElement name="inp_edit_inventory" prefix="p" field="Qty" title="!la_fld_Qty!" size="3"/>~~ + <inp2:m_RenderElement design="form_row" prefix="p" field="Qty" title="la_fld_Qty" size="3"> + <td class="control-cell"> + <input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" />  + <input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">  + <input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">  + <input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">  + <input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">  + <input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">  + </td> + </inp2:m_RenderElement> + <inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="InventoryComment" title="!la_fld_Comment!" cols="40" rows="3"/> <inp2:m_RenderElement name="inp_edit_filler"/> </table> Index: in-commerce/admin_templates/shipping/shipping_costs.tpl =================================================================== --- in-commerce/admin_templates/shipping/shipping_costs.tpl (revision 13919) +++ in-commerce/admin_templates/shipping/shipping_costs.tpl (working copy) @@ -94,28 +94,6 @@ </tbody> </table> ~~-<inp2:m_DefineElement name="precision_field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field_name="$field" title="$title"/>~~ ~~- <td class="control-cell">~~ ~~- <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>">~~ ~~- <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >~~ ~~- <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_phrase" selected="selected"/>~~ ~~- <inp2:m_else/>~~ ~~- <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_item" selected="selected"/>~~ ~~- </inp2:m_if>~~ ~~- </select> , <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>">~~ ~~- <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >~~ ~~- <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_phrase" selected="selected"/>~~ ~~- <inp2:m_else/>~~ ~~- <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_item" selected="selected"/>~~ ~~- </inp2:m_if>~~ ~~- </select>~~ ~~- </td>~~ ~~- </tr>~~ ~~-</inp2:m_DefineElement>~~ - - <inp2:m_DefineElement name="row_header"> <td> <input type="checkbox" name="<inp2:{$prefix}_InputName field="$IdField"/>" id="<inp2:{$prefix}_InputName field="$IdField"/>" value="<inp2:{$prefix}_field field="$IdField"/>" onclick="reflect_toolbar('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>, '<inp2:m_param name="IdField"/>')"> @@ -174,7 +152,25 @@ <inp2:m_RenderElement name="subsection" title="!la_section_General!"/> <inp2:m_RenderElement name="inp_edit_options" prefix="s" field="CostType" title="!la_fld_CostType!"/> <inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="ZeroIfEmpty" title="!la_fld_EmptyCellsAre!" size="20"/> ~~- <inp2:m_RenderElement name="precision_field" prefix="s" title="!la_Precision!"/>~~ + + <inp2:m_RenderElement design="form_row" prefix="s" field="PrecisionBeforeSep" title="la_Precision"> + <td class="control-cell"> + <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>"> + <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" > + <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_phrase" selected="selected"/> + <inp2:m_else/> + <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_item" selected="selected"/> + </inp2:m_if> + </select> , <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>"> + <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" > + <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_phrase" selected="selected"/> + <inp2:m_else/> + <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_item" selected="selected"/> + </inp2:m_if> + </select> + </td> + </inp2:m_RenderElement> + <inp2:m_RenderElement name="inp_edit_filler"/> </table> </div> Index: in-commerce/admin_templates/shipping/shipping_quote_engine_edit.tpl =================================================================== --- in-commerce/admin_templates/shipping/shipping_quote_engine_edit.tpl (revision 13919) +++ in-commerce/admin_templates/shipping/shipping_quote_engine_edit.tpl (working copy) @@ -79,15 +79,11 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="Status" title="!la_fld_Enabled!"/> <inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="AccountLogin" title="!la_fld_Login!" /> ~~- <inp2:m_if check="sqe_FieldVisible" field="AccountPassword">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="sqe" field="AccountPassword" title="!la_fld_Password!" />~~ ~~- <td class="control-cell">~~ ~~- <input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="sqe" field="AccountPassword"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="sqe" field="AccountPassword" title="la_fld_Password"> + <td class="control-cell"> + <input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value=""> + </td> + </inp2:m_RenderElement> <inp2:m_if check="sqe_Field" field="ClassName" equals_to="Intershipper" db="db"> <inp2:m_RenderElement name="subsection" title="!la_Text_Carriers!"/> Index: in-link/admin_templates/export.tpl =================================================================== --- in-link/admin_templates/export.tpl (revision 13919) +++ in-link/admin_templates/export.tpl (working copy) @@ -43,8 +43,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.export" field="ExportColumns" title="la_fld_ExportColumns"/>~~ + <inp2:m_RenderElement design="form_row" prefix="l.export" field="ExportColumns" title="la_fld_ExportColumns"> <td class="control-cell"> <table cellpadding="0" cellspacing="0" border="0"> <tr> @@ -76,11 +75,9 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="l.export" field="ExportColumns"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>~~ + <inp2:m_RenderElement design="form_row" prefix="l.export" field="CategoryFormat" title="la_fld_CategoryFormat"> <td class="control-cell"> <table cellspacing="0" cellpadding="0"> <tr> @@ -111,8 +108,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="l.export" field="CategoryFormat"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse"> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" /> Index: in-link/admin_templates/import.tpl =================================================================== --- in-link/admin_templates/import.tpl (revision 13919) +++ in-link/admin_templates/import.tpl (working copy) @@ -90,8 +90,7 @@ <div id="scroll_container"> <table class="edit-form"> <inp2:m_RenderElement name="subsection" title="!la_section_General!"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename"/>~~ + <inp2:m_RenderElement design="form_row" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename"> <td class="control-cell"> <table border="0"> <tr> @@ -122,8 +121,7 @@ </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="ImportSource"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/> <inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/> @@ -131,8 +129,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/> <inp2:m_RenderElement name="inp_edit_radio" prefix="l.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="ExportColumns" title="la_fld_ImportColumns"/>~~ + <inp2:m_RenderElement design="form_row" prefix="l.import" field="ExportColumns" title="la_fld_ImportColumns"> <td class="control-cell"> <table cellpadding="0" cellspacing="0" border="0"> <tr> @@ -164,8 +161,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="ExportColumns"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement>  <inp2:m_DefineElement name="root_cat_caption"> @@ -176,22 +172,19 @@ <inp2:m_param name="separator"/><inp2:m_param name="cat_name"/> </inp2:m_DefineElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="CategoryId" title="la_fld_ImportCategory"/>~~ + <inp2:m_RenderElement design="form_row" prefix="l.import" field="CategoryId" title="la_fld_ImportCategory"> <td class="control-cell"> <b><inp2:l.import_CategoryPath separator=" > " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b> <input type="hidden" name="<inp2:l.import_InputName field='CategoryId'/>" value="<inp2:l.import_Field field='CategoryId' db='db'/>" /> <a href="javascript:openSelector('l.import', '<inp2:adm_SelectorLink prefix="l.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="CategoryId"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement>  <inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" /> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>~~ + <inp2:m_RenderElement design="form_row" prefix="l.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"> <td class="control-cell"> <table cellspacing="0" cellpadding="0"> <tr> @@ -216,8 +209,8 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="CheckDuplicatesMethod"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> + <inp2:m_RenderElement name="inp_edit_filler"/> </table> </div> Index: in-link/admin_templates/links/links_edit.tpl =================================================================== --- in-link/admin_templates/links/links_edit.tpl (revision 13919) +++ in-link/admin_templates/links/links_edit.tpl (working copy) @@ -74,17 +74,11 @@ <inp2:m_RenderElement name="subsection" prefix="l" fields="Status,NewItem,HotItem,PopItem,EditorPick,PriorityCreatedOn,Expire,MetaKeywords,MetaDescription" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/> <inp2:m_if check="l_DisplayOriginal" display_original="1"> ~~- <inp2:m_if check="l_FieldVisible" field="Status">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="l" field="Status" title="!la_fld_Status!"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:m_Phrase label="la_UseGridToApproveDecline" />~~ ~~- </td>~~ ~~- <td>~~ ~~-  ~~ ~~- </td>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="l" field="Status" title="la_fld_Status"> + <td class="control-cell"> + <inp2:m_Phrase label="la_UseGridToApproveDecline" /> + </td> + </inp2:m_RenderElement> <inp2:m_else/> <inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="Status" title="!la_fld_Status!" display_original="1"/> </inp2:m_if> Index: in-link/admin_templates/paid_listings/paid_listing_edit.tpl =================================================================== --- in-link/admin_templates/paid_listings/paid_listing_edit.tpl (revision 13919) +++ in-link/admin_templates/paid_listings/paid_listing_edit.tpl (working copy) @@ -61,16 +61,12 @@ <inp2:m_RenderElement name="inp_edit_options" prefix="ls" field="ListingTypeId" title="la_fld_ListingType" onchange="set_exp_date()" /> ~~- <inp2:m_if check="ls_FieldVisible" field="LinkName">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ls" field="LinkName" title="la_fld_LinkName"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:ls_Field name="LinkName" />~~ ~~- <a href="javascript:select_link();"><img src="<inp2:m_TemplatesBase module='in-link'/>/img/link_arrow.gif" border="0"></a>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="ls" field="LinkNam"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="ls" field="LinkName" title="la_fld_LinkName"> + <td class="control-cell"> + <inp2:ls_Field name="LinkName" /> + <a href="javascript:select_link();"><img src="<inp2:m_TemplatesBase module='in-link'/>/img/link_arrow.gif" border="0"></a> + </td> + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_radio" prefix="ls" field="Status" title="la_fld_Status"/> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="ls" field="PendingRenewal" title="la_fld_PendingRenewal"/> Index: in-link/admin_templates/paid_listings/paid_listing_type_edit.tpl =================================================================== --- in-link/admin_templates/paid_listings/paid_listing_type_edit.tpl (revision 13919) +++ in-link/admin_templates/paid_listings/paid_listing_type_edit.tpl (working copy) @@ -62,29 +62,21 @@ <inp2:m_RenderElement name="inp_edit_textarea" prefix="lst" field="Description" title="la_fld_ListingTypeDescription" rows="10" cols="40"/> ~~- <inp2:m_if check="lst_FieldVisible" field="Duration">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="lst" field="Duration" title="la_fld_Duration" />~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:lst_InputName field="Duration" />" id="<inp2:lst_InputName field="Duration" />" value="<inp2:lst_Field name="Duration" />" tabindex="<inp2:m_get param="tab_index"/>" size="5"> ~~- <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lst_InputName field="DurationType"/>" id="<inp2:lst_InputName field="DurationType"/>">~~ ~~- <inp2:lst_PredefinedOptions field="DurationType" block="inp_option_phrase" selected="selected" prefix="lst" />~~ ~~- </select>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="lst" field="Duration"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="lst" field="Duration" title="la_fld_Duration"> + <td class="control-cell"> + <input type="text" name="<inp2:lst_InputName field="Duration" />" id="<inp2:lst_InputName field="Duration" />" value="<inp2:lst_Field name="Duration" />" tabindex="<inp2:m_get param="tab_index"/>" size="5"> + <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lst_InputName field="DurationType"/>" id="<inp2:lst_InputName field="DurationType"/>"> + <inp2:lst_PredefinedOptions field="DurationType" block="inp_option_phrase" selected="selected" prefix="lst" /> + </select> + </td> + </inp2:m_RenderElement> ~~- <inp2:m_if check="lst_FieldVisible" field="RenewalReminder">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="lst" field="RenewalReminder" title="la_fld_RenewalReminder" />~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:lst_InputName field="RenewalReminder"/>" id="<inp2:lst_InputName field="RenewalReminder" />" value="<inp2:lst_Field field="RenewalReminder" />" tabindex="<inp2:m_get param="tab_index"/>" size="5"> ~~- <inp2:m_Phrase label="la_days" />~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="lst" field="RenewalReminder"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="lst" field="RenewalReminder" title="la_fld_RenewalReminder"> + <td class="control-cell"> + <input type="text" name="<inp2:lst_InputName field="RenewalReminder"/>" id="<inp2:lst_InputName field="RenewalReminder" />" value="<inp2:lst_Field field="RenewalReminder" />" tabindex="<inp2:m_get param="tab_index"/>" size="5"> + <inp2:m_Phrase label="la_days" /> + </td> + </inp2:m_RenderElement> <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>"> <inp2:m_inc param="tab_index" by="1"/> Index: in-news/admin_templates/articles/articles_edit.tpl =================================================================== --- in-news/admin_templates/articles/articles_edit.tpl (revision 13919) +++ in-news/admin_templates/articles/articles_edit.tpl (working copy) @@ -68,23 +68,15 @@ <inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="!la_fld_Body!" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>  ~~- <inp2:m_if check="n_FieldVisible" field="Excerpt">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Excerpt" title="la_fld_Excerpt"/>~~ ~~- <td class="control-cell">~~ - <textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br /> ~~- <script type="text/javascript">~~ ~~- Form.addControl('<inp2:n_InputName field="Excerpt"/>', {min_height: 100});~~ ~~- </script>~~ ~~- <input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="n" field="Excerpt"/>~~ - ~~- <inp2:m_if check="n_DisplayOriginal" pass_params="1">~~ ~~- <inp2:m_RenderElement prefix="n" field="Excerpt" name="inp_original_label"/>~~ ~~- </inp2:m_if>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" title="la_fld_Excerpt"> + <td class="control-cell"> + <textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br /> + <script type="text/javascript"> + Form.addControl('<inp2:n_InputName field="Excerpt"/>', {min_height: 100}); + </script> + <input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label> + </td> + </inp2:m_RenderElement>  <inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/> @@ -92,14 +84,11 @@ <inp2:m_RenderElement name="inp_edit_options" prefix="n" field="CategoryId" title="la_fld_ParentSection" display_original="1"/> <inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/> <inp2:m_if check="n_DisplayOriginal" display_original="1"> ~~- <inp2:m_if check="n_FieldVisible" field="Status">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Status" title="!la_fld_Status!"/>~~ ~~- <td class="control-cell">~~ ~~- <inp2:m_Phrase label="la_UseGridToApproveDecline" />~~ ~~- </td>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <inp2:m_RenderElement design="form_row" prefix="n" field="Status" title="la_fld_Status"> + <td class="control-cell"> + <inp2:m_Phrase label="la_UseGridToApproveDecline" /> + </td> + </inp2:m_RenderElement> <inp2:m_else/> <inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="!la_fld_Status!" display_original="1"/> </inp2:m_if> Index: in-news/admin_templates/category_properties.tpl =================================================================== --- in-news/admin_templates/category_properties.tpl (revision 13919) +++ in-news/admin_templates/category_properties.tpl (working copy) @@ -1,23 +1,19 @@ <inp2:m_RenderElement name="subsection" title="la_In-news"/> <inp2:m_DefineElement name="inp_edit_type" class="" is_last="" maxlength="" onblur="" size="" is_last="" has_empty="0" empty_value="" onchange="" hint_label="" type_field=""> ~~- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">~~ ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>~~ ~~- <td class="control-cell">~~ - <input type="text" name="<inp2:{$prefix}_InputName field="$field" />" id="<inp2:{$prefix}_InputName field="$field" />" value="<inp2:{$prefix}_Field field="$field" />" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>"> + <inp2:m_RenderElement design="form_row" pass_params="1"> + <td class="control-cell"> + <input type="text" name="<inp2:{$prefix}_InputName field="$field" />" id="<inp2:{$prefix}_InputName field="$field" />" value="<inp2:{$prefix}_Field field="$field" />" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>"> - <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>"> ~~- <inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">~~ ~~- <inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>~~ ~~- <inp2:m_else/>~~ ~~- <inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>~~ ~~- </inp2:m_if>~~ ~~- </select>~~ ~~- </td>~~ ~~- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>~~ ~~- </tr>~~ ~~- </inp2:m_if>~~ + <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>"> + <inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases"> + <inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/> + <inp2:m_else/> + <inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/> + </inp2:m_if> + </select> + </td> + </inp2:m_RenderElement> </inp2:m_DefineElement> <inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="!la_fld_cust_n_ItemTemplate!" size="50"/> Index: in-news/admin_templates/export.tpl =================================================================== --- in-news/admin_templates/export.tpl (revision 13919) +++ in-news/admin_templates/export.tpl (working copy) @@ -44,8 +44,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.export" field="ExportColumns" title="la_fld_ExportColumns"/>~~ + <inp2:m_RenderElement design="form_row" prefix="n.export" field="ExportColumns" title="la_fld_ExportColumns"> <td class="control-cell"> <table cellpadding="0" cellspacing="0" border="0"> <tr> @@ -77,11 +76,9 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="n.export" field="ExportColumns"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>~~ + <inp2:m_RenderElement design="form_row" prefix="n.export" field="CategoryFormat" title="la_fld_CategoryFormat"> <td class="control-cell"> <table cellspacing="0" cellpadding="0"> <tr> @@ -112,8 +109,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="n.export" field="CategoryFormat"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse"> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" /> Index: in-news/admin_templates/import.tpl =================================================================== --- in-news/admin_templates/import.tpl (revision 13919) +++ in-news/admin_templates/import.tpl (working copy) @@ -91,9 +91,7 @@ <div id="scroll_container"> <table class="edit-form"> <inp2:m_RenderElement name="subsection" title="!la_section_General!"/> - ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="ImportSource" title="la_fld_ImportFilename"/>~~ + <inp2:m_RenderElement design="form_row" prefix="n.import" field="ImportSource" title="la_fld_ImportFilename"> <td class="control-cell"> <table border="0"> <tr> @@ -124,8 +122,7 @@ </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="ImportSource"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/> <inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/> @@ -133,8 +130,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/> <inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="ExportColumns" title="la_fld_ImportColumns"/>~~ + <inp2:m_RenderElement design="form_row" prefix="n.import" field="ExportColumns" title="la_fld_ImportColumns"> <td class="control-cell"> <table cellpadding="0" cellspacing="0" border="0"> <tr> @@ -166,8 +162,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="ExportColumns"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement>  <inp2:m_DefineElement name="root_cat_caption"> @@ -178,22 +173,19 @@ <inp2:m_param name="separator"/><inp2:m_param name="cat_name"/> </inp2:m_DefineElement> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="CategoryId" title="la_fld_ImportCategory"/>~~ + <inp2:m_RenderElement design="form_row" prefix="n.import" field="CategoryId" title="la_fld_ImportCategory"> <td class="control-cell"> <b><inp2:n.import_CategoryPath separator=" > " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b> <input type="hidden" name="<inp2:n.import_InputName field='CategoryId'/>" value="<inp2:n.import_Field field='CategoryId' db='db'/>" /> <a href="javascript:openSelector('n.import', '<inp2:adm_SelectorLink prefix="n.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="CategoryId"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement>  <inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" /> ~~- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">~~ ~~- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="n.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>~~ + <inp2:m_RenderElement design="form_row" prefix="n.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"> <td class="control-cell"> <table cellspacing="0" cellpadding="0"> <tr> @@ -218,8 +210,7 @@ </tr> </table> </td> ~~- <inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="CheckDuplicatesMethod"/>~~ ~~- </tr>~~ + </inp2:m_RenderElement> <inp2:m_RenderElement name="inp_edit_filler"/> </table>

Issue History
Date Modified	Username	Field	Change
2010-11-30 12:48	Dmitry	Note Added: 0003032
2010-11-30 12:48	Dmitry	Status	resolved => closed
2010-09-14 04:48	alex	Changeset attached	5.1.x r13942
2010-09-14 04:48	alex	Note Added: 0002829
2010-09-14 04:47	alex	File Added: fatal_error_on_submission_log_message_view.patch
2010-09-10 02:48	alex	Note Added: 0002800
2010-09-10 02:48	alex	Status	reviewed and tested => resolved
2010-09-10 02:48	alex	Fixed in Version	=> 5.1.1-B1
2010-09-10 02:48	alex	Resolution	open => fixed
2010-09-10 02:48	alex	Changeset attached	5.1.x r13926
2010-09-10 02:46	alex	Changeset attached	5.1.x r13925
2010-09-10 02:44	alex	Changeset attached	5.1.x r13924
2010-09-10 02:44	alex	Changeset attached	5.1.x r13923
2010-09-10 02:42	alex	Changeset attached	5.1.x r13922
2010-09-09 11:18	Dmitry	Note Added: 0002797
2010-09-09 11:18	Dmitry	Assigned To	!COMMUNITY => alex
2010-09-09 11:18	Dmitry	Status	needs testing => reviewed and tested
2010-09-08 12:54	alex	Note Added: 0002792
2010-09-08 12:54	alex	Assigned To	=> !COMMUNITY
2010-09-08 12:54	alex	Developer	=> alex
2010-09-08 12:54	alex	Status	active => needs testing
2010-09-08 12:54	alex	Reference	=> http://groups.google.com/group/in-portal-bugs/browse_thread/thread/36cebd5460eab846
2010-09-08 12:50	alex	Relationship added	child of 0000853
2010-09-08 12:46	alex	File Added: custom_blocks_not_using_form_block_design_modules.patch
2010-09-08 12:46	alex	New Issue
2010-09-08 12:46	alex	File Added: custom_blocks_not_using_form_block_design_core.patch

Notes
(0002792) alex (manager) 2010-09-08 12:54	Please visit all templates, affected by the patch.

(0002797) Dmitry (manager) 2010-09-09 11:18	Tested all templates good, please commit.

(0002800) alex (manager) 2010-09-10 02:48	Fix committed to 5.1.x branch. Commit Message: Fixes 0000857: Customized form blocks were not using "form_row" design resulting fatal error

(0002829) alex (manager) 2010-09-14 04:48	Patch "fatal_error_on_submission_log_message_view.patch" (already commited) fixes fatal error on submission log message view screen, when message was containing an attachment. Is seems, that that screen wasn't tested by developer and by tester.

(0003032) Dmitry (manager) 2010-11-30 12:48	Closing released 5.1.1 task.

Related Changesets
In-Portal CMS: 5.1.x r13942 Timestamp: 2010-09-14 04:46:43 Author: alex [ Details ] [ Diff ]	Bug 0000857: Customized form blocks were not using "form_row" design resulting fatal error
	mod - /in-portal/branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl	[ Diff ] [ File ]

In-Portal CMS: 5.1.x r13926 Timestamp: 2010-09-10 02:48:14 Author: alex [ Details ] [ Diff ]	Fixes 0000857: Customized form blocks were not using "form_row" design resulting fatal error
	mod - /in-portal/branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/regional/languages_export.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/site_domains/site_domain_edit.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/stylesheets/style_editor.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	[ Diff ] [ File ]

Modules :: In-News: 5.1.x r13925 Timestamp: 2010-09-10 02:46:49 Author: alex [ Details ] [ Diff ]	Bug 0000857: Customized form blocks were not using "form_row" design resulting fatal error
	mod - /modules/in-news/branches/5.1.x/admin_templates/articles/articles_edit.tpl	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.1.x/admin_templates/category_properties.tpl	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.1.x/admin_templates/export.tpl	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.1.x/admin_templates/import.tpl	[ Diff ] [ File ]

Modules :: In-Link: 5.1.x r13924 Timestamp: 2010-09-10 02:44:48 Author: alex [ Details ] [ Diff ]	Bug 0000857: Customized form blocks were not using "form_row" design resulting fatal error
	mod - /modules/in-link/branches/5.1.x/admin_templates/export.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/import.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/links/links_edit.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/paid_listings/paid_listing_edit.tpl	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.1.x/admin_templates/paid_listings/paid_listing_type_edit.tpl	[ Diff ] [ File ]

Modules :: In-Commerce: 5.1.x r13923 Timestamp: 2010-09-10 02:44:01 Author: alex [ Details ] [ Diff ]	Bug 0000857: Customized form blocks were not using "form_row" design resulting fatal error
	mod - /w/in-commerce/branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/currencies/currencies_edit.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/discounts/coupon_edit.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/export.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/import.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/orders/export/export.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/orders/orders_edit.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/products/products_inventory.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/shipping/shipping_costs.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl	[ Diff ] [ File ]

In-Portal Issue Tracker