Attached Files |
form_message_core.patch [^] (4,987 bytes) 2010-06-25 13:49
[Show Content]
Index: admin_templates/categories/categories_tabs.tpl
===================================================================
--- admin_templates/categories/categories_tabs.tpl (revision 13756)
+++ admin_templates/categories/categories_tabs.tpl (working copy)
@@ -1,5 +1,5 @@
<inp2:m_DefineElement name="grid_save_warning">
- <table id="save_warning" width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table"<inp2:m_ifnot check="m_Param" name="display"> style="display: none;"</inp2:_ifnot>>
+ <table id="save_warning" width="100%" cellspacing="0" cellpadding="4" class="warning-table"<inp2:m_ifnot check="m_Param" name="display"> style="display: none;"</inp2:_ifnot>>
<tr>
<td valign="top" class="form-warning">
<inp2:m_phrase name="la_Warning_Save_Item"/>
Index: admin_templates/incs/form_blocks.tpl
===================================================================
--- admin_templates/incs/form_blocks.tpl (revision 13756)
+++ admin_templates/incs/form_blocks.tpl (working copy)
@@ -97,6 +97,16 @@
</inp2:m_if>
</inp2:m_DefineElement>
+<inp2:m_DefineElement name="form_message" id="">
+ <table width="100%" cellspacing="0" cellpadding="4" class="warning-table"<inp2:m_if check="m_Param" name="id"> id="<inp2:m_Param name='id'/>"</inp2:m_if>>
+ <tr>
+ <td valign="top" class="form-warning">
+ <inp2:m_Param name="content"/>
+ </td>
+ </tr>
+ </table>
+</inp2:m_DefineElement>
+
<inp2:m_DefineElement name="default_field_caption_element">
<label for="<inp2:m_param name='NamePrefix'/><inp2:{$prefix}_InputName field='$field'/>">
<span class="<inp2:m_if check='{$prefix}_HasError' field='$field'>error-cell</inp2:m_if>"><inp2:m_phrase label="$title"/></span></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:<inp2:m_if check="m_Param" name="hint_label"><span> <img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:m_Phrase label='$hint_label' html_escape='1'/>" alt="<inp2:m_Phrase label='$hint_label' html_escape='1'/>"/></inp2:m_if>
@@ -1065,12 +1075,8 @@
</inp2:m_DefineElement>
<inp2:m_DefineElement name="form_error_warning">
- <table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
- <tr>
- <td valign="top" class="form-warning">
- <inp2:m_phrase name="la_Warning_NewFormError"/><br/>
- <span id="error_msg_<inp2:m_Param name='prefix'/>" style="font-weight: bold"><br/></span>
- </td>
- </tr>
- </table>
+ <inp2:m_RenderElement design="form_message" pass_params="1">
+ <inp2:m_Phrase name="la_Warning_NewFormError"/><br/>
+ <span id="error_msg_<inp2:m_Param name='prefix'/>" style="font-weight: bold;"><br/></span>
+ </inp2:m_RenderElement>
</inp2:m_DefineElement>
Index: admin_templates/incs/grid_blocks.tpl
===================================================================
--- admin_templates/incs/grid_blocks.tpl (revision 13756)
+++ admin_templates/incs/grid_blocks.tpl (working copy)
@@ -500,13 +500,10 @@
<inp2:m_include template="incs/menu_blocks"/>
<inp2:m_DefineElement name="grid_save_warning">
- <table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
- <tr>
- <td valign="top" class="form-warning">
- <inp2:m_phrase name="la_Warning_Save_Item"/>
- </td>
- </tr>
- </table>
+ <inp2:m_RenderElement design="form_message" pass_params="1">
+ <inp2:m_phrase name="la_Warning_Save_Item"/>
+ </inp2:m_RenderElement>
+
<script type="text/javascript">
$edit_mode = <inp2:m_if check="m_ParamEquals" name="edit_mode" value="1">true<inp2:m_else />false</inp2:m_if>;
if (Form) Form.Changed();
@@ -622,13 +619,9 @@
<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" pass_params="1"/>
<inp2:m_if check="{$PrefixSpecial}_SearchActive" grid="$grid">
- <table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
- <tr>
- <td valign="top" class="form-warning">
- <inp2:m_phrase name="la_Warning_Filter"/>
- </td>
- </tr>
- </table>
+ <inp2:m_RenderElement design="form_message" pass_params="1">
+ <inp2:m_phrase name="la_Warning_Filter"/>
+ </inp2:m_RenderElement>
</inp2:m_if>
<div id="grid_<inp2:m_Param name='PrefixSpecial'/>_container"></div>
@@ -799,13 +792,9 @@
<inp2:{$PrefixSpecial}_SaveWarning name="grid_save_warning" main_prefix="$main_prefix"/>
<inp2:m_if check="{$PrefixSpecial}_SearchActive" grid="$grid">
- <table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table" >
- <tr>
- <td valign="top" class="hint_red">
- <inp2:m_phrase name="la_Warning_Filter"/>
- </td>
- </tr>
- </table>
+ <inp2:m_RenderElement design="form_message" pass_params="1">
+ <inp2:m_phrase name="la_Warning_Filter"/>
+ </inp2:m_RenderElement>
</inp2:m_if>
<inp2:m_if check="m_ParamEquals" name="per_page" value="-1" inverse="1">
form_message_modules.patch [^] (3,096 bytes) 2010-06-25 13:50
[Show Content]
Index: in-commerce/admin_templates/orders/order_product_edit.tpl
===================================================================
--- in-commerce/admin_templates/orders/order_product_edit.tpl (revision 13756)
+++ in-commerce/admin_templates/orders/order_product_edit.tpl (working copy)
@@ -57,13 +57,9 @@
<input type="hidden" name="p_id" value="<inp2:p_Field name='ProductId'/>">
<inp2:m_if check="p_OptionsHaveError">
- <table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
- <tr>
- <td valign="top" class="hint_red">
- <inp2:p_OptionsError required="lu_comm_OptionsRequired" not_available="lu_comm_OptionsNotAvailable"/>
- </td>
- </tr>
- </table>
+ <inp2:m_RenderElement design="form_message" pass_params="1">
+ <inp2:p_OptionsError required="lu_comm_OptionsRequired" not_available="lu_comm_OptionsNotAvailable"/>
+ </inp2:m_RenderElement>
</inp2:m_if>
<inp2:m_if check="p_FieldEquals" field="OptionsSelectionMode" value="1"> <!-- Listable options (combinations) -->
Index: in-commerce/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_shipping.tpl (revision 13756)
+++ in-commerce/admin_templates/orders/orders_edit_shipping.tpl (working copy)
@@ -70,14 +70,10 @@
<inp2:ord_SaveWarning name="grid_save_warning"/>
<inp2:m_if check="m_Recall" name="usps_errors">
- <table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
- <tr>
- <td valign="top" class="form-warning">
- <inp2:m_Recall name="usps_errors" />
- <inp2:m_RemoveVar name="usps_errors"/>
- </td>
- </tr>
- </table>
+ <inp2:m_RenderElement design="form_message" pass_params="1">
+ <inp2:m_Recall name="usps_errors" />
+ <inp2:m_RemoveVar name="usps_errors"/>
+ </inp2:m_RenderElement>
</inp2:m_if>
<inp2:ord_ErrorWarning name="form_error_warning"/>
Index: in-commerce/admin_templates/orders/orders_toship_list.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_toship_list.tpl (revision 13756)
+++ in-commerce/admin_templates/orders/orders_toship_list.tpl (working copy)
@@ -63,16 +63,12 @@
</table>
<inp2:m_DefineElement name="usps_errors">
- <table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
- <tr>
- <td valign="top" class="form-warning">
- Order: <inp2:m_Param name="order_number"/>. USPS error: <inp2:m_Param name="error_description"/>
- </td>
- </tr>
- </table>
+ Order: <inp2:m_Param name="order_number"/>. USPS error: <inp2:m_Param name="error_description"/><br/>
</inp2:m_DefineElement>
-<inp2:ord_PrintUSPSErrors render_as="usps_errors" />
+<inp2:m_RenderElement design="form_message" pass_params="1">
+ <inp2:ord_PrintUSPSErrors render_as="usps_errors" />
+</inp2:m_RenderElement>
<inp2:m_RenderElement name="grid" PrefixSpecial="ord.toship" IdField="OrderId" grid="Default"/>
<script type="text/javascript">
|