Attached Files |
phrase_storage_automation_core.patch [^] (184,220 bytes) 2011-08-09 12:29
[Show Content]
Index: admin_templates/categories/permissions_tab.tpl
===================================================================
--- admin_templates/categories/permissions_tab.tpl (revision 14472)
+++ admin_templates/categories/permissions_tab.tpl (working copy)
@@ -67,7 +67,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
<inp2:m_set odd_even="table-color1"/>
<thead class="subsectiontitle">
- <td><inp2:m_phrase name="la_col_Description"/></td>
+ <td><inp2:m_phrase name="column:la_fld_Description"/></td>
<td><inp2:m_phrase name="la_col_Inherited"/></td>
<td><inp2:m_phrase name="la_col_InheritedFrom"/></td>
<td><inp2:m_phrase name="la_col_Access"/></td>
Index: admin_templates/incs/custom_blocks.tpl
===================================================================
--- admin_templates/incs/custom_blocks.tpl (revision 14472)
+++ admin_templates/incs/custom_blocks.tpl (working copy)
@@ -109,8 +109,9 @@
<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
+ <inp2:Field field="Prompt" result_to_var="title"/>
<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>', '<inp2:m_Param name="virtual_field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>')">
- <span class="<inp2:m_if check='{$SourcePrefix}_HasError' field='$virtual_field'>error-cell</inp2:m_if>"><inp2:Field field="Prompt" as_label="1"/></span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required"> *</span></inp2:m_if>:
+ <span class="<inp2:m_if check='{$SourcePrefix}_HasError' field='$virtual_field'>error-cell</inp2:m_if>"><inp2:Field field="Prompt" as_label="1"/></span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required"> *</span></inp2:m_if>:<inp2:m_if check="FieldHintLabel" title_label="$title"><span> <img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>" alt="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>"/></inp2:m_if>
<inp2:m_if check="FieldEquals" field="ElementType" value="textarea">
<br/>
Index: admin_templates/incs/form_blocks.tpl
===================================================================
--- admin_templates/incs/form_blocks.tpl (revision 14472)
+++ admin_templates/incs/form_blocks.tpl (working copy)
@@ -111,11 +111,11 @@
<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_if check="m_Param" name="title"><inp2:m_phrase label="$title"/></inp2:m_else/><inp2:m_Param name="title_text"/></inp2:m_if></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>
+ <span class="<inp2:m_if check='{$prefix}_HasError' field='$field'>error-cell</inp2:m_if>"><inp2:m_if check="m_Param" name="title"><inp2:m_phrase label="$title"/></inp2:m_else/><inp2:m_Param name="title_text"/></inp2:m_if></span></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:<inp2:m_if check="{$prefix}_FieldHintLabel" title_label="$title" direct_label="$hint_label"><span> <img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:$prefix_FieldHintLabel title_label='$title' direct_label='$hint_label' html_escape='1'/>" alt="<inp2:$prefix_FieldHintLabel title_label='$title' direct_label='$hint_label' html_escape='1'/>"/></inp2:m_if>
</label>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="inp_edit_field_caption" title="" title_text="" hint_label="" NamePrefix="">
+<inp2:m_DefineElement name="inp_edit_field_caption" title="la_fld_{$field}" title_text="" hint_label="" NamePrefix="">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', '<inp2:m_Param name='field' js_escape='1'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
<inp2:m_if check="m_Param" name="title">
Index: admin_templates/incs/grid_blocks.tpl
===================================================================
--- admin_templates/incs/grid_blocks.tpl (revision 14472)
+++ admin_templates/incs/grid_blocks.tpl (working copy)
@@ -505,7 +505,7 @@
</table>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_column_title" use_phrases="1">
+<inp2:m_DefineElement name="grid_column_title" title="column:la_fld_{$field}" use_phrases="1">
<table style="width: auto" class="layout-only-table"><tr>
<td style="vertical-align: middle; padding: 0px">
<a
@@ -549,7 +549,7 @@
<input type="checkbox" onclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].InvertSelection(); this.checked=false;" ondblclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].ClearSelection(); this.checked=false;" />
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_column_title_no_sorting" use_phrases="1">
+<inp2:m_DefineElement name="grid_column_title_no_sorting" title="column:la_fld_{$field}" use_phrases="1">
<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>
</inp2:m_DefineElement>
Index: admin_templates/js/inp_ckconfig.js
===================================================================
--- admin_templates/js/inp_ckconfig.js (revision 0)
+++ admin_templates/js/inp_ckconfig.js (revision 0)
@@ -0,0 +1,96 @@
+// Preview
+//CKEDITOR.config.PreviewUrl = '';
+//CKEDITOR.config.ContentId = '';
+
+//CKEDITOR.config.PreloadImages = [ CKEDITOR.config.SkinPath + 'images/toolbar.start.gif', CKEDITOR.config.SkinPath + 'images/toolbar.buttonarrow.gif', CKEDITOR.config.BasePath + 'plugins/images/document.gif' ] ;
+
+//CKEDITOR.config.PluginsPath = CKEDITOR.config.BasePath + 'plugins/' ;
+
+CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize,MediaEmbed';
+
+//CKEDITOR.plugins.add('MySource');
+//CKEDITOR.plugins.add('MyPreview');
+//CKEDITOR.plugins.add('MyLink');
+//CKEDITOR.plugins.add('MyImage');
+//CKEDITOR.plugins.add('document', 'en,ru');
+
+CKEDITOR.config.protectedSource.push( /(<inp2:[^\>]+>)|(<\/inp2:[^\>]+>)|(<inp2:[^\>]+\/>)/gi ) ;
+
+CKEDITOR.config.documentIconsUrl = '/system/user_files/icons'; // for document custom plugin
+
+CKEDITOR.config.toolbar_Default = [
+ ['Styles'],
+ ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
+ ['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
+ ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'],
+ ['Find', 'Replace', 'Scayt']
+];
+
+CKEDITOR.config.toolbar_Advanced = [
+ ['Cut','Copy','Paste','PasteText','PasteFromWord','-','NewPage','SelectAll','-','Find','Replace','-','Print','Preview','-',/*My*/ 'Link','Unlink','Anchor','HorizontalRule','-',/*My*/ 'Image','Flash','MediaEmbed','Document','Table','SpecialChar'],
+ '/',
+ ['Bold','Italic','Underline','Strike','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','NumberedList','BulletedList','Outdent','Indent','-','Subscript','Superscript','-','TextColor','BGColor','-','Undo','Redo'],
+ '/',
+ ['Styles','Font','FontSize','RemoveFormat','-','Scayt','-', /*My*/'Source', 'Maximize', 'ShowBlocks']
+];
+
+//CKEDITOR.config.toolbar_Full = [
+// [ 'Source','-','Save','NewPage','DocProps','Preview','Print','-','Templates' ],
+// [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ],
+// [ 'Find','Replace','-','SelectAll','-','SpellChecker', 'Scayt' ],
+// [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ],
+// '/',
+// [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ],
+// [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ],
+// [ 'Link','Unlink','Anchor' ],
+// [ 'Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak' ],
+// '/',
+// [ 'Styles','Format','Font','FontSize' ],
+// [ 'TextColor','BGColor' ],
+// [ 'Maximize', 'ShowBlocks','-','About' ]
+//];
+
+CKEDITOR.config.enterMode = CKEDITOR.ENTER_BR ; // p | div | br
+CKEDITOR.config.shiftEnterMode = CKEDITOR.ENTER_P ; // p | div | br
+
+CKEDITOR.config.keystrokes = [
+ [ CKEDITOR.CTRL + 65 /*A*/, true ],
+ [ CKEDITOR.CTRL + 67 /*C*/, true ],
+ [ CKEDITOR.CTRL + 70 /*F*/, true ],
+ [ CKEDITOR.CTRL + 83 /*S*/, true ],
+ [ CKEDITOR.CTRL + 84 /*T*/, true ],
+ [ CKEDITOR.CTRL + 88 /*X*/, true ],
+ [ CKEDITOR.CTRL + 86 /*V*/, 'Paste' ],
+ [ CKEDITOR.CTRL + 45 /*INS*/, true ],
+ [ CKEDITOR.SHIFT + 45 /*INS*/, 'Paste' ],
+ [ CKEDITOR.CTRL + 88 /*X*/, 'Cut' ],
+ [ CKEDITOR.SHIFT + 46 /*DEL*/, 'Cut' ],
+ [ CKEDITOR.CTRL + 90 /*Z*/, 'Undo' ],
+ [ CKEDITOR.CTRL + 89 /*Y*/, 'Redo' ],
+ [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'Redo' ],
+ [ CKEDITOR.CTRL + 76 /*L*/, 'Link' ],
+ [ CKEDITOR.CTRL + 66 /*B*/, 'Bold' ],
+ [ CKEDITOR.CTRL + 73 /*I*/, 'Italic' ],
+ [ CKEDITOR.CTRL + 85 /*U*/, 'Underline' ],
+ [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 /*S*/, 'Save' ],
+ [ CKEDITOR.CTRL + CKEDITOR.ALT + 13 /*ENTER*/, 'FitWindow' ]
+] ;
+
+//CKEDITOR.config.menu_groups = 'generic,anchor,flash,select,textarea,checkbox,radio,textfield,hiddenfield,imagebutton,button,bulletedlist,numberedlist,table,form';
+
+CKEDITOR.config.font_names = 'Arial Narrow;Arial;Sans-Serif;Serif;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
+CKEDITOR.config.fontSize_sizes = 'xx-small;x-small;small;medium;large;x-large;xx-large' ;
+
+CKEDITOR.config.filebrowserBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html';
+CKEDITOR.config.filebrowserUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files';
+
+CKEDITOR.config.filebrowserImageBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Images';
+CKEDITOR.config.filebrowserImageUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images';
+
+CKEDITOR.config.filebrowserFlashBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Flash';
+CKEDITOR.config.filebrowserFlashUploadUrl = CKEDITOR.basePath + 'ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash';
+
+CKEDITOR.config.filebrowserDocumentBrowseUrl = CKEDITOR.basePath + 'ckfinder/ckfinder.html?type=Documents';
+
+// add ability to browse for documents
+//CKEDITOR.config.documentsBrowser = true ;
Index: admin_templates/languages/phrase_edit.tpl
===================================================================
--- admin_templates/languages/phrase_edit.tpl (revision 14472)
+++ admin_templates/languages/phrase_edit.tpl (working copy)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="888" height="415"/>
+<inp2:adm_SetPopupSize width="888" height="510"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" prefix="phrases" title_preset="phrase_edit_single"/>
@@ -79,12 +79,14 @@
<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
</tr>
- <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="la_fld_PrimaryTranslation"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="la_fld_Phrase" size="60"/>
- <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="la_fld_PhraseType"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="la_fld_Module"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module"/>
</inp2:m_if>
</inp2:m_DefineElement>
Index: admin_templates/regional/languages_export.tpl
===================================================================
--- admin_templates/regional/languages_export.tpl (revision 14472)
+++ admin_templates/regional/languages_export.tpl (working copy)
@@ -79,7 +79,7 @@
<table id="modules" border="1">
<tr>
- <th align="center" colspan="2"><inp2:m_Phrase name="la_col_Module"/></th>
+ <th align="center" colspan="2"><inp2:m_Phrase name="column:la_fld_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>
Index: admin_templates/regional/phrases_edit.tpl
===================================================================
--- admin_templates/regional/phrases_edit.tpl (revision 14472)
+++ admin_templates/regional/phrases_edit.tpl (working copy)
@@ -78,12 +78,12 @@
<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
</tr>
- <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="la_fld_PrimaryTranslation"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="la_fld_Phrase" size="60"/>
+ <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="la_fld_PhraseType"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="la_fld_Module"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module"/>
</inp2:m_if>
</inp2:m_DefineElement>
Index: admin_templates/spelling_dictionary/spelling_dictionary_list.tpl
===================================================================
--- admin_templates/spelling_dictionary/spelling_dictionary_list.tpl (revision 14472)
+++ admin_templates/spelling_dictionary/spelling_dictionary_list.tpl (working copy)
@@ -14,7 +14,7 @@
}
var a_toolbar = new ToolBar();
- a_toolbar.AddButton( new ToolBarButton('new_spelling_dictionary', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+ a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
function() {
std_precreate_item('spelling-dictionary', 'spelling_dictionary/spelling_dictionary_edit');
} ) );
Index: admin_templates/submissions/submission_view.tpl
===================================================================
--- admin_templates/submissions/submission_view.tpl (revision 14472)
+++ admin_templates/submissions/submission_view.tpl (working copy)
@@ -150,7 +150,8 @@
<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', 'fld_<inp2:Field name='FormFieldId'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
- <inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/><inp2:m_if check="Field" name="Required" db="db"><span class="field-required"> *</span></inp2:m_if>:
+ <inp2:Field field="Prompt" result_to_var="title"/>
+ <inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/><inp2:m_if check="Field" name="Required" db="db"><span class="field-required"> *</span></inp2:m_if>:<inp2:m_if check="FieldHintLabel" title_label="$title"><span> <img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>" alt="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>"/></inp2:m_if>
</td>
<td class="control-mid"> </td>
<script type="text/javascript">
Index: admin_templates/users/users_edit.tpl
===================================================================
--- admin_templates/users/users_edit.tpl (revision 14472)
+++ admin_templates/users/users_edit.tpl (working copy)
@@ -64,28 +64,28 @@
<inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login,Password" title="la_section_General"/>
<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword"/>
<inp2:m_RenderElement name="subsection" prefix="u" fields="FirstName,LastName,Company,Email,dob,Phone,Fax,Street,Street2,City,State,Zip,Country" title="la_prompt_PersonalInfo"/> <!-- OLD PHRASE, la_section_PersonalInformation -->
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="la_fld_Company"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email"/>
<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="la_prompt_birthday"/> <!-- OLD PHRASE, la_fld_BirthDate -->
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="la_fld_Phone"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="la_fld_Fax"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="la_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="la_fld_AddressLine2"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="la_fld_City"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="la_fld_State"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="la_fld_Zip"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country" has_empty="1"/>
- <inp2:m_RenderElement name="inp_edit_multioptions" prefix="u" field="DisplayToPublic" title="la_fld_DisplayToPublic"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" has_empty="1"/>
+ <inp2:m_RenderElement name="inp_edit_multioptions" prefix="u" field="DisplayToPublic"/>
<inp2:m_RenderElement name="subsection" prefix="u" fields="Status,CreatedOn" title="la_section_Properties"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="u" field="Status" title="la_fld_Status"/>
- <inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="CreatedOn" title="la_fld_CreatedOn"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="u" field="Status"/>
+ <inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="CreatedOn"/>
<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
<!-- custom fields: begin -->
Index: install/english.lang
===================================================================
--- install/english.lang (revision 14472)
+++ install/english.lang (working copy)
@@ -1,4 +1,4 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_Active" Module="Core" Type="1">QWN0aXZl</PHRASE>
@@ -63,52 +63,19 @@
<PHRASE Label="la_category_sortfield_prompt" Module="Core" Type="1">T3JkZXIgc2VjdGlvbnMgYnk=</PHRASE>
<PHRASE Label="la_Close" Module="Core" Type="1">Q2xvc2U=</PHRASE>
<PHRASE Label="la_col_Access" Module="Core" Type="1">QWNjZXNz</PHRASE>
- <PHRASE Label="la_col_Action" Module="Core" Type="1">QWN0aW9u</PHRASE>
<PHRASE Label="la_col_AdditionalPermissions" Module="Core" Type="1">QWRkaXRpb25hbA==</PHRASE>
- <PHRASE Label="la_col_AdminInterfaceLang" Module="Core" Type="1">QWRtaW4gUHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_col_AffectedItems" Module="Core" Type="1">QWZmZWN0ZWQgSXRlbXM=</PHRASE>
<PHRASE Label="la_col_AltName" Module="Core" Type="1">QWx0IFZhbHVl</PHRASE>
- <PHRASE Label="la_col_Bcc" Module="Core" Type="1">QmNj</PHRASE>
- <PHRASE Label="la_col_BounceDate" Module="Core" Type="1">Qm91bmNlZCBPbg==</PHRASE>
- <PHRASE Label="la_col_BounceInfo" Module="Core" Type="1">Qm91bmNlIEluZm8=</PHRASE>
<PHRASE Label="la_col_BuildDate" Module="Core" Type="1">QnVpbGQgRGF0ZQ==</PHRASE>
- <PHRASE Label="la_col_Category" Module="Core" Type="1">U2VjdGlvbg==</PHRASE>
<PHRASE Label="la_col_CategoryName" Module="Core" Type="1">U2VjdGlvbiBOYW1l</PHRASE>
- <PHRASE Label="la_col_Cc" Module="Core" Type="1">Q2M=</PHRASE>
- <PHRASE Label="la_col_Changes" Module="Core" Type="1">Q2hhbmdlcw==</PHRASE>
- <PHRASE Label="la_col_Charset" Module="Core" Type="1">Q2hhcnNldA==</PHRASE>
- <PHRASE Label="la_col_Country" Module="Core" Type="1">Q291bnRyeQ==</PHRASE>
- <PHRASE Label="la_col_CreatedOn" Module="Core" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
- <PHRASE Label="la_col_Description" Module="Core" Type="1">RGVzY3JpcHRpb24=</PHRASE>
- <PHRASE Label="la_col_DomainName" Module="Core" Type="1">RG9tYWluIE5hbWU=</PHRASE>
- <PHRASE Label="la_col_Duration" Module="Core" Type="1">RHVyYXRpb24=</PHRASE>
+ <PHRASE Label="la_col_ColumnPhrase" Module="Core" Type="1">Q29sdW1uIFBocmFzZQ==</PHRASE>
<PHRASE Label="la_col_Effective" Module="Core" Type="1">RWZmZWN0aXZl</PHRASE>
- <PHRASE Label="la_col_Email" Module="Core" Type="1">RW1haWw=</PHRASE>
- <PHRASE Label="la_col_EmailCommunicationRole" Module="Core" Type="1">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
<PHRASE Label="la_col_EmailEvents" Module="Core" Type="1">RW1haWwgRXZlbnRz</PHRASE>
- <PHRASE Label="la_col_EmailsQueued" Module="Core" Type="1">UXVldWU=</PHRASE>
- <PHRASE Label="la_col_EmailsSent" Module="Core" Type="1">U2VudA==</PHRASE>
- <PHRASE Label="la_col_EmailsTotal" Module="Core" Type="1">VG90YWw=</PHRASE>
- <PHRASE Label="la_col_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE>
<PHRASE Label="la_col_EnableEmailCommunication" Module="Core" Type="1">RW5hYmxlIEUtbWFpbCBDb21tdW5pY2F0aW9u</PHRASE>
- <PHRASE Label="la_col_EndDate" Module="Core" Type="1">RW5kIERhdGU=</PHRASE>
<PHRASE Label="la_col_Error" Module="Core" Type="1">Jm5ic3A7</PHRASE>
- <PHRASE Label="la_col_Event" Module="Core" Type="1">RXZlbnQ=</PHRASE>
<PHRASE Label="la_col_EventDescription" Module="Core" Type="1">RXZlbnQgRGVzY3JpcHRpb24=</PHRASE>
<PHRASE Label="la_col_EventParams" Module="Core" Type="1">RXZlbnQgUGFyYW1z</PHRASE>
- <PHRASE Label="la_col_FieldComparision" Module="Core" Type="1">TWF0Y2ggVHlwZQ==</PHRASE>
- <PHRASE Label="la_col_FieldName" Module="Core" Type="1">RmllbGQgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_FieldValue" Module="Core" Type="1">TWF0Y2ggVmFsdWU=</PHRASE>
- <PHRASE Label="la_col_FileName" Module="Core" Type="1">RmlsZW5hbWU=</PHRASE>
- <PHRASE Label="la_col_FilePath" Module="Core" Type="1">UGF0aA==</PHRASE>
- <PHRASE Label="la_col_FirstName" Module="Core" Type="1">Rmlyc3QgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_FromEmail" Module="Core" Type="1">RnJvbSBFLW1haWw=</PHRASE>
- <PHRASE Label="la_col_FrontEndOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
- <PHRASE Label="la_col_FrontRegistration" Module="Core" Type="1">QWxsb3cgUmVnaXN0cmF0aW9u</PHRASE>
- <PHRASE Label="la_col_GroupName" Module="Core" Type="1">R3JvdXAgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_Hits" Module="Core" Type="1">SGl0cw==</PHRASE>
- <PHRASE Label="la_col_Id" Module="Core" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_col_Image" Module="Core" Type="1">SW1hZ2U=</PHRASE>
+ <PHRASE Label="la_col_HintPhrase" Module="Core" Type="1">SGludCBQaHJhc2U=</PHRASE>
<PHRASE Label="la_col_ImageEnabled" Module="Core" Type="1">U3RhdHVz</PHRASE>
<PHRASE Label="la_col_ImageName" Module="Core" Type="1">SW1hZ2U=</PHRASE>
<PHRASE Label="la_col_ImageUrl" Module="Core" Type="1">VVJM</PHRASE>
@@ -116,46 +83,21 @@
<PHRASE Label="la_col_InheritedFrom" Module="Core" Type="1">SW5oZXJpdGVkIEZyb20=</PHRASE>
<PHRASE Label="la_col_InMenu" Module="Core" Type="1">SW4gTWVudQ==</PHRASE>
<PHRASE Label="la_col_IP" Module="Core" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_col_ISOCode" Module="Core" Type="1">SVNPIENvZGU=</PHRASE>
<PHRASE Label="la_col_IsPopular" Module="Core" Type="1">UG9wdWxhcg==</PHRASE>
- <PHRASE Label="la_col_IsPrimary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_col_IsPrimaryLanguage" Module="Core" Type="1">VXNlciBQcmltYXJ5</PHRASE>
- <PHRASE Label="la_col_IsSystem" Module="Core" Type="1">U3lzdGVt</PHRASE>
- <PHRASE Label="la_col_ItemField" Module="Core" Type="1">VXNlciBGaWVsZA==</PHRASE>
- <PHRASE Label="la_col_ItemId" Module="Core" Type="1">SXRlbSBJRA==</PHRASE>
<PHRASE Label="la_col_ItemPrefix" Module="Core" Type="1">SXRlbSBQcmVmaXg=</PHRASE>
<PHRASE Label="la_col_Keyword" Module="Core" Type="1">S2V5d29yZA==</PHRASE>
<PHRASE Label="la_col_Label" Module="Core" Type="1">TGFiZWw=</PHRASE>
- <PHRASE Label="la_col_Language" Module="Core" Type="1">TGFuZ3VhZ2U=</PHRASE>
<PHRASE Label="la_col_LanguagePackInstalled" Module="Core" Type="1">TGFuZ3VhZ2UgUGFjayBJbnN0YWxsZWQ=</PHRASE>
<PHRASE Label="la_col_LastChanged" Module="Core" Type="1">TGFzdCBDaGFuZ2Vk</PHRASE>
<PHRASE Label="la_col_LastCompiled" Module="Core" Type="1">TGFzdCBDb21waWxlZA==</PHRASE>
- <PHRASE Label="la_col_LastName" Module="Core" Type="1">TGFzdCBOYW1l</PHRASE>
- <PHRASE Label="la_col_LastRunOn" Module="Core" Type="1">TGFzdCBSdW4gT24=</PHRASE>
- <PHRASE Label="la_col_LastRunStatus" Module="Core" Type="1">TGFzdCBSdW4gU3RhdHVz</PHRASE>
<PHRASE Label="la_col_LastSendRetry" Module="Core" Type="1">TGFzdCBBdHRlbXB0</PHRASE>
- <PHRASE Label="la_col_LastUpdatedOn" Module="Core" Type="1">TGFzdCBVcGRhdGVkIE9u</PHRASE>
<PHRASE Label="la_col_LinkUrl" Module="Core" Type="1">TGluayBVUkw=</PHRASE>
- <PHRASE Label="la_col_LocalName" Module="Core" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_Location" Module="Core" Type="1">TG9jYXRpb24=</PHRASE>
- <PHRASE Label="la_col_Login" Module="Core" Type="1">TG9naW4=</PHRASE>
<PHRASE Label="la_col_MailingList" Module="Core" Type="1">TWFpbGluZyBMaXN0</PHRASE>
- <PHRASE Label="la_col_MasterId" Module="Core" Type="1">TWFzdGVyIElE</PHRASE>
- <PHRASE Label="la_col_MasterPrefix" Module="Core" Type="1">TWFzdGVyIFByZWZpeA==</PHRASE>
<PHRASE Label="la_col_MembershipExpires" Module="Core" Type="1">TWVtYmVyc2hpcCBFeHBpcmVz</PHRASE>
- <PHRASE Label="la_col_Message" Module="Core" Type="1">TWVzc2FnZQ==</PHRASE>
<PHRASE Label="la_col_MessageHeaders" Module="Core" Type="1">TWVzc2FnZSBIZWFkZXJz</PHRASE>
<PHRASE Label="la_col_MessageHtml" Module="Core" Type="1">SFRNTA==</PHRASE>
- <PHRASE Label="la_col_MessageText" Module="Core" Type="1">UGxhaW4gVGV4dA==</PHRASE>
- <PHRASE Label="la_col_MisspelledWord" Module="Core" Type="1">TWlzc3BlbGxlZCBXb3Jk</PHRASE>
- <PHRASE Label="la_col_Modified" Module="Core" Type="1">TW9kaWZpZWQgT24=</PHRASE>
- <PHRASE Label="la_col_Module" Module="Core" Type="1">TW9kdWxl</PHRASE>
- <PHRASE Label="la_col_Name" Module="Core" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_NextRunOn" Module="Core" Type="1">TmV4dCBSdW4gT24=</PHRASE>
- <PHRASE Label="la_col_OccuredOn" Module="Core" Type="1">T2NjdXJlZCBPbg==</PHRASE>
<PHRASE Label="la_col_OriginalValue" Module="Core" Type="1">T3JpZ2luYWwgVmFsdWU=</PHRASE>
- <PHRASE Label="la_col_PackName" Module="Core" Type="1">UGFjayBOYW1l</PHRASE>
- <PHRASE Label="la_col_PageTitle" Module="Core" Type="1">U2VjdGlvbiBUaXRsZQ==</PHRASE>
<PHRASE Label="la_col_Path" Module="Core" Type="1">UGF0aA==</PHRASE>
<PHRASE Label="la_col_PermAdd" Module="Core" Type="1">QWRk</PHRASE>
<PHRASE Label="la_col_PermDelete" Module="Core" Type="1">RGVsZXRl</PHRASE>
@@ -163,69 +105,27 @@
<PHRASE Label="la_col_PermissionName" Module="Core" Type="1">UGVybWlzc2lvbiBOYW1l</PHRASE>
<PHRASE Label="la_col_PermissionValue" Module="Core" Type="1">QWNjZXNz</PHRASE>
<PHRASE Label="la_col_PermView" Module="Core" Type="1">Vmlldw==</PHRASE>
- <PHRASE Label="la_col_Phrase" Module="Core" Type="1">UGhyYXNl</PHRASE>
<PHRASE Label="la_col_Phrases" Module="Core" Type="1">UGhyYXNlcw==</PHRASE>
- <PHRASE Label="la_col_PhraseType" Module="Core" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_PortalUserId" Module="Core" Type="1">VXNlciBJRA==</PHRASE>
- <PHRASE Label="la_col_Prefix" Module="Core" Type="1">UHJlZml4</PHRASE>
<PHRASE Label="la_col_Preview" Module="Core" Type="1">UHJldmlldw==</PHRASE>
- <PHRASE Label="la_col_Primary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_col_PrimaryGroup" Module="Core" Type="1">UHJpbWFyeSBHcm91cA==</PHRASE>
<PHRASE Label="la_col_PrimaryValue" Module="Core" Type="1">UHJpbWFyeSBWYWx1ZQ==</PHRASE>
- <PHRASE Label="la_col_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE>
<PHRASE Label="la_col_Prompt" Module="Core" Type="1">RmllbGQgUHJvbXB0</PHRASE>
- <PHRASE Label="la_col_Protected" Module="Core" Type="1">UHJvdGVjdGVk</PHRASE>
<PHRASE Label="la_col_Queued" Module="Core" Type="1">UXVldWVk</PHRASE>
- <PHRASE Label="la_col_Rating" Module="Core" Type="1">UmF0aW5n</PHRASE>
- <PHRASE Label="la_col_RecipientType" Module="Core" Type="1">UmVjaXBpZW50IFR5cGU=</PHRASE>
<PHRASE Label="la_col_Referer" Module="Core" Type="1">UmVmZXJlcg==</PHRASE>
- <PHRASE Label="la_col_ReferrerURL" Module="Core" Type="1">UmVmZXJyZXIgVVJM</PHRASE>
- <PHRASE Label="la_col_RelationshipType" Module="Core" Type="1">UmVsYXRpb24gVHlwZQ==</PHRASE>
- <PHRASE Label="la_col_RepliedOn" Module="Core" Type="1">UmVwbGllZCBPbg==</PHRASE>
- <PHRASE Label="la_col_ReplyStatus" Module="Core" Type="1">UmVwbGllZA==</PHRASE>
- <PHRASE Label="la_col_RequireLogin" Module="Core" Type="1">UmVxdWlyZSBMb2dpbg==</PHRASE>
<PHRASE Label="la_col_ResetToDefaultSorting" Module="Core" Type="1">UmVzZXQgdG8gZGVmYXVsdA==</PHRASE>
<PHRASE Label="la_col_ReviewCount" Module="Core" Type="1">Q29tbWVudHM=</PHRASE>
<PHRASE Label="la_col_ReviewedBy" Module="Core" Type="1">Q3JlYXRlZCBieQ==</PHRASE>
- <PHRASE Label="la_col_ReviewText" Module="Core" Type="1">Q29tbWVudA==</PHRASE>
- <PHRASE Label="la_col_RuleType" Module="Core" Type="1">UnVsZSBUeXBl</PHRASE>
- <PHRASE Label="la_col_RunInterval" Module="Core" Type="1">UnVuIEludGVydmFs</PHRASE>
- <PHRASE Label="la_col_RunMode" Module="Core" Type="1">UnVuIE1vZGU=</PHRASE>
- <PHRASE Label="la_col_SearchTerm" Module="Core" Type="1">U2VhcmNoIFRlcm0=</PHRASE>
<PHRASE Label="la_col_SendRetries" Module="Core" Type="1">QXR0ZW1wdHMg</PHRASE>
- <PHRASE Label="la_col_SentOn" Module="Core" Type="1">U2VudCBPbg==</PHRASE>
- <PHRASE Label="la_col_SentStatus" Module="Core" Type="1">U2VudA==</PHRASE>
<PHRASE Label="la_col_SessionEnd" Module="Core" Type="1">U2Vzc2lvbiBFbmQ=</PHRASE>
- <PHRASE Label="la_col_SessionLogId" Module="Core" Type="1">U2Vzc2lvbiBMb2cgSUQ=</PHRASE>
<PHRASE Label="la_col_SessionStart" Module="Core" Type="1">U2Vzc2lvbiBTdGFydA==</PHRASE>
- <PHRASE Label="la_col_ShortIsoCode" Module="Core" Type="1">U2hvcnQgSVNPIENvZGU=</PHRASE>
- <PHRASE Label="la_col_SkinName" Module="Core" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_SortBy" Module="Core" Type="1">U29ydCBieQ==</PHRASE>
- <PHRASE Label="la_col_SSLUrl" Module="Core" Type="1">U1NMIFVybA==</PHRASE>
- <PHRASE Label="la_col_StateCountry" Module="Core" Type="1">U3RhdGUgQ291bnRyeQ==</PHRASE>
- <PHRASE Label="la_col_Status" Module="Core" Type="1">U3RhdHVz</PHRASE>
- <PHRASE Label="la_col_StopWord" Module="Core" Type="1">U3RvcCBXb3Jk</PHRASE>
- <PHRASE Label="la_col_Subject" Module="Core" Type="1">U3ViamVjdA==</PHRASE>
- <PHRASE Label="la_col_SuggestedCorrection" Module="Core" Type="1">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
<PHRASE Label="la_col_System" Module="Core" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_SystemPath" Module="Core" Type="1">U3lzdGVtIFBhdGg=</PHRASE>
- <PHRASE Label="la_col_TargetId" Module="Core" Type="1">SXRlbQ==</PHRASE>
<PHRASE Label="la_col_TargetType" Module="Core" Type="1">SXRlbSBUeXBl</PHRASE>
- <PHRASE Label="la_col_TemplateType" Module="Core" Type="1">VGVtcGxhdGU=</PHRASE>
- <PHRASE Label="la_col_Theme" Module="Core" Type="1">VGhlbWU=</PHRASE>
- <PHRASE Label="la_col_ThesaurusTerm" Module="Core" Type="1">VGhlc2F1cnVzIFRlcm0=</PHRASE>
- <PHRASE Label="la_col_ThesaurusType" Module="Core" Type="1">VGhlc2F1cnVzIFR5cGU=</PHRASE>
- <PHRASE Label="la_col_Title" Module="Core" Type="1">VGl0bGU=</PHRASE>
- <PHRASE Label="la_col_ToEmail" Module="Core" Type="1">VG8gRS1tYWls</PHRASE>
- <PHRASE Label="la_col_Translation" Module="Core" Type="1">VmFsdWU=</PHRASE>
- <PHRASE Label="la_col_Type" Module="Core" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_UserCount" Module="Core" Type="1">VXNlcnM=</PHRASE>
<PHRASE Label="la_col_UserFirstLastName" Module="Core" Type="1">TGFzdG5hbWUgRmlyc3RuYW1l</PHRASE>
- <PHRASE Label="la_col_Username" Module="Core" Type="1">VXNlcm5hbWU=</PHRASE>
- <PHRASE Label="la_col_UseSecurityImage" Module="Core" Type="1">VXNlIFNlY3VyaXR5IEltYWdl</PHRASE>
<PHRASE Label="la_col_Value" Module="Core" Type="1">RmllbGQgVmFsdWU=</PHRASE>
- <PHRASE Label="la_col_Version" Module="Core" Type="1">VmVyc2lvbg==</PHRASE>
- <PHRASE Label="la_col_Visibility" Module="Core" Type="1">VmlzaWJpbGl0eQ==</PHRASE>
<PHRASE Label="la_col_Visible" Module="Core" Type="1">VmlzaWJsZQ==</PHRASE>
<PHRASE Label="la_col_VisitDate" Module="Core" Type="1">VmlzaXQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_common_ascending" Module="Core" Type="1">QXNjZW5kaW5n</PHRASE>
@@ -379,16 +279,17 @@
<PHRASE Label="la_Field" Module="Core" Type="1">RmllbGQ=</PHRASE>
<PHRASE Label="la_field_displayorder" Module="Core" Type="1">RGlzcGxheSBPcmRlcg==</PHRASE>
<PHRASE Label="la_field_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE>
- <PHRASE Label="la_fld_Action" Module="Core" Type="1">QWN0aW9u</PHRASE>
+ <PHRASE Label="la_fld_Action" Module="Core" Type="1" Column="QWN0aW9u">QWN0aW9u</PHRASE>
<PHRASE Label="la_fld_AddressLine1" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>
<PHRASE Label="la_fld_AddressLine2" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>
<PHRASE Label="la_fld_AdminEmail" Module="Core" Type="1">TWVzc2FnZXMgZnJvbSBTaXRlIEFkbWluIGFyZSBmcm9t</PHRASE>
- <PHRASE Label="la_fld_AdminInterfaceLang" Module="Core" Type="1">QWRtaW4gUHJpbWFyeQ==</PHRASE>
+ <PHRASE Label="la_fld_AdminInterfaceLang" Module="Core" Type="1" Column="QWRtaW4gUHJpbWFyeQ==">QWRtaW4gUHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_AdvancedCSS" Module="Core" Type="1">QWR2YW5jZWQgQ1NT</PHRASE>
<PHRASE Label="la_fld_AdvancedSearch" Module="Core" Type="1">QWR2YW5jZWQgU2VhcmNo</PHRASE>
<PHRASE Label="la_fld_AllowChangingRecipient" Module="Core" Type="1">QWxsb3cgQ2hhbmdpbmcgIlRvIiBSZWNpcGllbnQ=</PHRASE>
<PHRASE Label="la_fld_AllowChangingSender" Module="Core" Type="1">QWxsb3cgQ2hhbmdpbmcgU2VuZGVy</PHRASE>
<PHRASE Label="la_fld_AltValue" Module="Core" Type="1">QWx0IFZhbHVl</PHRASE>
+ <PHRASE Label="la_fld_Answer" Module="Core" Type="1">QW5zd2Vy</PHRASE>
<PHRASE Label="LA_FLD_ATTACHMENT" Module="Core" Type="1">QXR0YWNobWVudA==</PHRASE>
<PHRASE Label="la_fld_AutoCreateFileName" Module="Core" Type="1">QXV0byBDcmVhdGUgRmlsZSBOYW1l</PHRASE>
<PHRASE Label="la_fld_AutomaticFilename" Module="Core" Type="1">QXV0b21hdGljIEZpbGVuYW1l</PHRASE>
@@ -399,33 +300,34 @@
<PHRASE Label="la_fld_BackgroundImage" Module="Core" Type="1">QmFja2dyb3VuZCBJbWFnZQ==</PHRASE>
<PHRASE Label="la_fld_BackgroundPosition" Module="Core" Type="1">QmFja2dyb3VuZCBQb3NpdGlvbg==</PHRASE>
<PHRASE Label="la_fld_BackgroundRepeat" Module="Core" Type="1">QmFja2dyb3VuZCBSZXBlYXQ=</PHRASE>
- <PHRASE Label="la_fld_Bcc" Module="Core" Type="1">QmNj</PHRASE>
+ <PHRASE Label="la_fld_Bcc" Module="Core" Type="1" Column="QmNj">QmNj</PHRASE>
<PHRASE Label="la_fld_BlockPosition" Module="Core" Type="1">RWxlbWVudCBQb3NpdGlvbg==</PHRASE>
<PHRASE Label="la_fld_BorderBottom" Module="Core" Type="1">Qm9yZGVyIEJvdHRvbQ==</PHRASE>
<PHRASE Label="la_fld_BorderLeft" Module="Core" Type="1">Qm9yZGVyIExlZnQ=</PHRASE>
<PHRASE Label="la_fld_BorderRight" Module="Core" Type="1">Qm9yZGVyIFJpZ2h0</PHRASE>
<PHRASE Label="la_fld_Borders" Module="Core" Type="1">Qm9yZGVycw==</PHRASE>
<PHRASE Label="la_fld_BorderTop" Module="Core" Type="1">Qm9yZGVyIFRvcA==</PHRASE>
- <PHRASE Label="la_fld_BounceDate" Module="Core" Type="1">Qm91bmNlIERhdGU=</PHRASE>
+ <PHRASE Label="la_fld_BounceDate" Module="Core" Type="1" Column="Qm91bmNlZCBPbg==">Qm91bmNlIERhdGU=</PHRASE>
<PHRASE Label="la_fld_BounceEmail" Module="Core" Type="1">Qm91bmNlIEVtYWls</PHRASE>
- <PHRASE Label="la_fld_BounceInfo" Module="Core" Type="1">Qm91bmNlIEluZm8=</PHRASE>
- <PHRASE Label="la_fld_Category" Module="Core" Type="1">U2VjdGlvbg==</PHRASE>
+ <PHRASE Label="la_fld_BounceInfo" Module="Core" Type="1" Column="Qm91bmNlIEluZm8=">Qm91bmNlIEluZm8=</PHRASE>
+ <PHRASE Label="la_fld_Category" Module="Core" Type="1" Column="U2VjdGlvbg==">U2VjdGlvbg==</PHRASE>
<PHRASE Label="la_fld_CategoryFormat" Module="Core" Type="1">U2VjdGlvbiBGb3JtYXQ=</PHRASE>
<PHRASE Label="la_fld_CategoryId" Module="Core" Type="1">U2VjdGlvbiBJRA==</PHRASE>
<PHRASE Label="la_fld_CategorySeparator" Module="Core" Type="1">U2VjdGlvbiBzZXBhcmF0b3I=</PHRASE>
<PHRASE Label="la_fld_CategoryTemplate" Module="Core" Type="1">U2VjdGlvbiBUZW1wbGF0ZQ==</PHRASE>
- <PHRASE Label="la_fld_Cc" Module="Core" Type="1">Q2M=</PHRASE>
- <PHRASE Label="la_fld_Changes" Module="Core" Type="1">Q2hhbmdlcw==</PHRASE>
- <PHRASE Label="la_fld_Charset" Module="Core" Type="1">Q2hhcnNldA==</PHRASE>
+ <PHRASE Label="la_fld_Cc" Module="Core" Type="1" Column="Q2M=">Q2M=</PHRASE>
+ <PHRASE Label="la_fld_Changes" Module="Core" Type="1" Column="Q2hhbmdlcw==">Q2hhbmdlcw==</PHRASE>
+ <PHRASE Label="la_fld_Charset" Module="Core" Type="1" Column="Q2hhcnNldA==">Q2hhcnNldA==</PHRASE>
<PHRASE Label="la_fld_CheckDuplicatesMethod" Module="Core" Type="1">Q2hlY2sgRHVwbGljYXRlcyBieQ==</PHRASE>
<PHRASE Label="la_fld_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>
+ <PHRASE Label="la_fld_ColumnTranslation" Module="Core" Type="1" Hint="QXNzb2NpYXRlZCBjb2x1bW4gaGVhZGluZyB0cmFuc2xhdGlvbg==">Q29sdW1uIFBocmFzZQ==</PHRASE>
<PHRASE Label="la_fld_Comments" Module="Core" Type="1">Q29tbWVudHM=</PHRASE>
<PHRASE Label="la_fld_Company" Module="Core" Type="1">Q29tcGFueQ==</PHRASE>
<PHRASE Label="la_fld_ConfigHeader" Module="Core" Type="1">Q29uZmlndXJhdGlvbiBIZWFkZXIgTGFiZWw=</PHRASE>
<PHRASE Label="la_fld_CopyLabels" Module="Core" Type="1">Q29weSBMYWJlbHMgZnJvbSB0aGlzIExhbmd1YWdl</PHRASE>
- <PHRASE Label="la_fld_Country" Module="Core" Type="1">Q291bnRyeQ==</PHRASE>
+ <PHRASE Label="la_fld_Country" Module="Core" Type="1" Column="Q291bnRyeQ==">Q291bnRyeQ==</PHRASE>
<PHRASE Label="la_fld_CreatedById" Module="Core" Type="1">Q3JlYXRlZCBCeQ==</PHRASE>
- <PHRASE Label="la_fld_CreatedOn" Module="Core" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_CreatedOn" Module="Core" Type="1" Column="Q3JlYXRlZCBPbg==">Q3JlYXRlZCBPbg==</PHRASE>
<PHRASE Label="la_fld_CSS" Module="Core" Type="1">Q1NTIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_Cursor" Module="Core" Type="1">Q3Vyc29y</PHRASE>
<PHRASE Label="la_fld_CustomDetailTemplate" Module="Core" Type="1">Q3VzdG9tIERldGFpbHMgVGVtcGxhdGU=</PHRASE>
@@ -434,28 +336,28 @@
<PHRASE Label="la_fld_CustomTemplate" Module="Core" Type="1">DQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KRGV0YWlscyBUZW1wbGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_DateFormat" Module="Core" Type="1">RGF0ZSBGb3JtYXQ=</PHRASE>
<PHRASE Label="la_fld_DecimalPoint" Module="Core" Type="1">RGVjaW1hbCBQb2ludA==</PHRASE>
- <PHRASE Label="la_fld_Description" Module="Core" Type="1">RGVzY3JpcHRpb24=</PHRASE>
+ <PHRASE Label="la_fld_Description" Module="Core" Type="1" Column="RGVzY3JpcHRpb24=">RGVzY3JpcHRpb24=</PHRASE>
<PHRASE Label="la_fld_Display" Module="Core" Type="1">RGlzcGxheQ==</PHRASE>
<PHRASE Label="la_fld_DisplayInGrid" Module="Core" Type="1">RGlzcGxheSBpbiBHcmlk</PHRASE>
<PHRASE Label="la_fld_DisplayName" Module="Core" Type="1">RmllbGQgTGFiZWw=</PHRASE>
<PHRASE Label="la_fld_DisplayToPublic" Module="Core" Type="1">RGlzcGxheSBUbyBQdWJsaWM=</PHRASE>
<PHRASE Label="la_fld_DomainIPRange" Module="Core" Type="1">UmFuZ2Ugb2YgSVBz</PHRASE>
- <PHRASE Label="la_fld_DomainName" Module="Core" Type="1">RG9tYWluIE5hbWU=</PHRASE>
+ <PHRASE Label="la_fld_DomainName" Module="Core" Type="1" Column="RG9tYWluIE5hbWU=">RG9tYWluIE5hbWU=</PHRASE>
<PHRASE Label="la_fld_DoNotEncode" Module="Core" Type="1">QXMgUGxhaW4gVGV4dA==</PHRASE>
- <PHRASE Label="la_fld_Duration" Module="Core" Type="1">RHVyYXRpb24=</PHRASE>
+ <PHRASE Label="la_fld_Duration" Module="Core" Type="1" Column="RHVyYXRpb24=">RHVyYXRpb24=</PHRASE>
<PHRASE Label="la_fld_EditorsPick" Module="Core" Type="1">RWRpdG9ycyBQaWNr</PHRASE>
<PHRASE Label="la_fld_ElapsedTime" Module="Core" Type="1">RWxhcHNlZCBUaW1l</PHRASE>
- <PHRASE Label="la_fld_Email" Module="Core" Type="1">RS1tYWls</PHRASE>
- <PHRASE Label="la_fld_EmailCommunicationRole" Module="Core" Type="1">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
- <PHRASE Label="la_fld_EmailsQueued" Module="Core" Type="1">RW1haWxzIGluIFF1ZXVl</PHRASE>
- <PHRASE Label="la_fld_EmailsSent" Module="Core" Type="1">RW1haWxzIFNlbnQ=</PHRASE>
- <PHRASE Label="la_fld_EmailsTotal" Module="Core" Type="1">RW1haWxzIFRvdGFs</PHRASE>
+ <PHRASE Label="la_fld_Email" Module="Core" Type="1" Column="RW1haWw=">RS1tYWls</PHRASE>
+ <PHRASE Label="la_fld_EmailCommunicationRole" Module="Core" Type="1" Column="RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
+ <PHRASE Label="la_fld_EmailsQueued" Module="Core" Type="1" Column="UXVldWU=">RW1haWxzIGluIFF1ZXVl</PHRASE>
+ <PHRASE Label="la_fld_EmailsSent" Module="Core" Type="1" Column="U2VudA==">RW1haWxzIFNlbnQ=</PHRASE>
+ <PHRASE Label="la_fld_EmailsTotal" Module="Core" Type="1" Column="VG90YWw=">RW1haWxzIFRvdGFs</PHRASE>
<PHRASE Label="la_fld_Enable" Module="Core" Type="1">RW5hYmxl</PHRASE>
- <PHRASE Label="la_fld_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE>
+ <PHRASE Label="la_fld_Enabled" Module="Core" Type="1" Column="RW5hYmxlZA==">RW5hYmxlZA==</PHRASE>
<PHRASE Label="la_fld_EnablePageCache" Module="Core" Type="1">RW5hYmxlIENhY2hpbmcgZm9yIHRoaXMgU2VjdGlvbg==</PHRASE>
<PHRASE Label="la_fld_ErrorTag" Module="Core" Type="1">RXJyb3IgVGFn</PHRASE>
<PHRASE Label="la_fld_EstimatedTime" Module="Core" Type="1">RXN0aW1hdGVkIFRpbWU=</PHRASE>
- <PHRASE Label="la_fld_Event" Module="Core" Type="1">RXZlbnQ=</PHRASE>
+ <PHRASE Label="la_fld_Event" Module="Core" Type="1" Column="RXZlbnQ=">RXZlbnQ=</PHRASE>
<PHRASE Label="la_fld_Expire" Module="Core" Type="1">RXhwaXJl</PHRASE>
<PHRASE Label="la_fld_ExportColumns" Module="Core" Type="1">RXhwb3J0IGNvbHVtbnM=</PHRASE>
<PHRASE Label="la_fld_ExportEmailEvents" Module="Core" Type="1">RXhwb3J0IFNwZWNpZmllZCBFbWFpbCBFdmVudHM=</PHRASE>
@@ -470,18 +372,18 @@
<PHRASE Label="la_fld_ExternalUrl" Module="Core" Type="1">RXh0ZXJuYWwgVVJM</PHRASE>
<PHRASE Label="la_fld_ExtraHeaders" Module="Core" Type="1">RXh0cmEgSGVhZGVycw==</PHRASE>
<PHRASE Label="la_fld_Fax" Module="Core" Type="1">RmF4</PHRASE>
- <PHRASE Label="la_fld_FieldComparision" Module="Core" Type="1">TWF0Y2ggVHlwZQ==</PHRASE>
- <PHRASE Label="la_fld_FieldName" Module="Core" Type="1">RmllbGQgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_FieldComparision" Module="Core" Type="1" Column="TWF0Y2ggVHlwZQ==">TWF0Y2ggVHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_FieldName" Module="Core" Type="1" Column="RmllbGQgTmFtZQ==">RmllbGQgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_FieldsEnclosedBy" Module="Core" Type="1">RmllbGRzIGVuY2xvc2VkIGJ5</PHRASE>
<PHRASE Label="la_fld_FieldsSeparatedBy" Module="Core" Type="1">RmllbGRzIHNlcGFyYXRlZCBieQ==</PHRASE>
<PHRASE Label="la_fld_FieldTitles" Module="Core" Type="1">RmllbGQgVGl0bGVz</PHRASE>
<PHRASE Label="la_fld_FieldType" Module="Core" Type="1">RmllbGQgVHlwZQ==</PHRASE>
- <PHRASE Label="la_fld_FieldValue" Module="Core" Type="1">TWF0Y2ggVmFsdWU=</PHRASE>
+ <PHRASE Label="la_fld_FieldValue" Module="Core" Type="1" Column="TWF0Y2ggVmFsdWU=">TWF0Y2ggVmFsdWU=</PHRASE>
<PHRASE Label="la_fld_FileContents" Module="Core" Type="1">RmlsZSBDb250ZW50cw==</PHRASE>
- <PHRASE Label="la_fld_Filename" Module="Core" Type="1">RmlsZW5hbWU=</PHRASE>
+ <PHRASE Label="la_fld_Filename" Module="Core" Type="1" Column="RmlsZW5hbWU=">RmlsZW5hbWU=</PHRASE>
<PHRASE Label="la_fld_FilenameReplacements" Module="Core" Type="1">RmlsZW5hbWUgUmVwbGFjZW1lbnRz</PHRASE>
- <PHRASE Label="la_fld_FilePath" Module="Core" Type="1">UGF0aA==</PHRASE>
- <PHRASE Label="la_fld_FirstName" Module="Core" Type="1">Rmlyc3QgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_FilePath" Module="Core" Type="1" Column="UGF0aA==">UGF0aA==</PHRASE>
+ <PHRASE Label="la_fld_FirstName" Module="Core" Type="1" Column="Rmlyc3QgTmFtZQ==">Rmlyc3QgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_Font" Module="Core" Type="1">Rm9udA==</PHRASE>
<PHRASE Label="la_fld_FontColor" Module="Core" Type="1">Rm9udCBDb2xvcg==</PHRASE>
<PHRASE Label="la_fld_FontFamily" Module="Core" Type="1">Rm9udCBGYW1pbHk=</PHRASE>
@@ -491,20 +393,21 @@
<PHRASE Label="la_fld_Form" Module="Core" Type="1">T25saW5lIEZvcm0=</PHRASE>
<PHRASE Label="la_fld_FormSubmittedTemplate" Module="Core" Type="1">T25saW5lIEZvcm0gU3VibWl0dGVkIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_FriendlyURL" Module="Core" Type="1">U2hvcnQgVVJM</PHRASE>
- <PHRASE Label="la_fld_FromEmail" Module="Core" Type="1">RnJvbSBFbWFpbA==</PHRASE>
- <PHRASE Label="la_fld_FrontEndOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
- <PHRASE Label="la_fld_FrontRegistration" Module="Core" Type="1">QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==</PHRASE>
- <PHRASE Label="la_fld_Group" Module="Core" Type="1">VXNlciBHcm91cA==</PHRASE>
+ <PHRASE Label="la_fld_FromEmail" Module="Core" Type="1" Column="RnJvbSBFLW1haWw=">RnJvbSBFbWFpbA==</PHRASE>
+ <PHRASE Label="la_fld_FrontEndOnly" Module="Core" Type="1" Column="RnJvbnQtRW5kIE9ubHk=">RnJvbnQtRW5kIE9ubHk=</PHRASE>
+ <PHRASE Label="la_fld_FrontRegistration" Module="Core" Type="1" Column="QWxsb3cgUmVnaXN0cmF0aW9u">QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==</PHRASE>
+ <PHRASE Label="la_fld_Group" Module="Core" Type="1" Column="R3JvdXA=">VXNlciBHcm91cA==</PHRASE>
<PHRASE Label="la_fld_GroupId" Module="Core" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_fld_GroupName" Module="Core" Type="1">R3JvdXAgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_GroupName" Module="Core" Type="1" Column="R3JvdXAgTmFtZQ==">R3JvdXAgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_Height" Module="Core" Type="1">SGVpZ2h0</PHRASE>
- <PHRASE Label="la_fld_Hits" Module="Core" Type="1">SGl0cw==</PHRASE>
+ <PHRASE Label="la_fld_HintTranslation" Module="Core" Type="1" Hint="QXNzb2NpYXRlZCBmaWVsZCB1c2FnZSB0cmFuc2xhdGlvbg==">SGludCBQaHJhc2U=</PHRASE>
+ <PHRASE Label="la_fld_Hits" Module="Core" Type="1" Column="SGl0cw==">SGl0cw==</PHRASE>
<PHRASE Label="la_fld_Hot" Module="Core" Type="1">SG90</PHRASE>
<PHRASE Label="LA_FLD_HTMLVERSION" Module="Core" Type="1">SFRNTCBWZXJzaW9u</PHRASE>
<PHRASE Label="la_fld_IconDisabledURL" Module="Core" Type="1">SWNvbiBVUkwgKGRpc2FibGVkKQ==</PHRASE>
<PHRASE Label="la_fld_IconURL" Module="Core" Type="1">SWNvbiBVUkw=</PHRASE>
- <PHRASE Label="la_fld_Id" Module="Core" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_fld_Image" Module="Core" Type="1">SW1hZ2U=</PHRASE>
+ <PHRASE Label="la_fld_Id" Module="Core" Type="1" Column="SUQ=">SUQ=</PHRASE>
+ <PHRASE Label="la_fld_Image" Module="Core" Type="1" Column="SW1hZ2U=">SW1hZ2U=</PHRASE>
<PHRASE Label="la_fld_ImportCategory" Module="Core" Type="1">SW1wb3J0IFNlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_ImportColumns" Module="Core" Type="1">SW1wb3J0IENvbHVtbnM=</PHRASE>
<PHRASE Label="la_fld_ImportFile" Module="Core" Type="1">SW1wb3J0IEZpbGU=</PHRASE>
@@ -514,31 +417,33 @@
<PHRASE Label="la_fld_InputTimeFormat" Module="Core" Type="1">SW5wdXQgVGltZSBGb3JtYXQ=</PHRASE>
<PHRASE Label="la_fld_InstallModules" Module="Core" Type="1">SW5zdGFsbCBNb2R1bGVz</PHRASE>
<PHRASE Label="la_fld_InstallPhraseTypes" Module="Core" Type="1">SW5zdGFsbCBQaHJhc2UgVHlwZXM=</PHRASE>
- <PHRASE Label="la_fld_IPAddress" Module="Core" Type="1">SVAgQWRkcmVzcw==</PHRASE>
+ <PHRASE Label="la_fld_IPAddress" Module="Core" Type="1" Column="SVAgQWRkcmVzcw==">SVAgQWRkcmVzcw==</PHRASE>
<PHRASE Label="la_fld_IsBaseCategory" Module="Core" Type="1">VXNlIGN1cnJlbnQgc2VjdGlvbiBhcyByb290IGZvciB0aGUgZXhwb3J0</PHRASE>
- <PHRASE Label="la_fld_ISOCode" Module="Core" Type="1">SVNPIENvZGU=</PHRASE>
- <PHRASE Label="la_fld_IsPrimary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
+ <PHRASE Label="la_fld_ISOCode" Module="Core" Type="1" Column="SVNPIENvZGU=">SVNPIENvZGU=</PHRASE>
+ <PHRASE Label="la_fld_IsPrimary" Module="Core" Type="1" Column="UHJpbWFyeQ==">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_IsRequired" Module="Core" Type="1">UmVxdWlyZWQ=</PHRASE>
- <PHRASE Label="la_fld_IsSystem" Module="Core" Type="1">SXMgU3lzdGVt</PHRASE>
+ <PHRASE Label="la_fld_IsSystem" Module="Core" Type="1" Column="U3lzdGVt">SXMgU3lzdGVt</PHRASE>
<PHRASE Label="la_fld_IsSystemTemplate" Module="Core" Type="1">U3lzdGVtIFRlbXBsYXRl</PHRASE>
- <PHRASE Label="la_fld_ItemField" Module="Core" Type="1">VXNlciBGaWVsZA==</PHRASE>
- <PHRASE Label="la_fld_ItemId" Module="Core" Type="1">SXRlbSBJRA==</PHRASE>
+ <PHRASE Label="la_fld_ItemField" Module="Core" Type="1" Column="VXNlciBGaWVsZA==">VXNlciBGaWVsZA==</PHRASE>
+ <PHRASE Label="la_fld_ItemId" Module="Core" Type="1" Column="SXRlbSBJRA==">SXRlbSBJRA==</PHRASE>
<PHRASE Label="la_fld_ItemTemplate" Module="Core" Type="1">SXRlbSBUZW1wbGF0ZQ==</PHRASE>
- <PHRASE Label="la_fld_Language" Module="Core" Type="1">TGFuZ3VhZ2U=</PHRASE>
+ <PHRASE Label="la_fld_Language" Module="Core" Type="1" Column="TGFuZ3VhZ2U=">TGFuZ3VhZ2U=</PHRASE>
<PHRASE Label="la_fld_LanguageFile" Module="Core" Type="1">TGFuZ3VhZ2UgRmlsZQ==</PHRASE>
<PHRASE Label="la_fld_LanguageId" Module="Core" Type="1">TGFuZ3VhZ2UgSUQ=</PHRASE>
<PHRASE Label="la_fld_Languages" Module="Core" Type="1">TGFuZ3VhZ2Vz</PHRASE>
- <PHRASE Label="la_fld_LastName" Module="Core" Type="1">TGFzdCBOYW1l</PHRASE>
- <PHRASE Label="la_fld_LastRunOn" Module="Core" Type="1">TGFzdCBSdW4gT24=</PHRASE>
- <PHRASE Label="la_fld_LastRunStatus" Module="Core" Type="1">TGFzdCBSdW4gU3RhdHVz</PHRASE>
- <PHRASE Label="la_fld_LastUpdatedOn" Module="Core" Type="1">TGFzdCBVcGRhdGVkIE9u</PHRASE>
+ <PHRASE Label="la_fld_LastName" Module="Core" Type="1" Column="TGFzdCBOYW1l">TGFzdCBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_LastRunOn" Module="Core" Type="1" Column="TGFzdCBSdW4gT24=">TGFzdCBSdW4gT24=</PHRASE>
+ <PHRASE Label="la_fld_LastRunStatus" Module="Core" Type="1" Column="TGFzdCBSdW4gU3RhdHVz">TGFzdCBSdW4gU3RhdHVz</PHRASE>
+ <PHRASE Label="la_fld_LastUpdatedOn" Module="Core" Type="1" Column="TGFzdCBVcGRhdGVkIE9u">TGFzdCBVcGRhdGVkIE9u</PHRASE>
<PHRASE Label="la_fld_Left" Module="Core" Type="1">TGVmdA==</PHRASE>
<PHRASE Label="la_fld_LineEndings" Module="Core" Type="1">TGluZSBlbmRpbmdz</PHRASE>
<PHRASE Label="la_fld_LineEndingsInside" Module="Core" Type="1">TGluZSBFbmRpbmdzIEluc2lkZSBGaWVsZHM=</PHRASE>
+ <PHRASE Label="la_fld_ListingId" Module="Core" Type="1" Column="TGlzdGluZyBJZA==">SUQ=</PHRASE>
+ <PHRASE Label="la_fld_ListingType" Module="Core" Type="1" Column="TGlzdGluZyBUeXBl">TGlzdGluZyBUeXBl</PHRASE>
<PHRASE Label="la_fld_Locale" Module="Core" Type="1">TG9jYWxl</PHRASE>
- <PHRASE Label="la_fld_LocalName" Module="Core" Type="1">TG9jYWwgTmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_Location" Module="Core" Type="1">TG9jYXRpb24=</PHRASE>
- <PHRASE Label="la_fld_Login" Module="Core" Type="1">TG9naW4=</PHRASE>
+ <PHRASE Label="la_fld_LocalName" Module="Core" Type="1" Column="TmFtZQ==">TG9jYWwgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_Location" Module="Core" Type="1" Column="TG9jYXRpb24=">TG9jYXRpb24=</PHRASE>
+ <PHRASE Label="la_fld_Login" Module="Core" Type="1" Column="TG9naW4=">TG9naW4=</PHRASE>
<PHRASE Label="la_fld_Logo" Module="Core" Type="1">TG9nbyBpbWFnZQ==</PHRASE>
<PHRASE Label="la_fld_LogoBottom" Module="Core" Type="1">Qm90dG9tIExvZ28gSW1hZ2U=</PHRASE>
<PHRASE Label="la_fld_LogoLogin" Module="Core" Type="1">TG9nbyBMb2dpbg==</PHRASE>
@@ -547,32 +452,32 @@
<PHRASE Label="la_fld_MarginRight" Module="Core" Type="1">TWFyZ2luIFJpZ2h0</PHRASE>
<PHRASE Label="la_fld_Margins" Module="Core" Type="1">TWFyZ2lucw==</PHRASE>
<PHRASE Label="la_fld_MarginTop" Module="Core" Type="1">TWFyZ2luIFRvcA==</PHRASE>
- <PHRASE Label="la_fld_MasterId" Module="Core" Type="1">TWFzdGVyIElE</PHRASE>
- <PHRASE Label="la_fld_MasterPrefix" Module="Core" Type="1">TWFzdGVyIFByZWZpeA==</PHRASE>
+ <PHRASE Label="la_fld_MasterId" Module="Core" Type="1" Column="TWFzdGVyIElE">TWFzdGVyIElE</PHRASE>
+ <PHRASE Label="la_fld_MasterPrefix" Module="Core" Type="1" Column="TWFzdGVyIFByZWZpeA==">TWFzdGVyIFByZWZpeA==</PHRASE>
<PHRASE Label="la_fld_MaxCategories" Module="Core" Type="1">TWF4aW11bSBudW1iZXIgb2YgU2VjdGlvbnMgb24gSXRlbSBjYW4gYmUgYWRkZWQgdG8=</PHRASE>
<PHRASE Label="la_fld_MenuIcon" Module="Core" Type="1">Q3VzdG9tIE1lbnUgSWNvbiAoaWUuIGltZy9tZW51X3Byb2R1Y3RzLmdpZik=</PHRASE>
<PHRASE Label="la_fld_MenuStatus" Module="Core" Type="1">TWVudSBTdGF0dXM=</PHRASE>
<PHRASE Label="la_fld_MergeToSubmission" Module="Core" Type="1">TWVyZ2UgdG8gU3VibWlzc2lvbg==</PHRASE>
- <PHRASE Label="la_fld_Message" Module="Core" Type="1">TWVzc2FnZQ==</PHRASE>
+ <PHRASE Label="la_fld_Message" Module="Core" Type="1" Column="TWVzc2FnZQ==">TWVzc2FnZQ==</PHRASE>
<PHRASE Label="la_fld_MessageBody" Module="Core" Type="1">TWVzc2FnZSBCb2R5</PHRASE>
- <PHRASE Label="la_fld_MessageText" Module="Core" Type="1">UGxhaW4gVGV4dCBWZXJzaW9u</PHRASE>
+ <PHRASE Label="la_fld_MessageText" Module="Core" Type="1" Column="UGxhaW4gVGV4dA==">UGxhaW4gVGV4dCBWZXJzaW9u</PHRASE>
<PHRASE Label="la_fld_MessageType" Module="Core" Type="1">TWVzc2FnZSBUeXBl</PHRASE>
<PHRASE Label="la_fld_MetaDescription" Module="Core" Type="1">TWV0YSBEZXNjcmlwdGlvbg==</PHRASE>
<PHRASE Label="la_fld_MetaKeywords" Module="Core" Type="1">TWV0YSBLZXl3b3Jkcw==</PHRASE>
- <PHRASE Label="la_fld_MisspelledWord" Module="Core" Type="1">TWlzc3BlbGxlZCBXb3Jk</PHRASE>
- <PHRASE Label="la_fld_Modified" Module="Core" Type="1">TW9kaWZpZWQ=</PHRASE>
- <PHRASE Label="la_fld_Module" Module="Core" Type="1">TW9kdWxl</PHRASE>
+ <PHRASE Label="la_fld_MisspelledWord" Module="Core" Type="1" Column="TWlzc3BlbGxlZCBXb3Jk">TWlzc3BlbGxlZCBXb3Jk</PHRASE>
+ <PHRASE Label="la_fld_Modified" Module="Core" Type="1" Column="TW9kaWZpZWQgT24=">TW9kaWZpZWQ=</PHRASE>
+ <PHRASE Label="la_fld_Module" Module="Core" Type="1" Column="TW9kdWxl">TW9kdWxl</PHRASE>
<PHRASE Label="la_fld_ModuleName" Module="Core" Type="1">TW9kdWxl</PHRASE>
<PHRASE Label="la_fld_MultiLingual" Module="Core" Type="1">TXVsdGlsaW5ndWFs</PHRASE>
- <PHRASE Label="la_fld_Name" Module="Core" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_Name" Module="Core" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_New" Module="Core" Type="1">TmV3</PHRASE>
- <PHRASE Label="la_fld_NextRunOn" Module="Core" Type="1">TmV4dCBSdW4gT24=</PHRASE>
+ <PHRASE Label="la_fld_NextRunOn" Module="Core" Type="1" Column="TmV4dCBSdW4gT24=">TmV4dCBSdW4gT24=</PHRASE>
<PHRASE Label="la_fld_Notes" Module="Core" Type="1">Tm90ZXM=</PHRASE>
- <PHRASE Label="la_fld_OccuredOn" Module="Core" Type="1">T2NjdXJlZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_OccuredOn" Module="Core" Type="1" Column="T2NjdXJlZCBPbg==">T2NjdXJlZCBPbg==</PHRASE>
<PHRASE Label="la_fld_Options" Module="Core" Type="1">T3B0aW9ucw==</PHRASE>
<PHRASE Label="la_fld_OptionTitle" Module="Core" Type="1">T3B0aW9uIFRpdGxl</PHRASE>
<PHRASE Label="la_fld_OverridePageCacheKey" Module="Core" Type="1">T3ZlcndyaXRlIERlZmF1bHQgQ2FjaGluZyBLZXk=</PHRASE>
- <PHRASE Label="la_fld_PackName" Module="Core" Type="1">UGFjayBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_PackName" Module="Core" Type="1" Column="UGFjayBOYW1l">UGFjayBOYW1l</PHRASE>
<PHRASE Label="la_fld_PaddingBottom" Module="Core" Type="1">UGFkZGluZyBCb3R0b20=</PHRASE>
<PHRASE Label="la_fld_PaddingLeft" Module="Core" Type="1">UGFkZGluZyBMZWZ0</PHRASE>
<PHRASE Label="la_fld_PaddingRight" Module="Core" Type="1">UGFkZGluZyBSaWdodA==</PHRASE>
@@ -582,108 +487,110 @@
<PHRASE Label="la_fld_PageContentTitle" Module="Core" Type="1">VGl0bGUgKE9uIFBhZ2Up</PHRASE>
<PHRASE Label="la_fld_PageExpiration" Module="Core" Type="1">Q2FjaGUgRXhwaXJhdGlvbiBpbiBzZWNvbmRz</PHRASE>
<PHRASE Label="la_fld_PageMentTitle" Module="Core" Type="1">VGl0bGUgKE1lbnUgSXRlbSk=</PHRASE>
- <PHRASE Label="la_fld_PageTitle" Module="Core" Type="1">U2VjdGlvbiBUaXRsZQ==</PHRASE>
+ <PHRASE Label="la_fld_PageTitle" Module="Core" Type="1" Column="U2VjdGlvbiBUaXRsZQ==">U2VjdGlvbiBUaXRsZQ==</PHRASE>
<PHRASE Label="la_fld_ParentSection" Module="Core" Type="1">UGFyZW50IFNlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_Password" Module="Core" Type="1">UGFzc3dvcmQ=</PHRASE>
<PHRASE Label="la_fld_PercentsCompleted" Module="Core" Type="1">UGVyY2VudHMgQ29tcGxldGVk</PHRASE>
- <PHRASE Label="la_fld_Phone" Module="Core" Type="1">UGhvbmU=</PHRASE>
- <PHRASE Label="la_fld_Phrase" Module="Core" Type="1">TGFiZWw=</PHRASE>
- <PHRASE Label="la_fld_PhraseType" Module="Core" Type="1">UGhyYXNlIFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_Phone" Module="Core" Type="1" Column="UGhvbmU=">UGhvbmU=</PHRASE>
+ <PHRASE Label="la_fld_Phrase" Module="Core" Type="1" Column="UGhyYXNl">TGFiZWw=</PHRASE>
+ <PHRASE Label="la_fld_PhraseType" Module="Core" Type="1" Column="VHlwZQ==">UGhyYXNlIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_Pop" Module="Core" Type="1">UG9w</PHRASE>
<PHRASE Label="la_fld_Popular" Module="Core" Type="1">UG9wdWxhcg==</PHRASE>
<PHRASE Label="la_fld_Port" Module="Core" Type="1">UG9ydA==</PHRASE>
<PHRASE Label="la_fld_Position" Module="Core" Type="1">UG9zaXRpb24=</PHRASE>
- <PHRASE Label="la_fld_Prefix" Module="Core" Type="1">UHJlZml4</PHRASE>
- <PHRASE Label="la_fld_Primary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
+ <PHRASE Label="la_fld_Prefix" Module="Core" Type="1" Column="UHJlZml4">UHJlZml4</PHRASE>
+ <PHRASE Label="la_fld_Primary" Module="Core" Type="1" Column="UHJpbWFyeQ==">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_PrimaryCategory" Module="Core" Type="1">UHJpbWFyeSBTZWN0aW9u</PHRASE>
<PHRASE Label="la_fld_PrimaryLang" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_PrimaryTranslation" Module="Core" Type="1">UHJpbWFyeSBMYW5ndWFnZSBQaHJhc2U=</PHRASE>
- <PHRASE Label="la_fld_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE>
+ <PHRASE Label="la_fld_Priority" Module="Core" Type="1" Column="T3JkZXI=">T3JkZXI=</PHRASE>
<PHRASE Label="la_fld_ProcessUnmatchedEmails" Module="Core" Type="1">Q29udmVydCB1bm1hdGNoZWQgZS1tYWlscyBpbnRvIG5ldyBzdWJtaXNzaW9ucw==</PHRASE>
- <PHRASE Label="la_fld_Protected" Module="Core" Type="1">UHJvdGVjdGVk</PHRASE>
- <PHRASE Label="la_fld_Qty" Module="Core" Type="1">UXVhbnRpdHk=</PHRASE>
- <PHRASE Label="la_fld_Rating" Module="Core" Type="1">UmF0aW5n</PHRASE>
+ <PHRASE Label="la_fld_Protected" Module="Core" Type="1" Column="UHJvdGVjdGVk">UHJvdGVjdGVk</PHRASE>
+ <PHRASE Label="la_fld_Qty" Module="Core" Type="1" Column="UXR5">UXVhbnRpdHk=</PHRASE>
+ <PHRASE Label="la_fld_Rating" Module="Core" Type="1" Column="UmF0aW5n">UmF0aW5n</PHRASE>
<PHRASE Label="la_fld_RecipientAddress" Module="Core" Type="1">UmVjaXBpZW50J3MgQWRkcmVzcw==</PHRASE>
<PHRASE Label="la_fld_RecipientAddressType" Module="Core" Type="1">UmVjaXBpZW50J3MgQWRkcmVzcyBUeXBl</PHRASE>
<PHRASE Label="la_fld_RecipientName" Module="Core" Type="1">UmVjaXBpZW50J3MgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_Recipients" Module="Core" Type="1">UmVjaXBpZW50cw==</PHRASE>
- <PHRASE Label="la_fld_RecipientType" Module="Core" Type="1">UmVjaXBpZW50IFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_RecipientType" Module="Core" Type="1" Column="UmVjaXBpZW50IFR5cGU=">UmVjaXBpZW50IFR5cGU=</PHRASE>
<PHRASE Label="la_fld_RedirectOnIPMatch" Module="Core" Type="1">Rm9yY2UgUmVkaXJlY3QgKHdoZW4gdXNlcidzIElQIG1hdGNoZXMp</PHRASE>
- <PHRASE Label="la_fld_ReferrerURL" Module="Core" Type="1">UmVmZXJyZXIgVVJM</PHRASE>
+ <PHRASE Label="la_fld_ReferrerURL" Module="Core" Type="1" Column="UmVmZXJyZXIgVVJM">UmVmZXJyZXIgVVJM</PHRASE>
<PHRASE Label="la_fld_RelatedSearchKeyword" Module="Core" Type="1">S2V5d29yZA==</PHRASE>
- <PHRASE Label="la_fld_RelationshipType" Module="Core" Type="1">VHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_RelationshipType" Module="Core" Type="1" Column="UmVsYXRpb24gVHlwZQ==">VHlwZQ==</PHRASE>
<PHRASE Label="la_fld_RemoteUrl" Module="Core" Type="1">UmVtb3RlIFVSTA==</PHRASE>
<PHRASE Label="la_fld_ReplaceDuplicates" Module="Core" Type="1">UmVwbGFjZSBEdXBsaWNhdGVz</PHRASE>
- <PHRASE Label="la_fld_Replacement" Module="Core" Type="1">UmVwbGFjZW1lbnQ=</PHRASE>
+ <PHRASE Label="la_fld_Replacement" Module="Core" Type="1" Column="UmVwbGFjZW1lbnQ=">UmVwbGFjZW1lbnQ=</PHRASE>
<PHRASE Label="la_fld_ReplacementTags" Module="Core" Type="1">UmVwbGFjZW1lbnQgVGFncw==</PHRASE>
- <PHRASE Label="la_fld_RepliedOn" Module="Core" Type="1">UmVwbGllZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_RepliedOn" Module="Core" Type="1" Column="UmVwbGllZCBPbg==">UmVwbGllZCBPbg==</PHRASE>
<PHRASE Label="la_fld_ReplyBcc" Module="Core" Type="1">UmVwbHkgQmNj</PHRASE>
<PHRASE Label="la_fld_ReplyCc" Module="Core" Type="1">UmVwbHkgQ2M=</PHRASE>
<PHRASE Label="la_fld_ReplyFromEmail" Module="Core" Type="1">UmVwbHkgRnJvbSBFLW1haWw=</PHRASE>
<PHRASE Label="la_fld_ReplyFromName" Module="Core" Type="1">UmVwbHkgRnJvbSBOYW1l</PHRASE>
<PHRASE Label="la_fld_ReplyMessageSignature" Module="Core" Type="1">UmVwbHkgTWVzc2FnZSBTaWduYXR1cmU=</PHRASE>
- <PHRASE Label="la_fld_ReplyStatus" Module="Core" Type="1">UmVwbGllZA==</PHRASE>
- <PHRASE Label="la_fld_Required" Module="Core" Type="1">UmVxdWlyZWQ=</PHRASE>
- <PHRASE Label="la_fld_ReviewText" Module="Core" Type="1">Q29tbWVudA==</PHRASE>
- <PHRASE Label="la_fld_RuleType" Module="Core" Type="1">UnVsZSBUeXBl</PHRASE>
- <PHRASE Label="la_fld_RunInterval" Module="Core" Type="1">UnVuIEludGVydmFs</PHRASE>
- <PHRASE Label="la_fld_RunMode" Module="Core" Type="1">UnVuIE1vZGU=</PHRASE>
+ <PHRASE Label="la_fld_ReplyStatus" Module="Core" Type="1" Column="UmVwbGllZA==">UmVwbGllZA==</PHRASE>
+ <PHRASE Label="la_fld_Required" Module="Core" Type="1" Column="UmVxdWlyZWQ=">UmVxdWlyZWQ=</PHRASE>
+ <PHRASE Label="la_fld_RequireLogin" Module="Core" Type="1" Column="UmVxdWlyZSBMb2dpbg==">UmVxdWlyZSBMb2dpbg==</PHRASE>
+ <PHRASE Label="la_fld_ReviewText" Module="Core" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
+ <PHRASE Label="la_fld_RuleType" Module="Core" Type="1" Column="UnVsZSBUeXBl">UnVsZSBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_RunInterval" Module="Core" Type="1" Column="UnVuIEludGVydmFs">UnVuIEludGVydmFs</PHRASE>
+ <PHRASE Label="la_fld_RunMode" Module="Core" Type="1" Column="UnVuIE1vZGU=">UnVuIE1vZGU=</PHRASE>
<PHRASE Label="la_fld_RunTime" Module="Core" Type="1">UnVuIFRpbWU=</PHRASE>
<PHRASE Label="la_fld_SameAsThumb" Module="Core" Type="1">U2FtZSBBcyBUaHVtYg==</PHRASE>
- <PHRASE Label="la_fld_SearchTerm" Module="Core" Type="1">U2VhcmNoIFRlcm0=</PHRASE>
+ <PHRASE Label="la_fld_SearchTerm" Module="Core" Type="1" Column="U2VhcmNoIFRlcm0=">U2VhcmNoIFRlcm0=</PHRASE>
<PHRASE Label="la_fld_SenderAddress" Module="Core" Type="1">U2VuZGVyJ3MgQWRkcmVzcw==</PHRASE>
<PHRASE Label="la_fld_SenderName" Module="Core" Type="1">U2VuZGVyJ3MgTmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_SentOn" Module="Core" Type="1">U2VudCBPbg==</PHRASE>
- <PHRASE Label="la_fld_SentStatus" Module="Core" Type="1">U2VudA==</PHRASE>
+ <PHRASE Label="la_fld_SentOn" Module="Core" Type="1" Column="U2VudCBPbg==">U2VudCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_SentStatus" Module="Core" Type="1" Column="U2VudA==">U2VudA==</PHRASE>
<PHRASE Label="la_fld_Server" Module="Core" Type="1">U2VydmVy</PHRASE>
- <PHRASE Label="la_fld_SessionLogId" Module="Core" Type="1">U2Vzc2lvbiBMb2cgSUQ=</PHRASE>
- <PHRASE Label="la_fld_ShortIsoCode" Module="Core" Type="1">U2hvcnQgSVNPIENvZGU=</PHRASE>
+ <PHRASE Label="la_fld_SessionLogId" Module="Core" Type="1" Column="U2Vzc2lvbiBMb2cgSUQ=">U2Vzc2lvbiBMb2cgSUQ=</PHRASE>
+ <PHRASE Label="la_fld_ShortIsoCode" Module="Core" Type="1" Column="U2hvcnQgSVNPIENvZGU=">U2hvcnQgSVNPIENvZGU=</PHRASE>
<PHRASE Label="la_fld_SimpleSearch" Module="Core" Type="1">U2ltcGxlIFNlYXJjaA==</PHRASE>
- <PHRASE Label="la_fld_SkinName" Module="Core" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_SkinName" Module="Core" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_SkipFirstRow" Module="Core" Type="1">U2tpcCBGaXJzdCBSb3c=</PHRASE>
<PHRASE Label="la_fld_SortValues" Module="Core" Type="1">U29ydCBWYWx1ZXM=</PHRASE>
- <PHRASE Label="la_fld_SSLUrl" Module="Core" Type="1">U1NMIEZ1bGwgVVJM</PHRASE>
+ <PHRASE Label="la_fld_SSLUrl" Module="Core" Type="1" Column="U1NMIFVybA==">U1NMIEZ1bGwgVVJM</PHRASE>
+ <PHRASE Label="la_fld_StartDate" Module="Core" Type="1" Column="U3RhcnQgRGF0ZQ==">U3RhcnQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_State" Module="Core" Type="1">U3RhdGU=</PHRASE>
- <PHRASE Label="la_fld_StateCountry" Module="Core" Type="1">U3RhdGUgQ291bnRyeQ==</PHRASE>
- <PHRASE Label="la_fld_Status" Module="Core" Type="1">U3RhdHVz</PHRASE>
- <PHRASE Label="la_fld_StopWord" Module="Core" Type="1">U3RvcCBXb3Jk</PHRASE>
- <PHRASE Label="la_fld_Subject" Module="Core" Type="1">U3ViamVjdA==</PHRASE>
+ <PHRASE Label="la_fld_StateCountry" Module="Core" Type="1" Column="U3RhdGUgQ291bnRyeQ==">U3RhdGUgQ291bnRyeQ==</PHRASE>
+ <PHRASE Label="la_fld_Status" Module="Core" Type="1" Column="U3RhdHVz">U3RhdHVz</PHRASE>
+ <PHRASE Label="la_fld_StopWord" Module="Core" Type="1" Column="U3RvcCBXb3Jk">U3RvcCBXb3Jk</PHRASE>
+ <PHRASE Label="la_fld_Subject" Module="Core" Type="1" Column="U3ViamVjdA==">U3ViamVjdA==</PHRASE>
<PHRASE Label="la_fld_SubmissionTime" Module="Core" Type="1">U3VibWl0dGVkIE9u</PHRASE>
- <PHRASE Label="la_fld_SuggestedCorrection" Module="Core" Type="1">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
+ <PHRASE Label="la_fld_SuggestedCorrection" Module="Core" Type="1" Column="U3VnZ2VzdGVkIENvcnJlY3Rpb24=">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_SymLinkCategoryId" Module="Core" Type="1">UG9pbnRzIHRvIFNlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_TableName" Module="Core" Type="1">VGFibGUgTmFtZSBpbiBEYXRhYmFzZSA=</PHRASE>
<PHRASE Label="la_fld_Tag" Module="Core" Type="1">VGFn</PHRASE>
- <PHRASE Label="la_fld_TargetId" Module="Core" Type="1">SXRlbQ==</PHRASE>
+ <PHRASE Label="la_fld_TargetId" Module="Core" Type="1" Column="SXRlbQ==">SXRlbQ==</PHRASE>
<PHRASE Label="la_fld_TemplateFile" Module="Core" Type="1">VGVtcGxhdGUgRmlsZQ==</PHRASE>
- <PHRASE Label="la_fld_TemplateType" Module="Core" Type="1">VGVtcGxhdGU=</PHRASE>
+ <PHRASE Label="la_fld_TemplateType" Module="Core" Type="1" Column="VGVtcGxhdGU=">VGVtcGxhdGU=</PHRASE>
<PHRASE Label="la_fld_TextAlign" Module="Core" Type="1">VGV4dCBBbGlnbg==</PHRASE>
<PHRASE Label="la_fld_TextDecoration" Module="Core" Type="1">VGV4dCBEZWNvcmF0aW9u</PHRASE>
<PHRASE Label="LA_FLD_TEXTVERSION" Module="Core" Type="1">VGV4dCBWZXJzaW9u</PHRASE>
- <PHRASE Label="la_fld_Theme" Module="Core" Type="1">VGhlbWU=</PHRASE>
+ <PHRASE Label="la_fld_Theme" Module="Core" Type="1" Column="VGhlbWU=">VGhlbWU=</PHRASE>
<PHRASE Label="la_fld_Themes" Module="Core" Type="1">VGhlbWVz</PHRASE>
- <PHRASE Label="la_fld_ThesaurusTerm" Module="Core" Type="1">VGhlc2F1cnVzIFRlcm0=</PHRASE>
- <PHRASE Label="la_fld_ThesaurusType" Module="Core" Type="1">VGhlc2F1cnVzIFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_ThesaurusTerm" Module="Core" Type="1" Column="VGhlc2F1cnVzIFRlcm0=">VGhlc2F1cnVzIFRlcm0=</PHRASE>
+ <PHRASE Label="la_fld_ThesaurusType" Module="Core" Type="1" Column="VGhlc2F1cnVzIFR5cGU=">VGhlc2F1cnVzIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_ThousandSep" Module="Core" Type="1">VGhvdXNhbmRzIFNlcGFyYXRvcg==</PHRASE>
<PHRASE Label="la_fld_TimeFormat" Module="Core" Type="1">VGltZSBGb3JtYXQ=</PHRASE>
- <PHRASE Label="la_fld_Title" Module="Core" Type="1">VGl0bGU=</PHRASE>
+ <PHRASE Label="la_fld_Title" Module="Core" Type="1" Column="VGl0bGU=">VGl0bGU=</PHRASE>
<PHRASE Label="la_fld_To" Module="Core" Type="1">VG8=</PHRASE>
- <PHRASE Label="la_fld_ToEmail" Module="Core" Type="1">VG8gRS1tYWls</PHRASE>
+ <PHRASE Label="la_fld_ToEmail" Module="Core" Type="1" Column="VG8gRS1tYWls">VG8gRS1tYWls</PHRASE>
<PHRASE Label="la_fld_Top" Module="Core" Type="1">VG9w</PHRASE>
<PHRASE Label="la_fld_TrackingCode" Module="Core" Type="1">QW5hbHl0aWNzIFRyYWNraW5nIENvZGU=</PHRASE>
- <PHRASE Label="la_fld_Translation" Module="Core" Type="1">UGhyYXNl</PHRASE>
- <PHRASE Label="la_fld_Type" Module="Core" Type="1">VHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_Translation" Module="Core" Type="1" Column="VmFsdWU=">UGhyYXNl</PHRASE>
+ <PHRASE Label="la_fld_Type" Module="Core" Type="1" Column="VHlwZQ==">VHlwZQ==</PHRASE>
<PHRASE Label="la_fld_UnitSystem" Module="Core" Type="1">TWVhc3VyZXMgU3lzdGVt</PHRASE>
<PHRASE Label="la_fld_Upload" Module="Core" Type="1">VXBsb2FkIEZpbGUgRnJvbSBMb2NhbCBQQw==</PHRASE>
- <PHRASE Label="la_fld_URL" Module="Core" Type="1">VVJM</PHRASE>
+ <PHRASE Label="la_fld_URL" Module="Core" Type="1" Column="VVJM">VVJM</PHRASE>
<PHRASE Label="la_fld_UseExternalUrl" Module="Core" Type="1">TGluayB0byBFeHRlcm5hbCBVUkw=</PHRASE>
<PHRASE Label="la_fld_UseMenuIcon" Module="Core" Type="1">VXNlIEN1c3RvbSBNZW51IEljb24=</PHRASE>
<PHRASE Label="la_fld_UserDocsUrl" Module="Core" Type="1">VXNlciBEb2N1bWVudGF0aW9uIFVSTA==</PHRASE>
<PHRASE Label="la_fld_UserGroups" Module="Core" Type="1">VXNlciBHcm91cHM=</PHRASE>
- <PHRASE Label="la_fld_Username" Module="Core" Type="1">VXNlcm5hbWU=</PHRASE>
- <PHRASE Label="la_fld_UseSecurityImage" Module="Core" Type="1">VXNlIFNlY3VyaXR5IEltYWdl</PHRASE>
+ <PHRASE Label="la_fld_Username" Module="Core" Type="1" Column="VXNlcm5hbWU=">VXNlcm5hbWU=</PHRASE>
+ <PHRASE Label="la_fld_UseSecurityImage" Module="Core" Type="1" Column="VXNlIFNlY3VyaXR5IEltYWdl">VXNlIFNlY3VyaXR5IEltYWdl</PHRASE>
<PHRASE Label="la_fld_VerifyPassword" Module="Core" Type="1">UmUtZW50ZXIgUGFzc3dvcmQ=</PHRASE>
- <PHRASE Label="la_fld_Version" Module="Core" Type="1">VmVyc2lvbg==</PHRASE>
- <PHRASE Label="la_fld_Visibility" Module="Core" Type="1">VmlzaWJpbGl0eQ==</PHRASE>
+ <PHRASE Label="la_fld_Version" Module="Core" Type="1" Column="VmVyc2lvbg==">VmVyc2lvbg==</PHRASE>
+ <PHRASE Label="la_fld_Visibility" Module="Core" Type="1" Column="VmlzaWJpbGl0eQ==">VmlzaWJpbGl0eQ==</PHRASE>
<PHRASE Label="la_fld_Votes" Module="Core" Type="1">Vm90ZXM=</PHRASE>
<PHRASE Label="la_fld_Width" Module="Core" Type="1">V2lkdGg=</PHRASE>
<PHRASE Label="la_fld_Z-Index" Module="Core" Type="1">Wi1JbmRleA==</PHRASE>
Index: install/upgrades.php
===================================================================
--- install/upgrades.php (revision 14472)
+++ install/upgrades.php (working copy)
@@ -1768,4 +1768,61 @@
$this->Conn->Query($sql);
}
}
+
+ /**
+ * Update to 5.1.3-RC2; Merges column and field phrases
+ *
+ * @param string $mode when called mode {before, after)
+ */
+ function Upgrade_5_1_3_RC2($mode)
+ {
+ if ($mode != 'after') {
+ return ;
+ }
+
+ $sql = 'SELECT *
+ FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseKey LIKE "LA_COL_%"';
+ $column_phrases = $this->Conn->Query($sql, 'PhraseKey');
+
+ $sql = 'SELECT *
+ FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseKey LIKE "LA_FLD_%"';
+ $field_phrases = $this->Conn->Query($sql, 'PhraseKey');
+
+ $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ /* @var $ml_helper kMultiLanguageHelper */
+
+ $delete_ids = Array ();
+ $language_count = $ml_helper->getLanguageCount();
+
+ foreach ($column_phrases as $phrase_key => $phrase_info) {
+ $field_phrase_key = 'LA_FLD_' . substr($phrase_key, 7);
+
+ if ( !isset($field_phrases[$field_phrase_key]) ) {
+ continue;
+ }
+
+ $fields_hash = Array ();
+
+ // copy column phrase main translation into field phrase column translation
+ for ($i = 1; $i <= $language_count; $i++) {
+ if ( !$ml_helper->LanguageFound($i) ) {
+ continue;
+ }
+
+ $fields_hash['l' . $i . '_ColumnTranslation'] = $phrase_info['l' . $i . '_Translation'];
+ }
+
+ $delete_ids[] = $phrase_info['PhraseId'];
+ $this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Phrase', 'PhraseId = ' . $field_phrases[$field_phrase_key]['PhraseId']);
+ }
+
+ // delete all column phrases, that were absorbed by field phrases
+ if ( $delete_ids ) {
+ $sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseId IN (' . implode(',', $delete_ids) . ')';
+ $this->Conn->Query($sql);
+ }
+ }
}
\ No newline at end of file
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 14472)
+++ install/upgrades.sql (working copy)
@@ -2025,4 +2025,6 @@
# ===== v 5.1.3-B2 =====
ALTER TABLE Modules ADD AppliedDBRevisions TEXT NULL;
-# ===== v 5.1.3-RC1 =====
\ No newline at end of file
+# ===== v 5.1.3-RC1 =====
+
+# ===== v 5.1.3-RC2 =====
\ No newline at end of file
Index: kernel/db/db_tag_processor.php
===================================================================
--- kernel/db/db_tag_processor.php (revision 14472)
+++ kernel/db/db_tag_processor.php (working copy)
@@ -905,6 +905,20 @@
return $value;
}
+ function FieldHintLabel($params)
+ {
+ if ( isset($params['direct_label']) && $params['direct_label'] ) {
+ $label = $params['direct_label'];
+ $hint = $this->Application->Phrase($label, false);
+ }
+ else {
+ $label = $params['title_label'];
+ $hint = $this->Application->Phrase('hint:' . $label, false);
+ }
+
+ return $hint; // $hint != strtoupper('!' . $label . '!') ? $hint : '';
+ }
+
/**
* Returns formatted date + time on current language
*
Index: kernel/languages/phrases_cache.php
===================================================================
--- kernel/languages/phrases_cache.php (revision 14472)
+++ kernel/languages/phrases_cache.php (working copy)
@@ -186,10 +186,10 @@
return;
}
- $sql = 'SELECT l' . $this->LanguageId . '_Translation, PhraseKey
+ $sql = 'SELECT l' . $this->LanguageId . '_Translation AS Translation, l' . $this->LanguageId . '_HintTranslation AS HintTranslation, l' . $this->LanguageId . '_ColumnTranslation AS ColumnTranslation, PhraseKey
FROM ' . TABLE_PREFIX . 'Phrase
WHERE PhraseId IN (' . implode(',', $ids) . ') AND l' . $this->LanguageId . '_Translation IS NOT NULL';
- $this->Phrases = $this->Conn->GetCol($sql, 'PhraseKey');
+ $this->Phrases = $this->Conn->Query($sql, 'PhraseKey');
/*foreach($phrases as $phrase => $tanslation)
{
@@ -205,7 +205,7 @@
// uppercase phrase name for cases, when this method is called outside this class
$cache_key = ($allow_editing ? '' : 'NE:') . mb_strtoupper($label);
- $this->Phrases[$cache_key] = $value;
+ $this->Phrases[$cache_key] = Array ('Translation' => $value, 'HintTranslation' => $value, 'ColumnTranslation' => $value);
}
function NeedsCacheUpdate()
@@ -238,7 +238,7 @@
function GetPhrase($label, $allow_editing = true, $use_admin = false)
{
- if (!isset($this->LanguageId)) {
+ if ( !isset($this->LanguageId) ) {
//actually possible when custom field contains references to language labels and its being rebuilt in OnAfterConfigRead
//which is triggered by Sections rebuild, which in turn read all the configs and all of that happens BEFORE seeting the language...
return 'impossible case';
@@ -247,21 +247,31 @@
// cut exclamation marks - depricated form of passing phrase name from templates
$label = preg_replace('/^!(.*)!$/', '\\1', $label);
- if (strlen($label) == 0) {
+ if ( strlen($label) == 0 ) {
return '';
}
$original_label = $this->_escapePhraseName ? addslashes($label) : $label;
$label = mb_strtoupper($label);
+ if ( substr($label, 0, 5) == 'HINT:' || substr($label, 0, 7) == 'COLUMN:' ) {
+ // don't just check for ":" since phrases could have ":" in their names (e.g. advanced permission labels)
+ list ($field_prefix, $label) = explode(':', $label, 2);
+ $translation_field = mb_convert_case($field_prefix, MB_CASE_TITLE) . 'Translation';
+ }
+ else {
+ $translation_field = 'Translation';
+ }
+
$cache_key = ($allow_editing ? '' : 'NE:') . $label;
- if (array_key_exists($cache_key, $this->Phrases)) {
- $translated_label = $this->Phrases[$cache_key];
+ if ( isset($this->Phrases[$cache_key]) ) {
+ $translated_label = $this->Phrases[$cache_key][$translation_field];
if ($this->_editExisting && $allow_editing && !array_key_exists($label, $this->_missingPhrases)) {
// option to change translation for Labels
- $edit_url = 'javascript:translate_phrase(\'' . $original_label . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPreparePhrase\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
+ $original_label = explode(':', $original_label, 2);
+ $edit_url = 'javascript:translate_phrase(\'' . end($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPreparePhrase\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
$translated_label = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Edit translation">' . $translated_label . '</' . $this->_translateHtmlTag . '>';
if ($this->fromTag) {
@@ -274,12 +284,12 @@
$this->LoadPhraseByLabel($label, $original_label, $allow_editing, $use_admin);
- return $this->GetPhrase($label, $allow_editing);
+ return $this->GetPhrase($original_label, $allow_editing);
}
function LoadPhraseByLabel($label, $original_label, $allow_editing = true, $use_admin = false)
{
- if (!$allow_editing && !$use_admin && !array_key_exists($label, $this->_missingPhrases) && array_key_exists($label, $this->Phrases)) {
+ if ( !$allow_editing && !$use_admin && !isset($this->_missingPhrases[$label]) && isset($this->Phrases[$label]) ) {
// label is aready translated, but it's version without on the fly translation code is requested
$this->Phrases['NE:' . $label] = $this->Phrases[$label];
@@ -288,7 +298,7 @@
$language_id = $use_admin ? $this->AdminLanguageId : $this->LanguageId;
- $sql = 'SELECT PhraseId, l' . $language_id . '_Translation
+ $sql = 'SELECT PhraseId, l' . $language_id . '_Translation AS Translation, l' . $language_id . '_HintTranslation AS HintTranslation, l' . $language_id . '_ColumnTranslation AS ColumnTranslation
FROM ' . TABLE_PREFIX . 'Phrase
WHERE (PhraseKey = ' . $this->Conn->qstr($label) . ') AND (l' . $language_id . '_Translation IS NOT NULL)';
$res = $this->Conn->GetRow($sql);
@@ -297,7 +307,8 @@
$translation = '!' . $label . '!';
if ($this->_editMissing && $allow_editing) {
- $edit_url = str_replace('#LABEL#', $original_label, $this->_editLinkMask);
+ $original_label = explode(':', $original_label, 2);
+ $edit_url = str_replace('#LABEL#', end($original_label), $this->_editLinkMask);
$translation = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Translate">!' . $label . '!</' . $this->_translateHtmlTag . '>';
if ($this->fromTag) {
@@ -314,7 +325,7 @@
}
$cache_key = ($allow_editing ? '' : 'NE:') . $label;
- $this->Phrases[$cache_key] = $res['l' . $language_id . '_Translation'];
+ $this->Phrases[$cache_key] = $res;
array_push($this->Ids, $res['PhraseId']);
$this->Ids = array_unique($this->Ids); // just to make sure
Index: kernel/utility/formatters/multilang_formatter.php
===================================================================
--- kernel/utility/formatters/multilang_formatter.php (revision 14472)
+++ kernel/utility/formatters/multilang_formatter.php (working copy)
@@ -189,8 +189,13 @@
$grids[$name]['Fields'][$field_name]['format'] = 'no_default';
}
+ if ( !isset($grid['Fields'][$field_name]['title']) ) {
+ $grids[$name]['Fields'][$field_name]['title'] = 'column:la_fld_' . $field_name;
+ }
+
array_rename_key($grids[$name]['Fields'], $field_name, $lang_field_name);
}
+
// update sort fields - used for sorting and filtering in SQLs
foreach ($grid['Fields'] as $grid_fld_name => $fld_options) {
if (isset($fld_options['sort_field']) && $fld_options['sort_field'] == $field_name) {
Index: kernel/utility/multibyte.php
===================================================================
--- kernel/utility/multibyte.php (revision 14472)
+++ kernel/utility/multibyte.php (working copy)
@@ -67,4 +67,20 @@
return strlen($str);
}
+ function mb_convert_case ($str, $mode = MB_CASE_UPPER, $encoding = null)
+ {
+ if ( $mode == MB_CASE_UPPER ) {
+ return strtoupper($str);
+ }
+ elseif ( $mode == MB_CASE_LOWER ) {
+ return strtolower($str);
+ }
+
+ // $mode == MB_CASE_TITLE
+ $words = explode(' ', $str);
+ $words = array_map('strtolower', $words);
+ $words = array_map('ucfirst', $words);
+
+ return implode(' ', $words);
+ }
}
\ No newline at end of file
Index: units/agents/agents_config.php
===================================================================
--- units/agents/agents_config.php (revision 14472)
+++ units/agents/agents_config.php (working copy)
@@ -142,16 +142,16 @@
0 => 'icon16_disabled.png',
),
'Fields' => Array (
- 'AgentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'AgentName' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'AgentType' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
- 'Event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 280, ),
-// 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 65, ),
- 'RunInterval' => Array ('title' => 'la_col_RunInterval', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
- 'RunMode' => Array ('title' => 'la_col_RunMode', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
- 'LastRunOn' => Array ('title' => 'la_col_LastRunOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'LastRunStatus' => Array ('title' => 'la_col_LastRunStatus', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'NextRunOn' => Array ('title' => 'la_col_NextRunOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'AgentId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'AgentName' => Array ('title' => 'column:la_fld_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'AgentType' => Array ('title' => 'column:la_fld_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+ 'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 280, ),
+// 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 65, ),
+ 'RunInterval' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
+ 'RunMode' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
+ 'LastRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'LastRunStatus' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'NextRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
),
),
),
Index: units/ban_rules/ban_rules_config.php
===================================================================
--- units/ban_rules/ban_rules_config.php (revision 14472)
+++ units/ban_rules/ban_rules_config.php (working copy)
@@ -134,12 +134,12 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'RuleId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'RuleType' => Array ('title' => 'la_col_RuleType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'ItemField' => Array ('title' => 'la_col_ItemField', 'filter_block' => 'grid_options_filter', 'width' => 130, ),
- 'ItemVerb' => Array ('title' => 'la_col_FieldComparision', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'ItemValue' => Array ('title' => 'la_col_FieldValue', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'RuleId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'RuleType' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'ItemField' => Array ('filter_block' => 'grid_options_filter', 'width' => 130, ),
+ 'ItemVerb' => Array ('title' => 'column:la_fld_FieldComparision', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'ItemValue' => Array ('title' => 'column:la_fld_FieldValue', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 90, ),
),
),
),
Index: units/categories/categories_config.php
===================================================================
--- units/categories/categories_config.php (revision 14472)
+++ units/categories/categories_config.php (working copy)
@@ -434,15 +434,15 @@
'NEW' => 'icon16_section_new.png', // section is new
),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 65),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
- 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
@@ -462,16 +462,15 @@
'NEW' => 'icon16_section_new.png', // section is new
),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75),
- 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
-
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
+ 'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
@@ -489,17 +488,15 @@
'NEW' => 'icon16_section_new.png', // section is new
),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75),
- 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter'),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
-
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
+ 'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: units/category_items/category_items_config.php
===================================================================
--- units/category_items/category_items_config.php (revision 14472)
+++ units/category_items/category_items_config.php (working copy)
@@ -79,7 +79,7 @@
),
'Fields' => Array (
- 'CategoryName' => Array( 'title'=>'la_col_Category', 'data_block' => 'grid_checkbox_category_td'),
+ 'CategoryName' => Array( 'title'=>'column:la_fld_Category', 'data_block' => 'grid_checkbox_category_td'),
),
),
),
Index: units/country_states/country_states_config.php
===================================================================
--- units/country_states/country_states_config.php (revision 14472)
+++ units/country_states/country_states_config.php (working copy)
@@ -121,12 +121,12 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'CountryStateId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Name' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'IsoCode' => Array ('title' => 'la_col_IsoCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Type' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'StateCountryId' => Array ('title' => 'la_col_StateCountry', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
- 'ShortIsoCode' => Array ('title' => 'la_col_ShortIsoCode', 'filter_block' => 'grid_like_filter', 'width' => 125, ),
+ 'CountryStateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'IsoCode' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'StateCountryId' => Array ('title' => 'column:la_fld_StateCountry', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
+ 'ShortIsoCode' => Array ('filter_block' => 'grid_like_filter', 'width' => 125, ),
),
),
),
Index: units/custom_fields/custom_fields_config.php
===================================================================
--- units/custom_fields/custom_fields_config.php (revision 14472)
+++ units/custom_fields/custom_fields_config.php (working copy)
@@ -151,11 +151,11 @@
'default' => 'icon16_item.png',
),
'Fields' => Array (
- 'CustomFieldId' => Array ( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'CustomFieldId' => Array ( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'FieldName' => Array ( 'title'=>'la_prompt_FieldName', 'width' => 250, ),
'FieldLabel' => Array ( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td', 'width' => 250, ),
'DisplayOrder' => Array ('title' => 'la_prompt_DisplayOrder', 'filter_block' => 'grid_range_filter', 'width' => 105, ),
-// 'IsSystem' => Array ('title' => 'la_col_IsSystem', 'filter_block' => 'grid_options_filter'),
+// 'IsSystem' => Array ('title' => 'column:la_fld_IsSystem', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: units/email_events/email_events_config.php
===================================================================
--- units/email_events/email_events_config.php (revision 14472)
+++ units/email_events/email_events_config.php (working copy)
@@ -61,7 +61,7 @@
),
// for mass mailing
- 'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
+ 'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
),
@@ -230,12 +230,12 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Event' => Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Module' => Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'Enabled' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'EventId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
@@ -247,14 +247,14 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'EventId' => Array ( 'title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Event' => Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Subject' => Array ( 'title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
- 'Enabled' => Array ( 'title' => 'la_col_Enabled', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'Module' => Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'FrontEndOnly' => Array ('title' => 'la_col_FrontEndOnly', 'filter_block' => 'grid_options_filter', 'width' => 120, 'hidden' => 1),
+ 'EventId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Subject' => Array ('filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
+ 'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'FrontEndOnly' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, 'hidden' => 1),
),
),
),
Index: units/email_queue/email_queue_config.php
===================================================================
--- units/email_queue/email_queue_config.php (revision 14472)
+++ units/email_queue/email_queue_config.php (working copy)
@@ -79,10 +79,10 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'EmailQueueId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', 'width' => 80, ),
'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
Index: units/files/files_config.php
===================================================================
--- units/files/files_config.php (revision 14472)
+++ units/files/files_config.php (working copy)
@@ -87,9 +87,9 @@
'Default' => Array (
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Fields' => Array(
- 'FileId' => Array ('title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
- 'FileName' => Array ('title' => 'la_col_FileName', 'filter_block' => 'grid_like_filter'),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
+ 'FileId' => Array ('title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
+ 'FileName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Status' => Array ('filter_block' => 'grid_options_filter'),
),
),
),
Index: units/forms/form_fields/form_fields_config.php
===================================================================
--- units/forms/form_fields/form_fields_config.php (revision 14472)
+++ units/forms/form_fields/form_fields_config.php (working copy)
@@ -99,15 +99,15 @@
'Default' => Array(
'Icons' => Array('default'=>'icon16_item.png'),
'Fields' => Array(
- 'FormFieldId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
+ 'FormFieldId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
'FieldName' => Array( 'title'=>'la_prompt_FieldName', 'filter_block' => 'grid_like_filter', 'width' => 100 ),
'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'label_grid_data_td', 'filter_block' => 'grid_like_filter', 'width' => 150 ),
'Priority' => Array('title' => 'la_prompt_Priority', 'filter_block' => 'grid_range_filter', 'width' => 80 ),
'ElementType' => Array('title' => 'la_prompt_ElementType', 'filter_block' => 'grid_options_filter'),
'Required' => Array('title' => 'la_prompt_Required', 'filter_block' => 'grid_options_filter'),
'DisplayInGrid' => Array('title' => 'la_prompt_DisplayInGrid', 'filter_block' => 'grid_options_filter', 'width' => 150 ),
- 'Visibility' => Array('title' => 'la_col_Visibility', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'EmailCommunicationRole' => Array('title' => 'la_col_EmailCommunicationRole', 'filter_block' => 'grid_options_filter', 'width' => 150),
+ 'Visibility' => Array('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'EmailCommunicationRole' => Array('filter_block' => 'grid_options_filter', 'width' => 150),
),
),
),
Index: units/forms/form_submissions/form_submissions_config.php
===================================================================
--- units/forms/form_submissions/form_submissions_config.php (revision 14472)
+++ units/forms/form_submissions/form_submissions_config.php (working copy)
@@ -155,12 +155,12 @@
'Default' => Array(
'Icons' => Array('default' => 'icon16_item.png', 1 => 'icon16_replied.gif', 2 => 'icon16_not_replied.gif', 3 => 'icon16_new_email.gif', 4 => 'icon16_bounce.gif'),
'Fields' => Array(
- 'FormSubmissionId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'sort_field' => 'FormFieldId', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
- 'SubmissionTime' => Array( 'title'=>'la_prompt_SumbissionTime', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
- 'IPAddress' => Array ('title' => 'la_col_IPAddress', 'filter_block' => 'grid_like_filter', 'width' => 100 ),
- 'ReferrerURL' => Array ('title' => 'la_col_ReferrerURL', 'filter_block' => 'grid_like_filter', 'first_chars' => 100, 'width' => 200 ),
- 'LogStatus' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100 ),
- 'LastUpdatedOn' => Array ('title' => 'la_col_LastUpdatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
+ 'FormSubmissionId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'sort_field' => 'FormFieldId', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
+ 'SubmissionTime' => Array ('title' => 'la_prompt_SumbissionTime', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
+ 'IPAddress' => Array ('filter_block' => 'grid_like_filter', 'width' => 100 ),
+ 'ReferrerURL' => Array ('filter_block' => 'grid_like_filter', 'first_chars' => 100, 'width' => 200 ),
+ 'LogStatus' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 100 ),
+ 'LastUpdatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145 ),
),
),
),
Index: units/forms/forms/forms_config.php
===================================================================
--- units/forms/forms/forms_config.php (revision 14472)
+++ units/forms/forms/forms_config.php (working copy)
@@ -206,11 +206,11 @@
2 => 'icon16_pending.png',
),
'Fields' => Array(
- 'FormId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Title' => Array( 'title' => 'la_col_Title', 'filter_block' => 'grid_like_filter', 'width' => 220, ),
- 'Description' => Array( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
- 'RequireLogin' => Array ('title' => 'la_col_RequireLogin', 'filter_block' => 'grid_options_filter', 'width' => 80,),
- 'UseSecurityImage' => Array ('title' => 'la_col_UseSecurityImage', 'filter_block' => 'grid_options_filter', 'width' => 110,),
+ 'FormId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Title' => Array ('filter_block' => 'grid_like_filter', 'width' => 220, ),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 300, ),
+ 'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 80,),
+ 'UseSecurityImage' => Array ('filter_block' => 'grid_options_filter', 'width' => 110,),
'EnableEmailCommunication' => Array ('title' => 'la_col_EnableEmailCommunication', 'filter_block' => 'grid_options_filter', 'width' => 120,),
),
),
Index: units/forms/submission_log/submission_log_config.php
===================================================================
--- units/forms/submission_log/submission_log_config.php (revision 14472)
+++ units/forms/submission_log/submission_log_config.php (working copy)
@@ -111,19 +111,19 @@
'Default' => Array (
'Icons' => Array (0 => 'icon16_not_replied.gif', 1 => 'icon16_replied.gif'),
'Fields' => Array (
- 'SubmissionLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
- 'Subject' => Array ('title' => 'la_col_Subject', 'data_block' => 'grid_subject_td', 'filter_block' => 'grid_like_filter',),
- 'Message' => Array ('title' => 'la_col_Message', 'filter_block' => 'grid_like_filter', 'first_chars' => 100),
- 'ReplyStatus' => Array ('title' => 'la_col_ReplyStatus', 'filter_block' => 'grid_options_filter',),
- 'SentStatus' => Array ('title' => 'la_col_SentStatus', 'filter_block' => 'grid_options_filter',),
- 'FromEmail' => Array ('title' => 'la_col_FromEmail', 'filter_block' => 'grid_like_filter',),
- 'ToEmail' => Array ('title' => 'la_col_ToEmail', 'filter_block' => 'grid_like_filter',),
- 'SentOn' => Array ('title' => 'la_col_SentOn', 'filter_block' => 'grid_date_range_filter',),
- 'RepliedOn' => Array ('title' => 'la_col_RepliedOn', 'filter_block' => 'grid_date_range_filter',),
- 'Cc' => Array ('title' => 'la_col_Cc', 'filter_block' => 'grid_like_filter', 'hidden' => 1),
- 'Bcc' => Array ('title' => 'la_col_Bcc', 'filter_block' => 'grid_like_filter', 'hidden' => 1),
- 'BounceInfo' => Array ('title' => 'la_col_BounceInfo', 'filter_block' => 'grid_like_filter', 'hidden' => 1),
- 'BounceDate' => Array ('title' => 'la_col_BounceDate', 'filter_block' => 'grid_date_range_filter', 'hidden' => 1),
+ 'SubmissionLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
+ 'Subject' => Array ('data_block' => 'grid_subject_td', 'filter_block' => 'grid_like_filter',),
+ 'Message' => Array ('filter_block' => 'grid_like_filter', 'first_chars' => 100),
+ 'ReplyStatus' => Array ('filter_block' => 'grid_options_filter',),
+ 'SentStatus' => Array ('filter_block' => 'grid_options_filter',),
+ 'FromEmail' => Array ('filter_block' => 'grid_like_filter',),
+ 'ToEmail' => Array ('filter_block' => 'grid_like_filter',),
+ 'SentOn' => Array ('filter_block' => 'grid_date_range_filter',),
+ 'RepliedOn' => Array ('filter_block' => 'grid_date_range_filter',),
+ 'Cc' => Array ('filter_block' => 'grid_like_filter', 'hidden' => 1),
+ 'Bcc' => Array ('filter_block' => 'grid_like_filter', 'hidden' => 1),
+ 'BounceInfo' => Array ('filter_block' => 'grid_like_filter', 'hidden' => 1),
+ 'BounceDate' => Array ('filter_block' => 'grid_date_range_filter', 'hidden' => 1),
),
),
),
Index: units/groups/groups_config.php
===================================================================
--- units/groups/groups_config.php (revision 14472)
+++ units/groups/groups_config.php (working copy)
@@ -127,18 +127,18 @@
'Default' => Array (
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 200, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 200, ),
'UserCount' => Array ('title' => 'la_col_UserCount', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
- 'FrontRegistration' => Array ('title' => 'la_col_FrontRegistration', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'FrontRegistration' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
'UserGroups' => Array (
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 150, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 150, ),
),
),
@@ -146,9 +146,9 @@
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Selector' => 'radio',
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 150, ),
- 'Description' => Array ('title' => 'la_col_Description', 'width' => 250, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 150, ),
+ 'Description' => Array ('width' => 250, ),
),
),
@@ -159,9 +159,9 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 150, ),
- 'Description' => Array ('title' => 'la_col_Description', 'width' => 250, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 150, ),
+ 'Description' => Array ('width' => 250, ),
),
),
),
Index: units/helpers/col_picker_helper.php
===================================================================
--- units/helpers/col_picker_helper.php (revision 14472)
+++ units/helpers/col_picker_helper.php (working copy)
@@ -182,7 +182,7 @@
// we NEED to recall dummy here to apply fields changes imposed by formatters,
// such as replacing multilingual field titles etc.
- $dummy =& $this->Application->recallObject($prefix, null, array('skip_autoload'=>1));
+ $dummy =& $this->Application->recallObject($prefix, null, Array ('skip_autoload' => 1));
$counter = 0;
$hidden = array();
@@ -197,7 +197,7 @@
}
$fields[$counter] = $name;
- $titles[$name] = $options['title'];
+ $titles[$name] = isset($options['title']) ? $options['title'] : 'column:la_fld_' . $name;
$widths[$name] = isset($options['width']) ? $options['width'] : $this->defaultColumnWidth; // only once per grid !
if (isset($options['hidden']) && $options['hidden']) {
Index: units/helpers/language_import_helper.php
===================================================================
--- units/helpers/language_import_helper.php (revision 14472)
+++ units/helpers/language_import_helper.php (working copy)
@@ -24,6 +24,10 @@
* ==========
* All data, that will end up in Language table is now attributes of LANGUAGE node
* and is name exactly as field name, that will be used to store that data.
+*
+* v4
+* ==========
+* Hint & Column translation added to each phrase translation
*/
defined('FULL_PATH') or die('restricted access!');
@@ -111,7 +115,7 @@
*
* @var int
*/
- var $_latestVersion = 3;
+ var $_latestVersion = 4;
/**
* Prefix-based serial numbers, that should be changed after import is finished
@@ -178,7 +182,7 @@
// copy data from temp tables to live
foreach ($this->_languages as $language_id) {
- $this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation'));
+ $this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation', 'l%s_HintTranslation', 'l%s_ColumnTranslation'));
$this->_performUpgrade($language_id, 'emailevents', 'EventId', Array ('l%s_Subject', 'Headers', 'MessageType', 'l%s_Body'));
$this->_performUpgrade($language_id, 'country-state', 'CountryStateId', Array ('l%s_Name'));
}
@@ -317,14 +321,40 @@
$ret .= "\t\t" . '<PHRASES>' . "\n";
foreach ($phrases as $phrase_id => $phrase) {
$translation = $phrase['l' . $language_id . '_Translation'];
+ $hint_translation = $phrase['l' . $language_id . '_HintTranslation'];
+ $column_translation = $phrase['l' . $language_id . '_ColumnTranslation'];
if (!$translation) {
// phrase is not translated on given language
continue;
}
- $data = $this->_exportEncoding == 'base64' ? base64_encode($translation) : '<![CDATA[' . $translation . ']]>';
- $ret .= "\t\t\t" . '<PHRASE Label="' . $phrase['Phrase'] . '" Module="' . $phrase['Module'] . '" Type="' . $phrase['PhraseType'] . '">' . $data . '</PHRASE>' . "\n";
+ if ( $this->_exportEncoding == 'base64' ) {
+ $data = base64_encode($translation);
+ $hint_translation = base64_encode($hint_translation);
+ $column_translation = base64_encode($column_translation);
+ }
+ else {
+ $data = '<![CDATA[' . $translation . ']]>';
+ $hint_translation = htmlspecialchars($hint_translation);
+ $column_translation = htmlspecialchars($column_translation);
+ }
+
+ $attributes = Array (
+ 'Label="' . $phrase['Phrase'] . '"',
+ 'Module="' . $phrase['Module'] . '"',
+ 'Type="' . $phrase['PhraseType'] . '"'
+ );
+
+ if ( $phrase['l' . $language_id . '_HintTranslation'] ) {
+ $attributes[] = 'Hint="' . $hint_translation . '"';
+ }
+
+ if ( $phrase['l' . $language_id . '_ColumnTranslation'] ) {
+ $attributes[] = 'Column="' . $column_translation . '"';
+ }
+
+ $ret .= "\t\t\t" . '<PHRASE ' . implode(' ', $attributes) . '>' . $data . '</PHRASE>' . "\n";
}
$ret .= "\t\t" . '</PHRASES>' . "\n";
@@ -804,18 +834,26 @@
);
$translation = $phrase_node->Data;
+ $hint_translation = isset($phrase_node->Attributes['HINT']) ? $phrase_node->Attributes['HINT'] : '';
+ $column_translation = isset($phrase_node->Attributes['COLUMN']) ? $phrase_node->Attributes['COLUMN'] : '';
if (array_key_exists($fields_hash['PhraseType'], $this->phrase_types_allowed)) {
if ($language_encoding != 'plain') {
$translation = base64_decode($translation);
+ $hint_translation = base64_decode($hint_translation);
+ $column_translation = base64_decode($column_translation);
}
if (array_key_exists($phrase_key, $other_translations)) {
$other_translations[$phrase_key]['l' . $language_id . '_Translation'] = $translation;
+ $other_translations[$phrase_key]['l' . $language_id . '_HintTranslation'] = $hint_translation;
+ $other_translations[$phrase_key]['l' . $language_id . '_ColumnTranslation'] = $column_translation;
}
else {
$other_translations[$phrase_key] = Array (
- 'l' . $language_id . '_Translation' => $translation
+ 'l' . $language_id . '_Translation' => $translation,
+ 'l' . $language_id . '_HintTranslation' => $hint_translation,
+ 'l' . $language_id . '_ColumnTranslation' => $column_translation,
);
}
Index: units/images/images_config.php
===================================================================
--- units/images/images_config.php (revision 14472)
+++ units/images/images_config.php (working copy)
@@ -172,7 +172,7 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array(
- 'ImageId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'ImageId' => Array( 'title'=>'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'image_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'AltName' => Array( 'title'=>'la_col_AltName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
Index: units/languages/languages_config.php
===================================================================
--- units/languages/languages_config.php (revision 14472)
+++ units/languages/languages_config.php (working copy)
@@ -83,7 +83,7 @@
),
'events_list' => Array (
'prefixes' => Array ('lang', 'emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!",
- ),
+ ),
'email_messages_edit' => Array (
'prefixes' => Array ('lang', 'emailevents'),
'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailevents_titlefield#'",
@@ -228,13 +228,13 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array(
- 'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'PackName' => Array ('title' => 'la_col_PackName', 'filter_block' => 'grid_options_filter', 'width' => 150, ),//
+ 'LanguageId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'PackName' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),//
'PrimaryLang' => Array ('title' => 'la_col_IsPrimaryLanguage', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'AdminInterfaceLang' => Array ('title' => 'la_col_AdminInterfaceLang', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'Charset' => Array ('title' => 'la_col_Charset', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
- 'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+ 'AdminInterfaceLang' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'Charset' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Priority' => Array ('filter_block' => 'grid_like_filter', 'width' => 60, ),
+ 'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
),
),
@@ -247,10 +247,10 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array (
- 'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
- 'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 120),
- 'LocalName' => Array ('title' => 'la_col_Prefix', 'filter_block' => 'grid_options_filter', 'width' => 120),
- 'IconURL' => Array ('title' => 'la_col_Image', 'filter_block' => 'grid_empty_filter', 'width' => 80),
+ 'LanguageId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+ 'PackName' => Array ('title' => 'column:la_fld_Language', 'filter_block' => 'grid_options_filter', 'width' => 120),
+ 'LocalName' => Array ('title' => 'column:la_fld_Prefix', 'filter_block' => 'grid_options_filter', 'width' => 120),
+ 'IconURL' => Array ('title' => 'column:la_fld_Image', 'filter_block' => 'grid_empty_filter', 'width' => 80),
),
),*/
),
Index: units/logs/change_logs/change_logs_config.php
===================================================================
--- units/logs/change_logs/change_logs_config.php (revision 14472)
+++ units/logs/change_logs/change_logs_config.php (working copy)
@@ -40,7 +40,7 @@
'TableName' => TABLE_PREFIX.'ChangeLogs',
'TitlePresets' => Array (
- 'default' => Array (
+ 'default' => Array (
'edit_status_labels' => Array ('change-log' => '!la_title_EditingChangeLog!'),
),
@@ -140,20 +140,20 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'ChangeLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'ChangeLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'PortalUserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 70, ),
- 'UserLogin' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'UserFirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserLastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserEmail' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'SessionLogId' => Array ('title' => 'la_col_SessionLogId', 'filter_block' => 'grid_range_filter', 'width' => 120, ),
- 'Action' => Array ('title' => 'la_col_Action', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'OccuredOn' => Array ('title' => 'la_col_OccuredOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'MasterPrefix' => Array ('title' => 'la_col_MasterPrefix', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'MasterId' => Array ('title' => 'la_col_MasterId', 'filter_block' => 'grid_range_filter', 'width' => 90, ),
+ 'UserLogin' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'UserFirstName' => Array ('title' => 'column:la_fld_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserLastName' => Array ('title' => 'column:la_fld_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserEmail' => Array ('title' => 'column:la_fld_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'SessionLogId' => Array ('filter_block' => 'grid_range_filter', 'width' => 120, ),
+ 'Action' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'OccuredOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+ 'MasterPrefix' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'MasterId' => Array ('filter_block' => 'grid_range_filter', 'width' => 90, ),
'Prefix' => Array ('title' => 'la_col_ItemPrefix', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'ItemId' => Array ('title' => 'la_col_ItemId', 'filter_block' => 'grid_range_filter', 'width' => 120, ),
- 'Changes' => Array ('title' => 'la_col_Changes', 'data_block' => 'grid_changes_td', 'filter_block' => 'grid_like_filter', 'format' => 'auto_cut', 'width' => 225, ),
+ 'ItemId' => Array ('filter_block' => 'grid_range_filter', 'width' => 120, ),
+ 'Changes' => Array ('data_block' => 'grid_changes_td', 'filter_block' => 'grid_like_filter', 'format' => 'auto_cut', 'width' => 225, ),
),
),
),
Index: units/logs/email_logs/email_logs_config.php
===================================================================
--- units/logs/email_logs/email_logs_config.php (revision 14472)
+++ units/logs/email_logs/email_logs_config.php (working copy)
@@ -77,13 +77,13 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'EmailLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'EmailLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
'fromuser' => Array ('title' => 'la_prompt_FromUsername', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'addressto' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 170, ),
+ 'subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'event' => Array ('filter_block' => 'grid_like_filter', 'width' => 170, ),
'timestamp' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- // 'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
+// 'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
),
),
),
Index: units/logs/search_logs/search_logs_config.php
===================================================================
--- units/logs/search_logs/search_logs_config.php (revision 14472)
+++ units/logs/search_logs/search_logs_config.php (working copy)
@@ -81,7 +81,7 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'SearchLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'SearchLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
'Keyword' => Array ('title' => 'la_col_Keyword', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
'SearchType' => Array ('title' => 'la_prompt_SearchType', 'filter_block' => 'grid_options_filter', 'width' => 110, ),
Index: units/logs/session_logs/session_logs_config.php
===================================================================
--- units/logs/session_logs/session_logs_config.php (revision 14472)
+++ units/logs/session_logs/session_logs_config.php (working copy)
@@ -137,16 +137,16 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'SessionLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'SessionLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'PortalUserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 70, ),
- 'UserLogin' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'UserFirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserLastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserEmail' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserLogin' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'UserFirstName' => Array ('title' => 'column:la_fld_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserLastName' => Array ('title' => 'column:la_fld_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserEmail' => Array ('title' => 'column:la_fld_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
'SessionStart' => Array ('title' => 'la_col_SessionStart', 'filter_block' => 'grid_date_range_filter', 'width' => 120, ),
'SessionEnd' => Array ('title' => 'la_col_SessionEnd', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Duration' => Array ('title' => 'la_col_Duration', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Duration' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
'IP' => Array ('title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'AffectedItems' => Array ('title' => 'la_col_AffectedItems', 'data_block' => 'affected_td', 'width' => 120, ),
),
Index: units/mailing_lists/mailing_lists_config.php
===================================================================
--- units/mailing_lists/mailing_lists_config.php (revision 14472)
+++ units/mailing_lists/mailing_lists_config.php (working copy)
@@ -131,14 +131,14 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'MailingId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'MessageText' => Array ('title' => 'la_col_MessageText', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
+ 'MailingId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'MessageText' => Array ('filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
'MessageHtml' => Array ('title' => 'la_col_MessageHtml', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'EmailsQueued' => Array ('title' => 'la_col_EmailsQueued', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'EmailsSent' => Array ('title' => 'la_col_EmailsSent', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'EmailsTotal' => Array ('title' => 'la_col_EmailsTotal', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'EmailsQueued' => Array ('filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'EmailsSent' => Array ('filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'EmailsTotal' => Array ('filter_block' => 'grid_range_filter', 'width' => 80, ),
),
),
),
Index: units/modules/modules_config.php
===================================================================
--- units/modules/modules_config.php (revision 14472)
+++ units/modules/modules_config.php (working copy)
@@ -100,11 +100,11 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'Name' => Array('title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td_no_icon', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Version' => Array('title' => 'la_col_Version', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Path' => Array('title' => 'la_col_SystemPath', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Name' => Array('data_block' => 'grid_checkbox_td_no_icon', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Version' => Array('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Path' => Array('title' => 'la_col_SystemPath', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'BuildDate' => Array('title' => 'la_col_BuildDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Loaded' => Array('title' => 'la_col_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Loaded' => Array('title' => 'column:la_fld_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
),
Index: units/phrases/phrases_config.php
===================================================================
--- units/phrases/phrases_config.php (revision 14472)
+++ units/phrases/phrases_config.php (working copy)
@@ -92,6 +92,8 @@
'' => Array (
'PrimaryTranslation' => 'l%4$s_Translation',
'CurrentTranslation' => 'l%5$s_Translation',
+ 'CurrentHintTranslation' => 'l%5$s_HintTranslation',
+ 'CurrentColumnTranslation' => 'l%5$s_ColumnTranslation',
),
),
@@ -114,6 +116,8 @@
),
'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
'Translation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
+ 'HintTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
+ 'ColumnTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
'PhraseType' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1,
@@ -131,6 +135,8 @@
'VirtualFields' => Array (
'PrimaryTranslation' => Array ('type' => 'string', 'default' => ''),
'CurrentTranslation' => Array ('type' => 'string', 'default' => ''),
+ 'CurrentHintTranslation' => Array ('type' => 'string', 'default' => ''),
+ 'CurrentColumnTranslation' => Array ('type' => 'string', 'default' => ''),
// for language pack import/export
'LangFile' => Array (
@@ -170,13 +176,15 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'PhraseId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+ 'PhraseId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
'Phrase' => Array ('title' => 'la_col_Label', 'data_block' => 'grid_checkbox_td', 'width' => 200),
- 'CurrentTranslation' => Array ('title' => 'la_col_Phrase', 'width' => 200),
+ 'CurrentTranslation' => Array ('title' => 'column:la_fld_Phrase', 'width' => 200),
'PrimaryTranslation' => Array ('title' => 'la_col_PrimaryValue', 'width' => 200),
- 'PhraseType' => Array ('title' => 'la_col_PhraseType', 'filter_block' => 'grid_options_filter', 'width' => 60),
- 'LastChanged' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
- 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'PhraseType' => Array ('filter_block' => 'grid_options_filter', 'width' => 60),
+ 'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CurrentHintTranslation' => Array ('title' => 'la_col_HintPhrase', 'width' => 200, 'hidden' => 1),
+ 'CurrentColumnTranslation' => Array ('title' => 'la_col_ColumnPhrase', 'width' => 200, 'hidden' => 1),
),
),
@@ -188,12 +196,14 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'PhraseId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+ 'PhraseId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
'Phrase' => Array ('title' => 'la_col_Label', 'filter_block' => 'grid_like_filter', 'width' => 170),
- 'CurrentTranslation' => Array ('title' => 'la_col_Phrase', 'filter_block' => 'grid_like_filter', 'width' => 180),
- 'PhraseType' => Array ('title' => 'la_col_Location', 'filter_block' => 'grid_options_filter', 'width' => 80),
- 'LastChanged' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
- 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CurrentTranslation' => Array ('title' => 'column:la_fld_Phrase', 'filter_block' => 'grid_like_filter', 'width' => 180),
+ 'PhraseType' => Array ('title' => 'column:la_fld_Location', 'filter_block' => 'grid_options_filter', 'width' => 80),
+ 'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CurrentHintTranslation' => Array ('title' => 'la_col_HintPhrase', 'width' => 200, 'hidden' => 1),
+ 'CurrentColumnTranslation' => Array ('title' => 'la_col_ColumnPhrase', 'width' => 200, 'hidden' => 1),
),
),
),
Index: units/related_searches/related_searches_config.php
===================================================================
--- units/related_searches/related_searches_config.php (revision 14472)
+++ units/related_searches/related_searches_config.php (working copy)
@@ -83,9 +83,9 @@
1 => 'icon16_item.png'
),
'Fields' => Array(
- 'RelatedSearchId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'RelatedSearchId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
'Keyword' => Array( 'title'=>'la_col_Keyword', 'data_block' => 'grid_keyword_td', 'filter_block' => 'grid_like_filter'),
- 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
+ 'Enabled' => Array( 'title'=>'column:la_fld_Status', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: units/relationship/relationship_config.php
===================================================================
--- units/relationship/relationship_config.php (revision 14472)
+++ units/relationship/relationship_config.php (working copy)
@@ -98,11 +98,11 @@
'0_1' => 'icon16_relation_reciprocal_disabled.gif'
), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
'Fields' => Array(
- 'RelationshipId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'ItemType' => Array( 'title'=>'la_col_TargetType', 'filter_block' => 'grid_like_filter', 'width' => 80, ),
- 'Type' => Array( 'title'=>'la_col_RelationshipType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'RelationshipId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'ItemName' => Array( 'title' => 'column:la_fld_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'ItemType' => Array( 'title' => 'la_col_TargetType', 'filter_block' => 'grid_like_filter', 'width' => 80, ),
+ 'Type' => Array( 'title' => 'column:la_fld_RelationshipType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Enabled' => Array('filter_block' => 'grid_options_filter', 'width' => 70, ),
),
),
),
Index: units/reviews/reviews_config.php
===================================================================
--- units/reviews/reviews_config.php (revision 14472)
+++ units/reviews/reviews_config.php (working copy)
@@ -183,12 +183,12 @@
2 => 'icon16_pending.png',
),
'Fields' => Array (
- 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'ReviewText' => Array ( 'title' => 'la_col_ReviewText', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
+ 'ReviewId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ReviewText' => Array ('filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
'ReviewedBy' => Array ( 'title' => 'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'CreatedOn' => Array ( 'title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Rating' => Array ( 'title' => 'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Rating' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
@@ -200,12 +200,12 @@
2 => 'icon16_pending.png',
),
'Fields' => Array (
- 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'ReviewText' => Array ( 'title' => 'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
+ 'ReviewId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ReviewText' => Array ('data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
'ReviewedBy' => Array ( 'title' => 'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'CreatedOn' => Array ( 'title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Rating' => Array ( 'title' => 'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Rating' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
),
Index: units/selectors/selectors_config.php
===================================================================
--- units/selectors/selectors_config.php (revision 14472)
+++ units/selectors/selectors_config.php (working copy)
@@ -129,19 +129,19 @@
'Icons' => Array(
'default'=>'icon16_selector.gif'),
'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'SelectorName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
),
),
'BlockStyles' => Array(
'Icons' => Array('default'=>'icon16_selector.gif'),
'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
- 'ParentId' => Array('title'=>'la_col_Basedon', 'filter_block' => 'grid_options_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'SelectorName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
+ 'ParentId' => Array ('title' => 'la_col_Basedon', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: units/site_domains/site_domains_config.php
===================================================================
--- units/site_domains/site_domains_config.php (revision 14472)
+++ units/site_domains/site_domains_config.php (working copy)
@@ -142,13 +142,13 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'DomainId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'DomainName' => Array ('title' => 'la_col_DomainName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'SSLUrl' => Array ('title' => 'la_col_SSLUrl', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Country' => Array ('title' => 'la_col_Country', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryLanguageId' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryThemeId' => Array ('title' => 'la_col_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'DomainId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'DomainName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'SSLUrl' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Country' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryLanguageId' => Array ('title' => 'column:la_fld_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryThemeId' => Array ('title' => 'column:la_fld_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'Priority' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
),
),
),
Index: units/skins/skins_config.php
===================================================================
--- units/skins/skins_config.php (revision 14472)
+++ units/skins/skins_config.php (working copy)
@@ -169,9 +169,9 @@
1 => 'icon16_primary.png',
),
'Fields' => Array(
- 'SkinId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array( 'title'=>'la_col_SkinName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'IsPrimary' => Array( 'title'=>'la_col_IsPrimary', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'SkinId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ('title' => 'column:la_fld_SkinName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'IsPrimary' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: units/spelling_dictionary/spelling_dictionary_config.php
===================================================================
--- units/spelling_dictionary/spelling_dictionary_config.php (revision 14472)
+++ units/spelling_dictionary/spelling_dictionary_config.php (working copy)
@@ -45,7 +45,7 @@
'spelling_dictionary_list' => Array (
'prefixes' => Array ('spelling-dictionary_List'), 'format' => "!la_title_SpellingDictionary!",
- 'toolbar_buttons' => Array ('new_spelling_dictionary', 'edit', 'delete', 'export', 'view', 'dbl-click'),
+ 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'export', 'view', 'dbl-click'),
),
'spelling_dictionary_edit' => Array (
'prefixes' => Array ('spelling-dictionary'), 'format' => "#spelling-dictionary_status# '#spelling-dictionary_titlefield#'",
@@ -55,8 +55,8 @@
'PermSection' => Array('main' => 'in-portal:spelling_dictionary'),
- /*
- 'Sections' => Array (
+
+ /*'Sections' => Array (
'in-portal:spelling_dictionary' => Array (
'parent' => 'in-portal:website_setting_folder',
'icon' => 'spelling_dictionary',
@@ -66,9 +66,9 @@
'priority' => 7,
'type' => stTREE,
),
- ),
- */
+ ),*/
+
'ListSQLs' => Array (
'' => ' SELECT %1$s.* %2$s FROM %1$s',
),
@@ -89,9 +89,9 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_spelling_dictionary.gif'),
'Fields' => Array (
- 'SpellingDictionaryId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
- 'MisspelledWord' => Array ('title' => 'la_col_MisspelledWord', 'filter_block' => 'grid_like_filter',),
- 'SuggestedCorrection' => Array ('title' => 'la_col_SuggestedCorrection', 'filter_block' => 'grid_like_filter',),
+ 'SpellingDictionaryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
+ 'MisspelledWord' => Array ('filter_block' => 'grid_like_filter',),
+ 'SuggestedCorrection' => Array ('filter_block' => 'grid_like_filter',),
),
),
),
Index: units/statistics/statistics_config.php
===================================================================
--- units/statistics/statistics_config.php (revision 14472)
+++ units/statistics/statistics_config.php (working copy)
@@ -68,9 +68,9 @@
'Default' => Array(
'Icons' => Array('default' => 'icon16_item.png'),
'Fields' => Array(
- 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'),
- 'LastName' => Array( 'title'=>'la_col_LastName'),
- 'FirstName' => Array( 'title'=>'la_col_FirstName'),
+ 'Login' => Array('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td'),
+ 'LastName' => Array(),
+ 'FirstName' => Array(),
),
),
Index: units/stop_words/stop_words_config.php
===================================================================
--- units/stop_words/stop_words_config.php (revision 14472)
+++ units/stop_words/stop_words_config.php (working copy)
@@ -91,8 +91,8 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'StopWordId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'StopWord' => Array ('title' => 'la_col_StopWord', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'StopWordId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'StopWord' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
),
),
),
Index: units/structure/structure_config.php
===================================================================
--- units/structure/structure_config.php (revision 14472)
+++ units/structure/structure_config.php (working copy)
@@ -68,7 +68,7 @@
'IDField' => 'CategoryId',
- 'StatusField' => Array('IsMenu'),
+ 'StatusField' => Array('Status'),
'TitleField' => 'Name', // field, used in bluebar when editing existing item
@@ -217,13 +217,13 @@
'Default' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
- 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
@@ -231,26 +231,26 @@
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Selector' => 'radio',
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
- 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
'AllPages' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter' ),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block'=>'page_path_td', 'sort_field' => 'CachedNavbar', 'filter_block' => 'grid_like_filter' ),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'hidden' => true ),
- 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_path_td', 'sort_field' => 'CachedNavbar', 'filter_block' => 'grid_like_filter' ),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: units/stylesheets/stylesheets_config.php
===================================================================
--- units/stylesheets/stylesheets_config.php (revision 14472)
+++ units/stylesheets/stylesheets_config.php (working copy)
@@ -157,10 +157,10 @@
1 => 'icon16_item.png'
),
'Fields' => Array(
- 'Name' => Array('title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array('title'=>'la_col_Description', 'first_chars' => 100, 'filter_block' => 'grid_like_filter'),
- 'Enabled' => Array('title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
- 'LastCompiled' => Array('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('first_chars' => 100, 'filter_block' => 'grid_like_filter'),
+ 'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter'),
+ 'LastCompiled' => Array ('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'),
),
),
),
Index: units/theme_files/theme_files_config.php
===================================================================
--- units/theme_files/theme_files_config.php (revision 14472)
+++ units/theme_files/theme_files_config.php (working copy)
@@ -75,10 +75,10 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'FileId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'FileName' => Array( 'title'=>'la_col_FileName', 'width' => 150, ),
- 'FilePath' => Array( 'title'=>'la_col_FilePath', 'width' => 300, ),
- 'Description' => Array( 'title'=>'la_col_Description', 'width' => 300, ),
+ 'FileId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'FileName' => Array ('width' => 150, ),
+ 'FilePath' => Array ('width' => 300, ),
+ 'Description' => Array ('width' => 300, ),
),
),
Index: units/themes/themes_config.php
===================================================================
--- units/themes/themes_config.php (revision 14472)
+++ units/themes/themes_config.php (working copy)
@@ -92,7 +92,7 @@
'TableName' => TABLE_PREFIX.'Theme',
'SubItems' => Array('theme-file'),
-
+
'AutoDelete' => true,
'AutoClone' => true,
@@ -141,11 +141,11 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array(
- 'ThemeId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Description' => Array( 'title'=>'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
-// 'PrimaryTheme' => Array( 'title'=>'la_col_Primary', 'filter_block' => 'grid_options_filter'),
+ 'ThemeId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Description' => Array('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Enabled' => Array( 'title'=>'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
+// 'PrimaryTheme' => Array( 'title'=>'column:la_fld_Primary', 'filter_block' => 'grid_options_filter'),
'LanguagePackInstalled' => Array ('title' => 'la_col_LanguagePackInstalled', 'filter_block' => 'grid_options_filter', 'width' => 200,),
),
),
Index: units/thesaurus/thesaurus_config.php
===================================================================
--- units/thesaurus/thesaurus_config.php (revision 14472)
+++ units/thesaurus/thesaurus_config.php (working copy)
@@ -101,10 +101,10 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'ThesaurusId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'SearchTerm' => Array ('title' => 'la_col_SearchTerm', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'ThesaurusTerm' => Array ('title' => 'la_col_ThesaurusTerm', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-// 'ThesaurusType' => Array ('title' => 'la_col_ThesaurusType', 'filter_block' => 'grid_options_filter',),
+ 'ThesaurusId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'SearchTerm' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'ThesaurusTerm' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+// 'ThesaurusType' => Array ('filter_block' => 'grid_options_filter',),
),
),
),
Index: units/translator/translator_config.php
===================================================================
--- units/translator/translator_config.php (revision 14472)
+++ units/translator/translator_config.php (working copy)
@@ -30,7 +30,7 @@
),
'IDField' => 'N/A',
- 'TitlePresets' => Array (
+ 'TitlePresets' => Array (
'trans_edit' => Array (
'prefixes' => Array('trans'), 'format' => '!la_title_EditingTranslation!',
'toolbar_buttons' => Array ('select', 'cancel'),
@@ -46,6 +46,5 @@
'Language' => Array(),
'SwitchLanguage' => Array('formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language', 'option_key_field' => 'LanguageId','option_title_field' => 'PackName'),
'Translation' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => ''),
- ),
- 'Grids' => Array(),
+ ),
);
\ No newline at end of file
Index: units/user_groups/user_groups_config.php
===================================================================
--- units/user_groups/user_groups_config.php (revision 14472)
+++ units/user_groups/user_groups_config.php (working copy)
@@ -48,9 +48,9 @@
'GroupUsers' => Array(
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array(
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'UserName' => Array ('title'=>'la_col_UserFirstLastName', 'width' => 200, ),
- 'UserLogin' => Array ('title'=>'la_col_Login', 'width' => 100, ),
+ 'UserLogin' => Array ('title'=>'column:la_fld_Login', 'width' => 100, ),
'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
@@ -120,9 +120,9 @@
1 => 'icon16_primary.png'
),
'Fields' => Array(
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'GroupName' => Array ('title'=>'la_col_GroupName', 'width' => 100, ),
- 'GroupDescription' => Array ('title'=>'la_col_Description', 'width' => 150, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'GroupName' => Array ('width' => 100, ),
+ 'GroupDescription' => Array ('title' => 'column:la_fld_Description', 'width' => 150, ),
'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
Index: units/users/users_config.php
===================================================================
--- units/users/users_config.php (revision 14472)
+++ units/users/users_config.php (working copy)
@@ -450,13 +450,13 @@
2 => 'icon16_user_pending.png'
),
'Fields' => Array(
- 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'LastName' => Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'),
- 'FirstName' => Array( 'title'=>'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
- 'Email' => Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'),
- 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'),
- 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter'),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Email' => Array ('filter_block' => 'grid_like_filter'),
+ 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -469,13 +469,13 @@
),
'Selector' => 'radio',
'Fields' => Array(
- 'Login' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -487,12 +487,12 @@
2 => 'icon16_admin_disabled.png',
),
'Fields' => Array (
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -504,14 +504,14 @@
2 => 'icon16_user_pending.png'
),
'Fields' => Array(
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 140),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100),
),
),
),
Index: units/visits/visits_config.php
===================================================================
--- units/visits/visits_config.php (revision 14472)
+++ units/visits/visits_config.php (working copy)
@@ -157,7 +157,7 @@
'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'UserName' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'UserName' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
),
),
@@ -167,8 +167,8 @@
'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'UserName' => Array ( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 105, ),
+ 'UserName' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 105, ),
'OrderTotalAmountSum' => Array ( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter', 'width' => 95, ),
'OrderAffiliateCommissionSum' => Array ( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter', 'width' => 160, ),
),
phrase_storage_automation_modules.patch [^] (281,860 bytes) 2011-08-09 12:33
phrase_storage_automation_incommerce_only.patch [^] (126,722 bytes) 2011-08-09 12:42
[Show Content]
Index: admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
--- admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (revision 14472)
+++ admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (working copy)
@@ -162,8 +162,8 @@
<inp2:apbrackets_SaveWarning name="grid_save_warning"/>
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
<tr nowrap="nowrap" class="grid-header-row-0">
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_FromAmount"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_ToAmount"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_FromAmount"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_ToAmount"/>
<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_Percent"/>
</tr>
<inp2:apbrackets_ShowPricingForm block="prbracket" IdField="AffiliateBracketId"/>
Index: admin_templates/orders/orders_edit_preview.tpl
===================================================================
--- admin_templates/orders/orders_edit_preview.tpl (revision 14472)
+++ admin_templates/orders/orders_edit_preview.tpl (working copy)
@@ -228,7 +228,7 @@
<tr class="subsectiontitle">
<td width="70%"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if> nowrap><inp2:m_Phrase label="la_col_Product"/></td>
<td width="10%" nowrap style="text-align: center"><inp2:m_Phrase label="la_col_Quantity"/></td>
- <td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="la_col_Price"/></td>
+ <td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="column:la_fld_Price"/></td>
<td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="la_col_ExtendedPrice"/></td>
</tr>
Index: admin_templates/products/products_pricing_grid.tpl
===================================================================
--- admin_templates/products/products_pricing_grid.tpl (revision 14472)
+++ admin_templates/products/products_pricing_grid.tpl (working copy)
@@ -89,17 +89,17 @@
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
<tr nowrap="nowrap" class="grid-header-row-0">
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_minqty" width="15%"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_maxqty" width="15%"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_cost" width="10%"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_price" width="10%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MinQty" width="15%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MaxQty" width="15%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Cost" width="10%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Price" width="10%"/>
<!--##
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_points" width="10%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Points" width="10%"/>
##-->
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_negotiated"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Negotiated"/>
</tr>
<inp2:pr.tang_ShowPricingForm block="prbracket" IdField="PriceId"/>
-
+
<script type="text/javascript">
<inp2:m_if check="m_Get" name="pr_tang">
a_toolbar.EnableButton('delete');
Index: admin_templates/shipping/shipping_brackets.tpl
===================================================================
--- admin_templates/shipping/shipping_brackets.tpl (revision 14472)
+++ admin_templates/shipping/shipping_brackets.tpl (working copy)
@@ -254,8 +254,8 @@
<div id="scroll_container">
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
<tr nowrap="nowrap" class="grid-header-row-0">
- <inp2:m_RenderElement name="br_grid_th" phrase="la_col_Start"/>
- <inp2:m_RenderElement name="br_grid_th" phrase="la_col_End"/>
+ <inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_Start"/>
+ <inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_End"/>
</tr>
<inp2:br_ShowBracketsForm block="bracket" IdField="BracketId"/>
</table>
Index: install/english.lang
===================================================================
--- install/english.lang (revision 14472)
+++ install/english.lang (working copy)
@@ -1,4 +1,4 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_AccountLogin" Module="In-Commerce" Type="1">QWNjb3VudA==</PHRASE>
@@ -82,77 +82,28 @@
<PHRASE Label="la_COD" Module="In-Commerce" Type="1">Q09E</PHRASE>
<PHRASE Label="la_COD_Flat_Surcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
<PHRASE Label="la_COD_Percent_Surcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
- <PHRASE Label="la_col_AccessDuration" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9u</PHRASE>
- <PHRASE Label="la_col_AccessDurationUnit" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
- <PHRASE Label="la_col_AddedOn" Module="In-Commerce" Type="1">QWRkZWQgT24=</PHRASE>
- <PHRASE Label="la_col_AffiliateUser" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFVzZXI=</PHRASE>
- <PHRASE Label="la_col_Amount" Module="In-Commerce" Type="1">QW1vdW50</PHRASE>
- <PHRASE Label="la_col_Availability" Module="In-Commerce" Type="1">QXZhaWwu</PHRASE>
- <PHRASE Label="la_col_BaseFee" Module="In-Commerce" Type="1">QmFzZSBGZWU=</PHRASE>
- <PHRASE Label="la_col_BillingCountry" Module="In-Commerce" Type="1">QmlsbGluZyBDb3VudHJ5</PHRASE>
<PHRASE Label="la_col_BuiltIn" Module="In-Commerce" Type="1">QnVpbHQtSW4=</PHRASE>
- <PHRASE Label="la_col_CODallowed" Module="In-Commerce" Type="1">Q09EIEFsbG93ZWQ=</PHRASE>
- <PHRASE Label="la_col_Code" Module="In-Commerce" Type="1">Q29kZQ==</PHRASE>
- <PHRASE Label="la_col_CODFlatSurcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyZWNoYXJnZQ==</PHRASE>
<PHRASE Label="la_col_CODFlatSurecharge" Module="In-Commerce" Type="1">Q09EIGZsYXQgc3VyZWNoYXJnZQ==</PHRASE>
- <PHRASE Label="la_col_CODPercentSurcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
<PHRASE Label="la_col_Combination" Module="In-Commerce" Type="1">Q29tYmluYXRpb24=</PHRASE>
- <PHRASE Label="la_col_Comment" Module="In-Commerce" Type="1">Q29tbWVudA==</PHRASE>
<PHRASE Label="la_col_Commission" Module="In-Commerce" Type="1">QWZmaWxsaWF0ZSBDb21taXNzaW9u</PHRASE>
- <PHRASE Label="la_col_Cost" Module="In-Commerce" Type="1">Q29zdA==</PHRASE>
- <PHRASE Label="la_col_CouponCode" Module="In-Commerce" Type="1">Q291cG9uIENvZGU=</PHRASE>
<PHRASE Label="la_col_CouponItemType" Module="In-Commerce" Type="1">Q291cG9uIEl0ZW0gVHlwZQ==</PHRASE>
- <PHRASE Label="la_col_CreditCardNumber" Module="In-Commerce" Type="1">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
- <PHRASE Label="la_col_Currency" Module="In-Commerce" Type="1">Q3VycmVuY3k=</PHRASE>
- <PHRASE Label="la_col_CurrencyName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_CurrencySymbol" Module="In-Commerce" Type="1">U3ltYm9s</PHRASE>
- <PHRASE Label="la_col_CurrencySymbolPosition" Module="In-Commerce" Type="1">U3ltYm9sIFBvc2l0aW9u</PHRASE>
<PHRASE Label="la_col_CustomerName" Module="In-Commerce" Type="1">Q3VzdG9tZXIgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_DisplayOnFront" Module="In-Commerce" Type="1">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
<PHRASE Label="la_col_DownloadedFileName" Module="In-Commerce" Type="1">RmlsZW5hbWU=</PHRASE>
<PHRASE Label="la_col_DownloadedProductName" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1l</PHRASE>
- <PHRASE Label="la_col_End" Module="In-Commerce" Type="1">RW5k</PHRASE>
<PHRASE Label="la_col_EndedOn" Module="In-Commerce" Type="1">RW5kZWQgT24=</PHRASE>
- <PHRASE Label="la_col_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
<PHRASE Label="la_col_ExtendedPrice" Module="In-Commerce" Type="1">RXh0LiBQcmljZQ==</PHRASE>
- <PHRASE Label="la_col_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
- <PHRASE Label="la_col_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
<PHRASE Label="la_col_FromUser" Module="In-Commerce" Type="1">RnJvbSBVc2Vy</PHRASE>
<PHRASE Label="la_col_GMV" Module="In-Commerce" Type="1">R01W</PHRASE>
- <PHRASE Label="la_col_Group" Module="In-Commerce" Type="1">R3JvdXA=</PHRASE>
- <PHRASE Label="la_col_IPAddress" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_col_IsFreePromoShipping" Module="In-Commerce" Type="1">UHJvbW8=</PHRASE>
<PHRASE Label="la_col_ItemName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_ItemType" Module="In-Commerce" Type="1">RGlzY291bnQgSXRlbSBUeXBl</PHRASE>
<PHRASE Label="la_col_LastUpdated" Module="In-Commerce" Type="1">TGFzdCBVcGRhdGVk</PHRASE>
- <PHRASE Label="la_col_LastUsedBy" Module="In-Commerce" Type="1">TGFzdCBVc2VkIEJ5</PHRASE>
- <PHRASE Label="la_col_LastUsedOn" Module="In-Commerce" Type="1">TGFzdCBVc2VkIE9u</PHRASE>
- <PHRASE Label="la_col_Listable" Module="In-Commerce" Type="1">TGlzdGFibGU=</PHRASE>
- <PHRASE Label="la_col_ListingQuantity" Module="In-Commerce" Type="1">TGlzdGluZyBRdHk=</PHRASE>
- <PHRASE Label="la_col_Manufacturer" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVy</PHRASE>
<PHRASE Label="la_col_ManufacturerName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_Marketplace" Module="In-Commerce" Type="1">TWFya2V0cGxhY2U=</PHRASE>
- <PHRASE Label="la_col_MaxQty" Module="In-Commerce" Type="1">TWF4IFF0eQ==</PHRASE>
- <PHRASE Label="la_col_MinQty" Module="In-Commerce" Type="1">TWluIFF0eQ==</PHRASE>
- <PHRASE Label="la_col_Negotiated" Module="In-Commerce" Type="1">TmVnb3RpYXRlZA==</PHRASE>
- <PHRASE Label="la_col_NumberOfUses" Module="In-Commerce" Type="1">TnVtYmVyIE9mIFVzZXM=</PHRASE>
- <PHRASE Label="la_col_OnHold" Module="In-Commerce" Type="1">T24gSG9sZA==</PHRASE>
- <PHRASE Label="la_col_OnSale" Module="In-Commerce" Type="1">T24gU2FsZQ==</PHRASE>
- <PHRASE Label="la_col_OptionType" Module="In-Commerce" Type="1">T3B0aW9uIFR5cGU=</PHRASE>
<PHRASE Label="la_col_OrderDate" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
- <PHRASE Label="la_col_OrderIP" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_col_OrderNumber" Module="In-Commerce" Type="1">TnVtYmVy</PHRASE>
<PHRASE Label="la_col_OrderTotal" Module="In-Commerce" Type="1">T3JkZXIgVG90YWw=</PHRASE>
- <PHRASE Label="la_col_PaymentDate" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRl</PHRASE>
- <PHRASE Label="la_col_PaymentReference" Module="In-Commerce" Type="1">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
- <PHRASE Label="la_col_PaymentType" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBl</PHRASE>
<PHRASE Label="la_col_PaymentTypeName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_Percent" Module="In-Commerce" Type="1">UGVyY2VudA==</PHRASE>
- <PHRASE Label="la_col_PercentSurcharge" Module="In-Commerce" Type="1">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
<PHRASE Label="la_col_PlanName" Module="In-Commerce" Type="1">UGxhbiBOYW1l</PHRASE>
- <PHRASE Label="la_col_PlanType" Module="In-Commerce" Type="1">UGxhbiBUeXBl</PHRASE>
- <PHRASE Label="la_col_Points" Module="In-Commerce" Type="1">UG9pbnRz</PHRASE>
- <PHRASE Label="la_col_Price" Module="In-Commerce" Type="1">UHJpY2U=</PHRASE>
<PHRASE Label="la_col_Processing" Module="In-Commerce" Type="1">UHJvY2Vzc2luZw==</PHRASE>
<PHRASE Label="la_col_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
<PHRASE Label="la_col_ProductBackOrderDate" Module="In-Commerce" Type="1">QmFja09yZGVyIERhdGU=</PHRASE>
@@ -160,49 +111,19 @@
<PHRASE Label="la_col_ProductName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_ProductNameId" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1lIChJRCk=</PHRASE>
<PHRASE Label="la_col_ProductSKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
- <PHRASE Label="la_col_ProductType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_ProductWeight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
<PHRASE Label="la_col_Profit" Module="In-Commerce" Type="1">UHJvZml0</PHRASE>
- <PHRASE Label="la_col_Qty" Module="In-Commerce" Type="1">UXR5</PHRASE>
- <PHRASE Label="la_col_QtyBackordered" Module="In-Commerce" Type="1">QmFja29yZGVyZWQ=</PHRASE>
- <PHRASE Label="la_col_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
- <PHRASE Label="la_col_QtyInStockMin" Module="In-Commerce" Type="1">UXR5SW5TdG9ja01pbg==</PHRASE>
- <PHRASE Label="la_col_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
- <PHRASE Label="la_col_QtyReserved" Module="In-Commerce" Type="1">UXR5IFJlc2VydmVk</PHRASE>
<PHRASE Label="la_col_Quantity" Module="In-Commerce" Type="1">UXR5Lg==</PHRASE>
<PHRASE Label="la_col_QuantityAvailable" Module="In-Commerce" Type="1">QXZhaWwu</PHRASE>
<PHRASE Label="la_col_QuantityReserved" Module="In-Commerce" Type="1">UmVzZXJ2ZWQ=</PHRASE>
- <PHRASE Label="la_col_RateToPrimary" Module="In-Commerce" Type="1">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
- <PHRASE Label="la_col_RegisteredOn" Module="In-Commerce" Type="1">UmVnaXN0ZXJlZCBPbg==</PHRASE>
- <PHRASE Label="la_col_RemainingAmount" Module="In-Commerce" Type="1">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
- <PHRASE Label="la_col_Required" Module="In-Commerce" Type="1">UmVxdWlyZWQ=</PHRASE>
<PHRASE Label="la_col_ReturnAmount" Module="In-Commerce" Type="1">UmV0LiBBbW91bnQ=</PHRASE>
<PHRASE Label="la_col_ReturnedOn" Module="In-Commerce" Type="1">UmV0LiBEYXRl</PHRASE>
<PHRASE Label="la_col_ReturnType" Module="In-Commerce" Type="1">UmV0LiBUeXBl</PHRASE>
<PHRASE Label="la_col_Shipping" Module="In-Commerce" Type="1">U2hpcHBpbmc=</PHRASE>
- <PHRASE Label="la_col_ShippingCountry" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
<PHRASE Label="la_col_ShippingFromLocation" Module="In-Commerce" Type="1">RnJvbSBMb2NhdGlvbg==</PHRASE>
- <PHRASE Label="la_col_ShippingName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_ShippingQuoteEngineName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_ShippingType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
- <PHRASE Label="la_col_ShipZoneName" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
<PHRASE Label="la_col_Size" Module="In-Commerce" Type="1">U2l6ZQ==</PHRASE>
- <PHRASE Label="la_col_SKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
- <PHRASE Label="la_col_SpeedCode" Module="In-Commerce" Type="1">U2hpcHBpbmcgU3BlZWQ=</PHRASE>
- <PHRASE Label="la_col_Start" Module="In-Commerce" Type="1">U3RhcnQ=</PHRASE>
<PHRASE Label="la_col_StartedOn" Module="In-Commerce" Type="1">U3RhcnRlZCBPbg==</PHRASE>
<PHRASE Label="la_col_Tax" Module="In-Commerce" Type="1">VGF4</PHRASE>
- <PHRASE Label="la_col_TaxApplyToProcessing" Module="In-Commerce" Type="1">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
- <PHRASE Label="la_col_TaxApplyToShipping" Module="In-Commerce" Type="1">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
- <PHRASE Label="la_col_TaxValue" Module="In-Commerce" Type="1">VGF4IFZhbHVl</PHRASE>
- <PHRASE Label="la_col_TaxZoneName" Module="In-Commerce" Type="1">VGF4IFpvbmUgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_ToAmount" Module="In-Commerce" Type="1">VG8gQW1vdW50</PHRASE>
- <PHRASE Label="la_col_TotalAmount" Module="In-Commerce" Type="1">VG90YWwgQW1vdW50</PHRASE>
- <PHRASE Label="la_col_UnitsLimit" Module="In-Commerce" Type="1">TGltaXQ=</PHRASE>
- <PHRASE Label="la_col_URL" Module="In-Commerce" Type="1">VVJM</PHRASE>
- <PHRASE Label="la_col_Weight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
- <PHRASE Label="la_col_ZoneName" Module="In-Commerce" Type="1">Wm9uZSBOYW1l</PHRASE>
- <PHRASE Label="la_col_ZoneType" Module="In-Commerce" Type="1">Wm9uZSBUeXBl</PHRASE>
<PHRASE Label="la_Combined" Module="In-Commerce" Type="1">Q29tYmluZWQ=</PHRASE>
<PHRASE Label="la_comment_LeaveBlank" Module="In-Commerce" Type="1">KGxlYXZlIGJsYW5rIGZvciB1bmxpbWl0ZWQp</PHRASE>
<PHRASE Label="la_comm_Any" Module="In-Commerce" Type="1">QW55</PHRASE>
@@ -260,14 +181,14 @@
<PHRASE Label="la_FJD" Module="In-Commerce" Type="1">RmlqaSBEb2xsYXI=</PHRASE>
<PHRASE Label="la_FKP" Module="In-Commerce" Type="1">RmFsa2xhbmQgSXNsYW5kcyBQb3VuZA==</PHRASE>
<PHRASE Label="la_Flat" Module="In-Commerce" Type="1">RmxhdA==</PHRASE>
- <PHRASE Label="la_fld_AccessDuration" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9u</PHRASE>
+ <PHRASE Label="la_fld_AccessDuration" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9u">QWNjZXNzIER1cmF0aW9u</PHRASE>
<PHRASE Label="la_fld_AccessDurationType" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFR5cGU=</PHRASE>
- <PHRASE Label="la_fld_AccessDurationUnit" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
+ <PHRASE Label="la_fld_AccessDurationUnit" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9uIFVuaXQ=">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
<PHRASE Label="la_fld_AccessEnd" Module="In-Commerce" Type="1">QWNjZXNzIEVuZA==</PHRASE>
<PHRASE Label="la_fld_AccessGroup" Module="In-Commerce" Type="1">QWNjZXNzIEdyb3Vw</PHRASE>
<PHRASE Label="la_fld_AccessStart" Module="In-Commerce" Type="1">QWNjZXNzIFN0YXJ0</PHRASE>
<PHRASE Label="la_fld_AccumulatedAmount" Module="In-Commerce" Type="1">QWNjdW11bGF0ZWQgQW1vdW50</PHRASE>
- <PHRASE Label="la_fld_AddedOn" Module="In-Commerce" Type="1">QWRkZWQgT24=</PHRASE>
+ <PHRASE Label="la_fld_AddedOn" Module="In-Commerce" Type="1" Column="QWRkZWQgT24=">QWRkZWQgT24=</PHRASE>
<PHRASE Label="la_fld_Address1" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>
<PHRASE Label="la_fld_Address2" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>
<PHRASE Label="la_fld_AdminComment" Module="In-Commerce" Type="1">QWRtaW4gQ29tbWVudA==</PHRASE>
@@ -277,23 +198,23 @@
<PHRASE Label="la_fld_AffiliateLink" Module="In-Commerce" Type="1">QWZmaWxpYXRlIExpbms=</PHRASE>
<PHRASE Label="la_fld_AffiliatePlan" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW4=</PHRASE>
<PHRASE Label="la_fld_AffiliatePlanPayment" Module="In-Commerce" Type="1">UGF5bWVudA==</PHRASE>
- <PHRASE Label="la_fld_AffiliateUser" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFVzZXI=</PHRASE>
+ <PHRASE Label="la_fld_AffiliateUser" Module="In-Commerce" Type="1" Column="QWZmaWxpYXRlIFVzZXI=">QWZmaWxpYXRlIFVzZXI=</PHRASE>
<PHRASE Label="la_fld_AllowedShippingTypes" Module="In-Commerce" Type="1">U2VsZWN0ZWQ=</PHRASE>
- <PHRASE Label="la_fld_Amount" Module="In-Commerce" Type="1">QW1vdW50</PHRASE>
+ <PHRASE Label="la_fld_Amount" Module="In-Commerce" Type="1" Column="QW1vdW50">QW1vdW50</PHRASE>
<PHRASE Label="la_fld_AmountToPay" Module="In-Commerce" Type="1">QW1vdW50IFRvIFBheQ==</PHRASE>
<PHRASE Label="la_fld_AssignedCoupon" Module="In-Commerce" Type="1">QXNzaWduZWQgQ291cG9u</PHRASE>
<PHRASE Label="la_fld_AuthorizationResult" Module="In-Commerce" Type="1">QXV0aG9yaXphdGlvbiBSZXN1bHQ=</PHRASE>
- <PHRASE Label="la_fld_Availability" Module="In-Commerce" Type="1">QXZhaWxhYmxl</PHRASE>
+ <PHRASE Label="la_fld_Availability" Module="In-Commerce" Type="1" Column="QXZhaWwu">QXZhaWxhYmxl</PHRASE>
<PHRASE Label="la_fld_AvailableGroups" Module="In-Commerce" Type="1">QXZhaWxhYmxlIFVzZXIgR3JvdXBz</PHRASE>
<PHRASE Label="la_fld_AvailableShippingTypes" Module="In-Commerce" Type="1">QXZhaWxhYmxl</PHRASE>
<PHRASE Label="la_fld_BackOrder" Module="In-Commerce" Type="1">QmFja09yZGVy</PHRASE>
<PHRASE Label="la_fld_BackOrderDate" Module="In-Commerce" Type="1">QmFja29yZGVyIGF2YWlsYWJpbGl0eSBkYXRl</PHRASE>
- <PHRASE Label="la_fld_BaseFee" Module="In-Commerce" Type="1">QmFzZSBGZWU=</PHRASE>
+ <PHRASE Label="la_fld_BaseFee" Module="In-Commerce" Type="1" Column="QmFzZSBGZWU=">QmFzZSBGZWU=</PHRASE>
<PHRASE Label="la_fld_BillingAddress1" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMQ==</PHRASE>
<PHRASE Label="la_fld_BillingAddress2" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMg==</PHRASE>
<PHRASE Label="la_fld_BillingCity" Module="In-Commerce" Type="1">QmlsbGluZyBDaXR5</PHRASE>
<PHRASE Label="la_fld_BillingCompany" Module="In-Commerce" Type="1">QmlsbGluZyBDb21wYW55</PHRASE>
- <PHRASE Label="la_fld_BillingCountry" Module="In-Commerce" Type="1">QmlsbGluZyBDb3VudHJ5</PHRASE>
+ <PHRASE Label="la_fld_BillingCountry" Module="In-Commerce" Type="1" Column="QmlsbGluZyBDb3VudHJ5">QmlsbGluZyBDb3VudHJ5</PHRASE>
<PHRASE Label="la_fld_BillingEmail" Module="In-Commerce" Type="1">QmlsbGluZyBFbWFpbA==</PHRASE>
<PHRASE Label="la_fld_BillingFax" Module="In-Commerce" Type="1">QmlsbGluZyBGYXg=</PHRASE>
<PHRASE Label="la_fld_BillingPhone" Module="In-Commerce" Type="1">QmlsbGluZyBQaG9uZQ==</PHRASE>
@@ -303,35 +224,35 @@
<PHRASE Label="la_fld_BlockShippingAddress" Module="In-Commerce" Type="1">QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n</PHRASE>
<PHRASE Label="la_fld_CaptureResult" Module="In-Commerce" Type="1">Q2FwdHVyZSBSZXN1bHQ=</PHRASE>
<PHRASE Label="la_fld_ChargeOnNextApprove" Module="In-Commerce" Type="1">Q2hhcmdlIG9uIE5leHQgQXBwcm92ZQ==</PHRASE>
- <PHRASE Label="la_fld_CODallowed" Module="In-Commerce" Type="1">Q09EIEFsbG93ZWQ=</PHRASE>
- <PHRASE Label="la_fld_Code" Module="In-Commerce" Type="1">Q29kZQ==</PHRASE>
- <PHRASE Label="la_fld_CODFlatSurcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
- <PHRASE Label="la_fld_CODPercentSurcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
- <PHRASE Label="la_fld_Comment" Module="In-Commerce" Type="1">Q29tbWVudA==</PHRASE>
- <PHRASE Label="la_fld_Cost" Module="In-Commerce" Type="1">Q29zdA==</PHRASE>
+ <PHRASE Label="la_fld_CODallowed" Module="In-Commerce" Type="1" Column="Q09EIEFsbG93ZWQ=">Q09EIEFsbG93ZWQ=</PHRASE>
+ <PHRASE Label="la_fld_Code" Module="In-Commerce" Type="1" Column="Q29kZQ==">Q29kZQ==</PHRASE>
+ <PHRASE Label="la_fld_CODFlatSurcharge" Module="In-Commerce" Type="1" Column="Q09EIEZsYXQgU3VyZWNoYXJnZQ==">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
+ <PHRASE Label="la_fld_CODPercentSurcharge" Module="In-Commerce" Type="1" Column="Q09EIFBlcmNlbnQgU3VyY2hhcmdl">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
+ <PHRASE Label="la_fld_Comment" Module="In-Commerce" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
+ <PHRASE Label="la_fld_Cost" Module="In-Commerce" Type="1" Column="Q29zdA==">Q29zdA==</PHRASE>
<PHRASE Label="la_fld_CostType" Module="In-Commerce" Type="1">Q29zdCBUeXBl</PHRASE>
- <PHRASE Label="la_fld_CouponCode" Module="In-Commerce" Type="1">Q291cG9uIENvZGU=</PHRASE>
- <PHRASE Label="la_fld_CreditCardNumber" Module="In-Commerce" Type="1">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
+ <PHRASE Label="la_fld_CouponCode" Module="In-Commerce" Type="1" Column="Q291cG9uIENvZGU=">Q291cG9uIENvZGU=</PHRASE>
+ <PHRASE Label="la_fld_CreditCardNumber" Module="In-Commerce" Type="1" Column="Q3JlZGl0IENhcmQgTnVtYmVy">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
<PHRASE Label="la_fld_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE>
- <PHRASE Label="la_fld_Currency" Module="In-Commerce" Type="1">Q3VycmVuY3k=</PHRASE>
- <PHRASE Label="la_fld_CurrencyName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_CurrencySymbol" Module="In-Commerce" Type="1">U3ltYm9s</PHRASE>
- <PHRASE Label="la_fld_CurrencySymbolPosition" Module="In-Commerce" Type="1">U3ltYm9sIFBvc2l0aW9u</PHRASE>
+ <PHRASE Label="la_fld_Currency" Module="In-Commerce" Type="1" Column="Q3VycmVuY3k=">Q3VycmVuY3k=</PHRASE>
+ <PHRASE Label="la_fld_CurrencyName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_CurrencySymbol" Module="In-Commerce" Type="1" Column="U3ltYm9s">U3ltYm9s</PHRASE>
+ <PHRASE Label="la_fld_CurrencySymbolPosition" Module="In-Commerce" Type="1" Column="U3ltYm9sIFBvc2l0aW9u">U3ltYm9sIFBvc2l0aW9u</PHRASE>
<PHRASE Label="la_fld_cust_p_ItemTemplate" Module="In-Commerce" Type="1">UHJvZHVjdCBJdGVtIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_Date" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_DeliveryMethod" Module="In-Commerce" Type="1">RGVsaXZlcnkgTWV0aG9k</PHRASE>
<PHRASE Label="la_fld_DescriptionExcerpt" Module="In-Commerce" Type="1">RXhjZXJwdA==</PHRASE>
<PHRASE Label="la_fld_Discount" Module="In-Commerce" Type="1">RGlzY291bnQ=</PHRASE>
- <PHRASE Label="la_fld_DisplayOnFront" Module="In-Commerce" Type="1">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
+ <PHRASE Label="la_fld_DisplayOnFront" Module="In-Commerce" Type="1" Column="RGlzcGxheSBvbiBGcm9udC1FbmQ=">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
<PHRASE Label="la_fld_EmptyCellsAre" Module="In-Commerce" Type="1">RW1wdHkgQ2VsbHMgQXJl</PHRASE>
- <PHRASE Label="la_fld_End" Module="In-Commerce" Type="1">RW5kIERhdGU=</PHRASE>
- <PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
+ <PHRASE Label="la_fld_End" Module="In-Commerce" Type="1" Column="RW5k">RW5kIERhdGU=</PHRASE>
+ <PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1" Column="RXhwaXJhdGlvbg==">RXhwaXJhdGlvbg==</PHRASE>
<PHRASE Label="la_fld_Featured" Module="In-Commerce" Type="1">RmVhdHVyZWQ=</PHRASE>
<PHRASE Label="la_fld_FirstDayDelivery" Module="In-Commerce" Type="1">Rmlyc3QgRGF5</PHRASE>
- <PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
+ <PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1" Column="RmxhdCBTdXJjaGFyZ2U=">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
<PHRASE Label="la_fld_FreeShippingMinAmount" Module="In-Commerce" Type="1">TWluaW11bSBPcmRlciBUb3RhbCBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
<PHRASE Label="la_fld_From" Module="In-Commerce" Type="1">RnJvbQ==</PHRASE>
- <PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
+ <PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1" Column="RnJvbSBBbW91bnQ=">RnJvbSBBbW91bnQ=</PHRASE>
<PHRASE Label="la_fld_FromDateTime" Module="In-Commerce" Type="1">RnJvbSBkYXRlL3RpbWU=</PHRASE>
<PHRASE Label="la_fld_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
<PHRASE Label="la_fld_GiftCertificateAmountApplied" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZSBhbW91bnQ=</PHRASE>
@@ -343,70 +264,70 @@
<PHRASE Label="la_fld_Insurance_Fee" Module="In-Commerce" Type="1">SW5zdXJhbmNlIENvc3Q=</PHRASE>
<PHRASE Label="la_fld_Insurance_Type" Module="In-Commerce" Type="1">SW5zdXJhbmNlIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_InventoryStatus" Module="In-Commerce" Type="1">RW5hYmxlZA==</PHRASE>
- <PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE>
+ <PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1" Column="UHJvbW8=">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE>
<PHRASE Label="la_fld_IsRecurringBilling" Module="In-Commerce" Type="1">UmVjdXJyaW5nIEJpbGxpbmc=</PHRASE>
<PHRASE Label="la_fld_ItemsSold" Module="In-Commerce" Type="1">SXRlbXMgU29sZA==</PHRASE>
<PHRASE Label="la_fld_LastPaymentDate" Module="In-Commerce" Type="1">TGFzdCBQYXltZW50IERhdGU=</PHRASE>
- <PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1">TGFzdCBVc2VkIEJ5</PHRASE>
- <PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1">TGFzdCBVc2VkIE9u</PHRASE>
- <PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1">TGlzdGFibGU=</PHRASE>
+ <PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIEJ5">TGFzdCBVc2VkIEJ5</PHRASE>
+ <PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIE9u">TGFzdCBVc2VkIE9u</PHRASE>
+ <PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1" Column="TGlzdGFibGU=">TGlzdGFibGU=</PHRASE>
<PHRASE Label="la_fld_ManageCombinations" Module="In-Commerce" Type="1">TWFuYWdlIE9wdGlvbnMgQ29tYmluYXRpb25z</PHRASE>
<PHRASE Label="la_fld_ManageShipping" Module="In-Commerce" Type="1">TWFuYWdlIFNoaXBwaW5nIFR5cGVz</PHRASE>
- <PHRASE Label="la_fld_Manufacturer" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVy</PHRASE>
- <PHRASE Label="la_fld_MaxQty" Module="In-Commerce" Type="1">TWF4IFF0eQ==</PHRASE>
+ <PHRASE Label="la_fld_Manufacturer" Module="In-Commerce" Type="1" Column="TWFudWZhY3R1cmVy">TWFudWZhY3R1cmVy</PHRASE>
+ <PHRASE Label="la_fld_MaxQty" Module="In-Commerce" Type="1" Column="TWF4IFF0eQ==">TWF4IFF0eQ==</PHRASE>
<PHRASE Label="la_fld_MinimumPaymentAmount" Module="In-Commerce" Type="1">TWluaW1hbCBQYXltZW50IEFtb3VudA==</PHRASE>
- <PHRASE Label="la_fld_MinQty" Module="In-Commerce" Type="1">TWluIFF0eQ==</PHRASE>
+ <PHRASE Label="la_fld_MinQty" Module="In-Commerce" Type="1" Column="TWluIFF0eQ==">TWluIFF0eQ==</PHRASE>
<PHRASE Label="la_fld_MSRP" Module="In-Commerce" Type="1">TVNSUA==</PHRASE>
- <PHRASE Label="la_fld_Negotiated" Module="In-Commerce" Type="1">TmVnb3RpYXRlZA==</PHRASE>
+ <PHRASE Label="la_fld_Negotiated" Module="In-Commerce" Type="1" Column="TmVnb3RpYXRlZA==">TmVnb3RpYXRlZA==</PHRASE>
<PHRASE Label="la_fld_NextCharge" Module="In-Commerce" Type="1">TmV4dCBDaGFyZ2UgRGF0ZQ==</PHRASE>
- <PHRASE Label="la_fld_NumberOfUses" Module="In-Commerce" Type="1">TnVtYmVyIE9mIFVzZXM=</PHRASE>
- <PHRASE Label="la_fld_OnHold" Module="In-Commerce" Type="1">T24gSG9sZA==</PHRASE>
- <PHRASE Label="la_fld_OnSale" Module="In-Commerce" Type="1">UHJvZHVjdCBvbiBTYWxl</PHRASE>
+ <PHRASE Label="la_fld_NumberOfUses" Module="In-Commerce" Type="1" Column="TnVtYmVyIE9mIFVzZXM=">TnVtYmVyIE9mIFVzZXM=</PHRASE>
+ <PHRASE Label="la_fld_OnHold" Module="In-Commerce" Type="1" Column="T24gSG9sZA==">T24gSG9sZA==</PHRASE>
+ <PHRASE Label="la_fld_OnSale" Module="In-Commerce" Type="1" Column="T24gU2FsZQ==">UHJvZHVjdCBvbiBTYWxl</PHRASE>
<PHRASE Label="la_fld_OptionPrice" Module="In-Commerce" Type="1">T3B0aW9uIFByaWNl</PHRASE>
<PHRASE Label="la_fld_OptionsSelectionMode" Module="In-Commerce" Type="1">T3B0aW9ucyBTZWxlY3Rpb24gTW9kZQ==</PHRASE>
- <PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1">T3B0aW9uIFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1" Column="T3B0aW9uIFR5cGU=">T3B0aW9uIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_OptionValue" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVl</PHRASE>
<PHRASE Label="la_fld_OptionValues" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVlcw==</PHRASE>
<PHRASE Label="la_fld_OrderId" Module="In-Commerce" Type="1">T3JkZXIgSUQ=</PHRASE>
- <PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1">TnVtYmVy</PHRASE>
+ <PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1" Column="SVAgQWRkcmVzcw==">SVAgQWRkcmVzcw==</PHRASE>
+ <PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1" Column="TnVtYmVy">TnVtYmVy</PHRASE>
<PHRASE Label="la_fld_Original" Module="In-Commerce" Type="1">T3JpZ2luYWw=</PHRASE>
<PHRASE Label="la_fld_OriginalAmount" Module="In-Commerce" Type="1">T3JpZ2luYWwgQW1vdW50</PHRASE>
<PHRASE Label="la_fld_PaymentAccount" Module="In-Commerce" Type="1">UGF5bWVudCBBY2NvdW50</PHRASE>
<PHRASE Label="la_fld_PaymentCardType" Module="In-Commerce" Type="1">Q2FyZCBUeXBl</PHRASE>
<PHRASE Label="la_fld_PaymentCCExpDate" Module="In-Commerce" Type="1">Q2FyZCBFeHBpcmF0aW9u</PHRASE>
<PHRASE Label="la_fld_PaymentCVV2" Module="In-Commerce" Type="1">Q1ZWMg==</PHRASE>
- <PHRASE Label="la_fld_PaymentDate" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRl</PHRASE>
+ <PHRASE Label="la_fld_PaymentDate" Module="In-Commerce" Type="1" Column="UGF5bWVudCBEYXRl">UGF5bWVudCBEYXRl</PHRASE>
<PHRASE Label="la_fld_PaymentExpires" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRlL0V4cGlyYXRpb24=</PHRASE>
<PHRASE Label="la_fld_PaymentInterval" Module="In-Commerce" Type="1">UGF5bWVudCBJbnRlcnZhbA==</PHRASE>
<PHRASE Label="la_fld_PaymentNameOnCard" Module="In-Commerce" Type="1">TmFtZSBvbiB0aGUgQ2FyZA==</PHRASE>
- <PHRASE Label="la_fld_PaymentReference" Module="In-Commerce" Type="1">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
- <PHRASE Label="la_fld_PaymentType" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_PaymentReference" Module="In-Commerce" Type="1" Column="UGF5bWVudCBSZWZlcmVuY2U=">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
+ <PHRASE Label="la_fld_PaymentType" Module="In-Commerce" Type="1" Column="UGF5bWVudCBUeXBl">UGF5bWVudCBUeXBl</PHRASE>
<PHRASE Label="la_fld_PaymentTypeCurrencies" Module="In-Commerce" Type="1">QXZhaWxhYmxlIEN1cnJlbmNpZXM=</PHRASE>
<PHRASE Label="la_fld_PaymentTypeId" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlIElk</PHRASE>
<PHRASE Label="la_fld_PaymentTypes" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlcw==</PHRASE>
- <PHRASE Label="la_fld_PercentSurcharge" Module="In-Commerce" Type="1">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
+ <PHRASE Label="la_fld_PercentSurcharge" Module="In-Commerce" Type="1" Column="UGVyY2VudCBTdXJjaGFyZ2U=">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
<PHRASE Label="la_fld_Period" Module="In-Commerce" Type="1">UGVyaW9k</PHRASE>
<PHRASE Label="la_fld_PlacedOrdersEdit" Module="In-Commerce" Type="1">QWxsb3cgUGxhY2VkIE9yZGVycyBFZGl0aW5n</PHRASE>
- <PHRASE Label="la_fld_PlanType" Module="In-Commerce" Type="1">UGxhbiBUeXBl</PHRASE>
- <PHRASE Label="la_fld_Points" Module="In-Commerce" Type="1">UG9pbnRz</PHRASE>
- <PHRASE Label="la_fld_Price" Module="In-Commerce" Type="1">UHJpY2U=</PHRASE>
+ <PHRASE Label="la_fld_PlanType" Module="In-Commerce" Type="1" Column="UGxhbiBUeXBl">UGxhbiBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_Points" Module="In-Commerce" Type="1" Column="UG9pbnRz">UG9pbnRz</PHRASE>
+ <PHRASE Label="la_fld_Price" Module="In-Commerce" Type="1" Column="UHJpY2U=">UHJpY2U=</PHRASE>
<PHRASE Label="la_fld_PriceType" Module="In-Commerce" Type="1">UHJpY2UgTW9kaWZpZXIgVHlwZQ==</PHRASE>
<PHRASE Label="la_fld_ProcessingFee" Module="In-Commerce" Type="1">UHJvY2Vzc2luZyBGZWU=</PHRASE>
<PHRASE Label="la_fld_ProductFreeShipping" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
- <PHRASE Label="la_fld_ProductType" Module="In-Commerce" Type="1">UHJvZHVjdCBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_ProductType" Module="In-Commerce" Type="1" Column="VHlwZQ==">UHJvZHVjdCBUeXBl</PHRASE>
<PHRASE Label="la_fld_Product_MaxHotNumber" Module="In-Commerce" Type="1">TWF4aW11bSBudW1iZXIgb2YgVG9wIFNlbGxlciBpdGVtcw==</PHRASE>
<PHRASE Label="la_fld_Product_MinPopRating" Module="In-Commerce" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgaXRlbSBQT1A=</PHRASE>
<PHRASE Label="la_fld_Product_MinPopVotes" Module="In-Commerce" Type="1">TWluaW11bSBudW1iZXIgb2Ygc29sZCBpdGVtcyB0byBjb25zaWRlciBpdGVtIFBPUA==</PHRASE>
- <PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1">UXR5IEJhY2tPcmRlcmVk</PHRASE>
- <PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
- <PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
- <PHRASE Label="la_fld_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
- <PHRASE Label="la_fld_QtyReserved" Module="In-Commerce" Type="1">UXR5IFJlc2VydmVk</PHRASE>
+ <PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1" Column="QmFja29yZGVyZWQ=">UXR5IEJhY2tPcmRlcmVk</PHRASE>
+ <PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1" Column="UXR5IEluIFN0b2Nr">UXR5IEluIFN0b2Nr</PHRASE>
+ <PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1" Column="UXR5SW5TdG9ja01pbg==">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
+ <PHRASE Label="la_fld_QtyOnOrder" Module="In-Commerce" Type="1" Column="UXR5IE9uIE9yZGVy">UXR5IE9uIE9yZGVy</PHRASE>
+ <PHRASE Label="la_fld_QtyReserved" Module="In-Commerce" Type="1" Column="UXR5IFJlc2VydmVk">UXR5IFJlc2VydmVk</PHRASE>
<PHRASE Label="la_fld_QtySold" Module="In-Commerce" Type="1">UXR5IFNvbGQ=</PHRASE>
- <PHRASE Label="la_fld_RateToPrimary" Module="In-Commerce" Type="1">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
- <PHRASE Label="la_fld_RegisteredOn" Module="In-Commerce" Type="1">UmVnaXN0ZXJlZCBPbg==</PHRASE>
- <PHRASE Label="la_fld_RemainingAmount" Module="In-Commerce" Type="1">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
+ <PHRASE Label="la_fld_RateToPrimary" Module="In-Commerce" Type="1" Column="UmF0ZSBUbyBQcmltYXJ5">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
+ <PHRASE Label="la_fld_RegisteredOn" Module="In-Commerce" Type="1" Column="UmVnaXN0ZXJlZCBPbg==">UmVnaXN0ZXJlZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_RemainingAmount" Module="In-Commerce" Type="1" Column="UmVtYWluaW5nIEFtb3VudA==">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
<PHRASE Label="la_fld_ReportType" Module="In-Commerce" Type="1">UmVwb3J0IFR5cGU=</PHRASE>
<PHRASE Label="la_fld_SecondDayDelivery" Module="In-Commerce" Type="1">U2Vjb25kIERheQ==</PHRASE>
<PHRASE Label="la_fld_SelectedGroups" Module="In-Commerce" Type="1">U2VsZWN0ZWQgVXNlciBHcm91cHM=</PHRASE>
@@ -418,50 +339,50 @@
<PHRASE Label="la_fld_ShippingCompany" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29tcGFueQ==</PHRASE>
<PHRASE Label="la_fld_ShippingControl" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29udHJvbA==</PHRASE>
<PHRASE Label="la_fld_ShippingCost" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29zdA==</PHRASE>
- <PHRASE Label="la_fld_ShippingCountry" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingCountry" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgQ291bnRyeQ==">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
<PHRASE Label="la_fld_ShippingCustomerAccount" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ3VzdG9tZXIgQWNjb3VudA==</PHRASE>
<PHRASE Label="la_fld_ShippingDate" Module="In-Commerce" Type="1">U2hpcHBpbmcgRGF0ZS9UaW1l</PHRASE>
<PHRASE Label="la_fld_ShippingEmail" Module="In-Commerce" Type="1">U2hpcHBpbmcgRW1haWw=</PHRASE>
<PHRASE Label="la_fld_ShippingFax" Module="In-Commerce" Type="1">U2hpcHBpbmcgRmF4</PHRASE>
<PHRASE Label="la_fld_ShippingMode" Module="In-Commerce" Type="1">QWxsb3dlZCBTaGlwcGluZyBUeXBlcw==</PHRASE>
- <PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_ShippingOption" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9u</PHRASE>
<PHRASE Label="la_fld_ShippingOptions" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9ucw==</PHRASE>
<PHRASE Label="la_fld_ShippingPhone" Module="In-Commerce" Type="1">U2hpcHBpbmcgUGhvbmU=</PHRASE>
- <PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_ShippingState" Module="In-Commerce" Type="1">U2hpcHBpbmcgU3RhdGU=</PHRASE>
<PHRASE Label="la_fld_ShippingTo" Module="In-Commerce" Type="1">U2hpcHBpbmcgVG8=</PHRASE>
<PHRASE Label="la_fld_ShippingTracking" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHJhY2tpbmcvUmVmZXJlbmNl</PHRASE>
- <PHRASE Label="la_fld_ShippingType" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingType" Module="In-Commerce" Type="1" Column="VHlwZQ==">U2hpcHBpbmcgVHlwZQ==</PHRASE>
<PHRASE Label="la_fld_ShippingTypeId" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZSBJRA==</PHRASE>
<PHRASE Label="la_fld_ShippingTypes" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZXM=</PHRASE>
<PHRASE Label="la_fld_ShippingZip" Module="In-Commerce" Type="1">U2hpcHBpbmcgWmlwY29kZQ==</PHRASE>
- <PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
- <PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
- <PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1">U3BlZWQgQ29kZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgWm9uZSBOYW1l">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1" Column="U0tV">U0tV</PHRASE>
+ <PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgU3BlZWQ=">U3BlZWQgQ29kZQ==</PHRASE>
<PHRASE Label="la_fld_SSN" Module="In-Commerce" Type="1">U1NOL1RheCBJZC9WQVQgTnVtYmVy</PHRASE>
- <PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
+ <PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1" Column="U3RhcnQ=">U3RhcnQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_SubTotal" Module="In-Commerce" Type="1">U3VidG90YWw=</PHRASE>
- <PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
- <PHRASE Label="la_fld_TaxApplyToShipping" Module="In-Commerce" Type="1">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
- <PHRASE Label="la_fld_TaxValue" Module="In-Commerce" Type="1">VGF4IFZhbHVl</PHRASE>
- <PHRASE Label="la_fld_TaxZoneName" Module="In-Commerce" Type="1">TmFtZSBvZiBUYXggWm9uZQ==</PHRASE>
+ <PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gUHJvY2Vzc2luZw==">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
+ <PHRASE Label="la_fld_TaxApplyToShipping" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gU2hpcHBpbmc=">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
+ <PHRASE Label="la_fld_TaxValue" Module="In-Commerce" Type="1" Column="VGF4IFZhbHVl">VGF4IFZhbHVl</PHRASE>
+ <PHRASE Label="la_fld_TaxZoneName" Module="In-Commerce" Type="1" Column="VGF4IFpvbmUgTmFtZQ==">TmFtZSBvZiBUYXggWm9uZQ==</PHRASE>
<PHRASE Label="la_fld_ThirdDayDelivery" Module="In-Commerce" Type="1">VGhpcmQgRGF5</PHRASE>
<PHRASE Label="la_fld_Time" Module="In-Commerce" Type="1">VGltZQ==</PHRASE>
- <PHRASE Label="la_fld_ToAmount" Module="In-Commerce" Type="1">VG8gQW1vdW50</PHRASE>
+ <PHRASE Label="la_fld_ToAmount" Module="In-Commerce" Type="1" Column="VG8gQW1vdW50">VG8gQW1vdW50</PHRASE>
<PHRASE Label="la_fld_ToDateTime" Module="In-Commerce" Type="1">VG8gZGF0ZS90aW1l</PHRASE>
<PHRASE Label="la_fld_TopSeller" Module="In-Commerce" Type="1">VG9wIFNlbGxlcg==</PHRASE>
- <PHRASE Label="la_fld_TotalAmount" Module="In-Commerce" Type="1">VG90YWwgQW1vdW50</PHRASE>
+ <PHRASE Label="la_fld_TotalAmount" Module="In-Commerce" Type="1" Column="VG90YWwgQW1vdW50">VG90YWwgQW1vdW50</PHRASE>
<PHRASE Label="la_fld_TotalReturns" Module="In-Commerce" Type="1">VG90YWwgUmV0dXJucw==</PHRASE>
<PHRASE Label="la_fld_TotalSavings" Module="In-Commerce" Type="1">VG90YWwgU2F2aW5ncw==</PHRASE>
- <PHRASE Label="la_fld_UnitsLimit" Module="In-Commerce" Type="1">TGluaXQ=</PHRASE>
+ <PHRASE Label="la_fld_UnitsLimit" Module="In-Commerce" Type="1" Column="TGltaXQ=">TGluaXQ=</PHRASE>
<PHRASE Label="la_fld_UserComment" Module="In-Commerce" Type="1">VXNlciBDb21tZW50</PHRASE>
<PHRASE Label="la_fld_VAT" Module="In-Commerce" Type="1">U2FsZXMgVGF4L1ZBVA==</PHRASE>
<PHRASE Label="la_fld_VerificationResult" Module="In-Commerce" Type="1">VmVyaWZpY2F0aW9uIFJlc3VsdA==</PHRASE>
- <PHRASE Label="la_fld_Weight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
+ <PHRASE Label="la_fld_Weight" Module="In-Commerce" Type="1" Column="V2VpZ2h0">V2VpZ2h0</PHRASE>
<PHRASE Label="la_fld_WeightType" Module="In-Commerce" Type="1">V2VpZ2h0IE1vZGlmaWVyIFR5cGU=</PHRASE>
- <PHRASE Label="la_fld_ZoneName" Module="In-Commerce" Type="1">Wm9uZSBOYW1l</PHRASE>
- <PHRASE Label="la_fld_ZoneType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_ZoneName" Module="In-Commerce" Type="1" Column="Wm9uZSBOYW1l">Wm9uZSBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_ZoneType" Module="In-Commerce" Type="1" Column="Wm9uZSBUeXBl">VHlwZQ==</PHRASE>
<PHRASE Label="la_fld_Zone_Type" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_FontColor" Module="In-Commerce" Type="1">Rm9udCBDb2xvcg==</PHRASE>
<PHRASE Label="la_FreeShipping" Module="In-Commerce" Type="1">RnJlZSBTaGlwcGluZw==</PHRASE>
Index: units/addresses/addresses_config.php
===================================================================
--- units/addresses/addresses_config.php (revision 14472)
+++ units/addresses/addresses_config.php (working copy)
@@ -113,6 +113,4 @@
'ShortAddress' => Array('type'=>'string', 'default' => ''),
),
- 'Grids' => Array(),
-
);
\ No newline at end of file
Index: units/affiliate_payment_types/affiliate_payment_types_config.php
===================================================================
--- units/affiliate_payment_types/affiliate_payment_types_config.php (revision 14472)
+++ units/affiliate_payment_types/affiliate_payment_types_config.php (working copy)
@@ -86,14 +86,14 @@
'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
'Status' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
- 'not_null' => 1, 'default' => 0,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+ 'not_null' => 1, 'default' => 0,
),
'IsPrimary' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'not_null' => 1, 'default' => 0,
),
'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -110,9 +110,9 @@
'module' => 'core',
),
'Fields' => Array (
- 'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ( 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Description' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
),
),
Index: units/affiliate_payments/affiliate_payments_config.php
===================================================================
--- units/affiliate_payments/affiliate_payments_config.php (revision 14472)
+++ units/affiliate_payments/affiliate_payments_config.php (working copy)
@@ -126,12 +126,12 @@
'module' => 'core',
),
'Fields' => Array(
- 'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'PaymentDate' => Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'),
- 'Comment' => Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
- 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'),
- 'PaymentReference' => Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'Amount' => Array( 'filter_block' => 'grid_float_range_filter'),
+ 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+ 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
),
),
'Log' => Array(
@@ -140,13 +140,13 @@
'module' => 'core',
),
'Fields' => Array(
- 'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Username' => Array( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
- 'PaymentDate' => Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'Amount' => Array( 'title' => 'la_col_Amount', 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),
- 'Comment' => Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
- 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'),
- 'PaymentReference' => Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Username' => Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+ 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'Amount' => Array( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),
+ 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+ 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
),
),
Index: units/affiliate_plans/affiliate_plans_config.php
===================================================================
--- units/affiliate_plans/affiliate_plans_config.php (revision 14472)
+++ units/affiliate_plans/affiliate_plans_config.php (working copy)
@@ -91,14 +91,14 @@
'MinPaymentAmount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
'Enabled' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
- 'not_null' => 1, 'default' => 0,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+ 'not_null' => 1, 'default' => 0,
),
'IsPrimary' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'not_null' => 1, 'default' => 0,
),
),
@@ -114,10 +114,10 @@
'module' => 'core',
),
'Fields' => Array (
- 'AffiliatePlanId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ( 'title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'PlanType' => Array ( 'title' => 'la_col_PlanType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'Enabled' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'AffiliatePlanId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PlanType' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'Enabled' => Array ( 'title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
Index: units/affiliate_plans_items/affiliate_plans_items_config.php
===================================================================
--- units/affiliate_plans_items/affiliate_plans_items_config.php (revision 14472)
+++ units/affiliate_plans_items/affiliate_plans_items_config.php (working copy)
@@ -116,7 +116,7 @@
2 => 'icon16_product_pending.png',
),
'Fields' => Array(
- 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_checkbox_td' ),
+ 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_checkbox_td' ),
'ItemName' => Array( 'title'=>'la_col_ItemName' ),
'ItemType' => Array( 'title'=>'la_col_ItemType' ),
),
Index: units/affiliates/affiliates_config.php
===================================================================
--- units/affiliates/affiliates_config.php (revision 14472)
+++ units/affiliates/affiliates_config.php (working copy)
@@ -195,13 +195,13 @@
'module' => 'core',
),
'Fields' => Array(
- 'AffiliateId' => Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'UserName' => Array( 'title' => 'la_col_UserName', 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+ 'AffiliateId' => Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'UserName' => Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
'PlanName' => Array( 'title'=>'la_col_PlanName', 'filter_block' => 'grid_like_filter'),
- 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'CreatedOn' => Array( 'title' => 'la_col_RegisteredOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'Status' => Array( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'CreatedOn' => Array( 'title' => 'column:la_fld_RegisteredOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'Status' => Array( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
Index: units/coupon_items/coupon_items_config.php
===================================================================
--- units/coupon_items/coupon_items_config.php (revision 14472)
+++ units/coupon_items/coupon_items_config.php (working copy)
@@ -32,7 +32,7 @@
'DoEvent' => 'OnDeleteCouponItem',
),
),
-
+
'QueryString' => Array(
1 => 'id',
2 => 'Page',
@@ -41,7 +41,7 @@
),
'IDField' => 'CouponItemId',
- 'StatusField' => Array('Status'),
+ 'StatusField' => Array('Status'),
'TableName' => TABLE_PREFIX . 'ProductsCouponItems',
'ForeignKey' => 'CouponId',
@@ -49,14 +49,14 @@
'ParentPrefix' => 'coup',
'AutoDelete' => true,
'AutoClone' => true,
-
+
'ListSQLs' => Array(
'' => ' SELECT %1$s.* %2$s
FROM %1$s
LEFT JOIN ' . TABLE_PREFIX . 'Products p ON %1$s.ItemResourceId = p.ResourceId
LEFT JOIN ' . TABLE_PREFIX . 'Category c ON %1$s.ItemResourceId = c.ResourceId',
), // key - special, value - list select sql
-
+
'ItemSQLs' => Array(
'' => 'SELECT * FROM %s',
),
@@ -65,13 +65,13 @@
Array(
'prefix' => 'd', 'key' => 'DiscountId', 'ForeignKey' => 'DiscountId'),
),*/
-
+
'ListSortings' => Array(
'' => Array(
'Sorting' => Array('ItemName' => 'asc'),
),
),
-
+
'CalculatedFields' => Array(
'' => Array(
'ProductId' => 'p.ProductId',
@@ -120,7 +120,7 @@
'type' => 'int',
'formatter' => 'kOptionsFormatter',
'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
- 'default' => 2,
+ 'default' => 2,
),
'CategoryId' => Array ('type' => 'int', 'default' => 0),
),
@@ -140,11 +140,11 @@
2 => 'icon16_product_pending.png',
),
'Fields' => Array(
- 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
'ItemType' => Array( 'title'=>'la_col_CouponItemType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
),
-
+
);
\ No newline at end of file
Index: units/coupons/coupons_config.php
===================================================================
--- units/coupons/coupons_config.php (revision 14472)
+++ units/coupons/coupons_config.php (working copy)
@@ -149,16 +149,16 @@
'module' => 'core',
),
'Fields' => Array(
- 'CouponId' => Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ),
+ 'CouponId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ),
+ 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ),
),
),
'Radio' => Array(
@@ -169,17 +169,18 @@
2 => 'icon16_pending.png',
'module' => 'core',
),
+ 'Selector' => 'radio',
'Fields' => Array(
- 'CouponId' => Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ),
+ 'CouponId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ),
+ 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ),
),
),
),
Index: units/currencies/currencies_config.php
===================================================================
--- units/currencies/currencies_config.php (revision 14472)
+++ units/currencies/currencies_config.php (working copy)
@@ -111,14 +111,14 @@
'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
'Status' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1,
- 'not_null' => 1, 'default' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1,
+ 'not_null' => 1, 'default' => 1,
),
'IsPrimary' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'not_null' => 1, 'default' => 0,
),
'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -139,12 +139,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'CurrencyId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'ISO' => Array ( 'title' => 'la_col_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ),
- 'Translation' => Array ( 'title' => 'la_col_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'RateToPrimary' => Array ( 'title' => 'la_col_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),
+ 'CurrencyId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'ISO' => Array ( 'title' => 'column:la_fld_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ),
+ 'Translation' => Array ( 'title' => 'column:la_fld_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),
'Modified' => Array ( 'title' => 'la_col_LastUpdated', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
Index: units/destinations/destinations_config.php
===================================================================
--- units/destinations/destinations_config.php (revision 14472)
+++ units/destinations/destinations_config.php (working copy)
@@ -57,22 +57,4 @@
'StdDestId' => Array('type' => 'int', 'default' => 0, ),
'DestValue' => Array('type' => 'string', 'max_len' => 255, 'default' => null, ),
),
- /*'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array(
- 'default' => 'icon16_item.gif',
- 1 => 'icon16_item.gif',
- 0 => 'icon16_disabled.gif'
- 'module' => 'core',
- ),
- 'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'grid_checkbox_td'),
- 'AltName' => Array( 'title'=>'la_col_AltName' ),
- 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td' ),
- 'Enabled' => Array( 'title'=>'la_col_ImageEnabled' ),
- 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'preview' ),
- ),
-
- ),
- ),*/
);
\ No newline at end of file
Index: units/discount_items/discount_items_config.php
===================================================================
--- units/discount_items/discount_items_config.php (revision 14472)
+++ units/discount_items/discount_items_config.php (working copy)
@@ -119,7 +119,7 @@
2 => 'icon16_product_pending.png',
),
'Fields' => Array(
- 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
+ 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter'),
'ItemType' => Array( 'title'=>'la_col_ItemType', 'filter_block' => 'grid_options_filter'),
),
Index: units/discounts/discounts_config.php
===================================================================
--- units/discounts/discounts_config.php (revision 14472)
+++ units/discounts/discounts_config.php (working copy)
@@ -127,14 +127,14 @@
'module' => 'core',
),
'Fields' => Array (
- 'DiscountId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
- 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'DiscountId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Start' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'End' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'GroupId' => Array( 'title'=>'column:la_fld_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'Type' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'Status' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'Amount' => Array( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
),
),
),
Index: units/downloads/downloads_config.php
===================================================================
--- units/downloads/downloads_config.php (revision 14472)
+++ units/downloads/downloads_config.php (working copy)
@@ -101,11 +101,11 @@
'module' => 'core',
),
'Fields' => Array(
- 'DownloadId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Username' => Array( 'title'=>'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'DownloadId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Username' => Array( 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'ProductName' => Array( 'title'=>'la_col_DownloadedProductName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'Filename' => Array( 'title'=>'la_col_DownloadedFileName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'IPAddress' => Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'IPAddress' => Array( 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'StartedOn' => Array( 'title'=>'la_col_StartedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
),
Index: units/files/files_config.php
===================================================================
--- units/files/files_config.php (revision 14472)
+++ units/files/files_config.php (working copy)
@@ -130,13 +130,13 @@
'module' => 'core',
),
'Fields' => Array (
- 'FileId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
- 'Name' => Array ( 'title' => 'la_col_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'),
- 'FilePath' => Array ( 'title' => 'la_col_FilePath', 'filter_block' => 'grid_like_filter'),
- 'Version' => Array ( 'title' => 'la_col_Version', 'filter_block' => 'grid_like_filter'),
+ 'FileId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
+ 'Name' => Array ( 'title' => 'column:la_fld_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'),
+ 'FilePath' => Array ( 'filter_block' => 'grid_like_filter'),
+ 'Version' => Array ( 'filter_block' => 'grid_like_filter'),
'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_float_range_filter'),
- 'AddedOn' => Array ( 'title' => 'la_col_AddedOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
+ 'AddedOn' => Array ( 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'),
+ 'Status' => Array ( 'filter_block' => 'grid_options_filter'),
),
),
),
Index: units/gift_certificates/gift_certificates_config.php
===================================================================
--- units/gift_certificates/gift_certificates_config.php (revision 14472)
+++ units/gift_certificates/gift_certificates_config.php (working copy)
@@ -70,7 +70,7 @@
'priority' => 3.3, // <parent_priority>.<own_priority>, because this section replaces parent in tree
'type' => stTAB,
),
- ),
+ ),
'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %1$s',),
'ItemSQLs' => Array ('' => 'SELECT * FROM %1$s',),
@@ -126,12 +126,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'GiftCertificateId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Code' => Array ('title' => 'la_col_Code', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Debit' => Array ('title' => 'la_col_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),
- 'Amount' => Array ('title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'Expiration' => Array ('title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'GiftCertificateId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Code' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),
+ 'Amount' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
),
),
),
Index: units/manufacturers/manufacturers_config.php
===================================================================
--- units/manufacturers/manufacturers_config.php (revision 14472)
+++ units/manufacturers/manufacturers_config.php (working copy)
@@ -35,7 +35,7 @@
'TitlePresets' => Array (
'default' => Array (
'new_status_labels' => Array ('manuf' => '!la_title_AddingManufacturer!'),
- 'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),
+ 'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),
),
'manuf_list' => Array (
'prefixes' => Array ('manuf_List'), 'format' => "!la_title_Manufacturers!",
@@ -120,10 +120,10 @@
'module' => 'core',
),
'Fields' => Array (
- 'ManufacturerId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ManufacturerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'Name' => Array ('title' => 'la_col_ManufacturerName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'IsPopular' => Array ('title' => 'la_col_IsPopular', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'URL' => Array ('title' => 'la_col_URL', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'URL' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
),
),
),
Index: units/order_items/order_items_config.php
===================================================================
--- units/order_items/order_items_config.php (revision 14472)
+++ units/order_items/order_items_config.php (working copy)
@@ -142,7 +142,7 @@
'Quantity' => Array ('title' => 'la_col_Quantity', 'data_block' => 'grid_quantity_td', 'filter_block' => 'grid_range_filter'),
'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
- 'Price' => Array ('title' => 'la_col_Price', 'data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),
+ 'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),
'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_float_range_filter'),
'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
@@ -163,7 +163,7 @@
'Quantity' => Array ('title' => 'la_col_Quantity', 'filter_block' => 'grid_range_filter'),
'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
- 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_float_range_filter'),
+ 'Price' => Array ('filter_block' => 'grid_float_range_filter'),
'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_float_range_filter'),
'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
Index: units/orders/orders_config.php
===================================================================
--- units/orders/orders_config.php (revision 14472)
+++ units/orders/orders_config.php (working copy)
@@ -510,13 +510,14 @@
),
'Fields' => Array (
- 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'OrderNumber' => Array ( 'title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'OrderNumber' => Array ( 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'OrderDate' => Array ( 'title' => 'la_col_OrderDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
'CustomerName' => Array ( 'title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'PaymentType' => Array ( 'title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
- 'TotalAmount' => Array ( 'title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ),
- 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'OnHold' => Array ('title' => 'la_col_OnHold', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'PaymentType' => Array ( 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+ 'TotalAmount' => Array ( 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ),
+ 'AffiliateUser' => Array ( 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
+ 'OnHold' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -528,17 +529,17 @@
'module' => 'core',
),
'Fields' => Array (
- 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'OrderNumber' => Array ('title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'OrderNumber' => Array ('data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
'OrderDate' => Array ('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
'CustomerName' => Array ('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
- 'PaymentType' => Array ('title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'),
- 'TotalAmount' => Array ('title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),
- 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'),
- 'OrderIP' => Array ('title' => 'la_col_OrderIP', 'filter_block' => 'grid_like_filter'),
- 'Username' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_user_like_filter'),
- 'PaymentAccount' => Array ('title' => 'la_col_CreditCardNumber', 'filter_block' => 'grid_like_filter'),
+ 'PaymentType' => Array ('data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'),
+ 'TotalAmount' => Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),
+ 'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'),
+ 'OrderIP' => Array ('filter_block' => 'grid_like_filter'),
+ 'Username' => Array ('filter_block' => 'grid_user_like_filter'),
+ 'PaymentAccount' => Array ('title' => 'column:la_fld_CreditCardNumber', 'filter_block' => 'grid_like_filter'),
),
),
),
Index: units/payment_type/payment_type_config.php
===================================================================
--- units/payment_type/payment_type_config.php (revision 14472)
+++ units/payment_type/payment_type_config.php (working copy)
@@ -151,11 +151,11 @@
'module' => 'core',
),
'Fields' => Array (
- 'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+ 'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
'Name' => Array ( 'title' => 'la_col_PaymentTypeName', 'data_block' => 'payment_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
'BuiltIn' => Array ( 'title' => 'la_col_BuiltIn', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: units/payment_type_currencies/payment_type_currencies_config.php
===================================================================
--- units/payment_type_currencies/payment_type_currencies_config.php (revision 14472)
+++ units/payment_type_currencies/payment_type_currencies_config.php (working copy)
@@ -61,6 +61,4 @@
'PaymentTypeId' => Array('type' => 'int','not_null' => 1, 'default' => 0),
'CurrencyId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
),
-
- 'Grids' => Array(),
);
\ No newline at end of file
Index: units/pricing/pricing_config.php
===================================================================
--- units/pricing/pricing_config.php (revision 14472)
+++ units/pricing/pricing_config.php (working copy)
@@ -102,7 +102,7 @@
'not_null' => 1, 'default' => 0,
),
'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1),
-
+
/* TODO implement these fields in business logic
'AccessRebillDate' => Array (
'type'=> 'int', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default' => 0,
@@ -123,30 +123,13 @@
),
'Grids' => Array (
- /*
- 'Default' => Array (
- 'Icons' => Array (
- 'default' => 'icon16_item.png',
- 'module' => 'core',
- ),
- 'Fields' => Array (
- 'MinQty' => Array ( 'title'=> 'la_col_MinQty', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'MaxQty' => Array ( 'title'=> 'la_col_MaxQty', 'filter_block' => 'grid_range_filter'),
- 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_range_filter'),
- 'Points' => Array ( 'title'=> 'la_col_Points', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ( 'title'=> 'la_col_Cost', 'filter_block' => 'grid_range_filter'),
- 'Negotiated' => Array ( 'title'=> 'la_col_Negotiated', 'data_block' => 'negotiated_td', 'filter_block' => 'grid_options_filter'),
- ),
-
- ),
- */
'Access' => Array (
'Icons' => Array ('default'=> 'icon16_pricing.gif', '0'=> 'icon16_pricing.gif', '1'=> 'icon16_pricing_primary.gif'),
'Fields' => Array (
- 'AccessDuration' => Array ( 'title'=> 'la_col_AccessDuration', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'AccessUnit' => Array ( 'title'=> 'la_col_AccessDurationUnit', 'filter_block' => 'grid_options_filter'),
- 'Description' => Array ( 'title'=> 'la_col_Description', 'filter_block' => 'grid_like_filter'),
- 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_float_range_filter'),
+ 'AccessDuration' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'AccessUnit' => Array ( 'title'=> 'column:la_fld_AccessDurationUnit', 'filter_block' => 'grid_options_filter'),
+ 'Description' => Array ('filter_block' => 'grid_like_filter'),
+ 'Price' => Array ( 'filter_block' => 'grid_float_range_filter'),
),
),
Index: units/product_option_combinations/product_option_combinations_config.php
===================================================================
--- units/product_option_combinations/product_option_combinations_config.php (revision 14472)
+++ units/product_option_combinations/product_option_combinations_config.php (working copy)
@@ -102,10 +102,10 @@
),
'Fields' => Array (
'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
- 'SKU' => Array ( 'title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'),
- 'Availability' => Array ( 'title' => 'la_col_Availability', 'filter_block' => 'grid_options_filter'),
- 'Price' => Array ( 'title' => 'la_col_Price', 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'),
- /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/
+ 'SKU' => Array ( 'filter_block' => 'grid_like_filter'),
+ 'Availability' => Array ( 'filter_block' => 'grid_options_filter'),
+ 'Price' => Array ( 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'),
+// 'Weight' => Array ( 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),
),
),
@@ -117,11 +117,11 @@
'Selector' => 'radio',
'Fields' => Array (
'Combination' => Array ('title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'),
- 'QtyInStock' => Array ('title' => 'la_col_QtyInStock', 'filter_block' => 'grid_range_filter'),
- 'QtyReserved' => Array ('title' => 'la_col_QtyReserved', 'filter_block' => 'grid_range_filter'),
- 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter'),
- 'QtyOnOrder' => Array ('title' => 'la_col_QtyOnOrder', 'filter_block' => 'grid_range_filter'),
+ 'SKU' => Array ('filter_block' => 'grid_like_filter'),
+ 'QtyInStock' => Array ('filter_block' => 'grid_range_filter'),
+ 'QtyReserved' => Array ('filter_block' => 'grid_range_filter'),
+ 'QtyBackOrdered' => Array ('filter_block' => 'grid_range_filter'),
+ 'QtyOnOrder' => Array ('filter_block' => 'grid_range_filter'),
),
),
@@ -133,8 +133,8 @@
),
'Fields' => Array (
'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
- 'FinalPrice' => Array ( 'title' => 'la_col_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'),
- /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/
+ 'FinalPrice' => Array ( 'title' => 'column:la_fld_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'),
+// 'Weight' => Array ('data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),
),
),
),
Index: units/product_options/product_options_config.php
===================================================================
--- units/product_options/product_options_config.php (revision 14472)
+++ units/product_options/product_options_config.php (working copy)
@@ -93,11 +93,11 @@
'module' => 'core',
), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
'Fields' => Array (
- 'ProductOptionId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'),
- 'OptionType' => Array ( 'title' => 'la_col_OptionType', 'filter_block' => 'grid_options_filter'),
- 'Required' => Array ( 'title' => 'la_col_Required', 'filter_block' => 'grid_options_filter'),
- /*'Listable' => Array ( 'title' => 'la_col_Listable', 'filter_block' => 'grid_options_filter'),*/
+ 'ProductOptionId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'Name' => Array ( 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'),
+ 'OptionType' => Array ( 'filter_block' => 'grid_options_filter'),
+ 'Required' => Array ( 'filter_block' => 'grid_options_filter'),
+// 'Listable' => Array ('filter_block' => 'grid_options_filter'),
),
),
Index: units/products/products_config.php
===================================================================
--- units/products/products_config.php (revision 14472)
+++ units/products/products_config.php (working copy)
@@ -492,12 +492,12 @@
'Expire' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null),
'Type' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
'options' => Array (
PRODUCT_TYPE_TANGIBLE => 'la_product_tangible',
PRODUCT_TYPE_SUBSCRIPTION => 'la_product_subscription',
PRODUCT_TYPE_SERVICE => 'la_product_service',
- PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable',
+ PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable',
/* PRODUCT_TYPE_PACKAGE => 'la_product_package', */
),
'not_null' => 1, 'default' => 1,
@@ -506,9 +506,9 @@
'ModifiedById' => Array ('type' => 'int', 'default' => NULL),
'CreatedById' => Array (
'type' => 'int',
- 'formatter' => 'kLEFTFormatter',
+ 'formatter' => 'kLEFTFormatter',
'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
- 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
+ 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\'',
'left_key_field' => 'PortalUserId',
'left_title_field' => 'Login',
@@ -640,21 +640,20 @@
'NEW' => 'icon16_product_new.png',
),
'Fields' => Array (
- 'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'Type' => Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Manufacturer' => Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'QtyInStock' => Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'OnSale' => Array ('title' => 'la_col_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ), /*
- 'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'Type' => Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Manufacturer' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Price' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'OnSale' => Array ('title' => 'column:la_fld_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ /*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- */
+ 'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),*/
),
),
@@ -668,16 +667,16 @@
),
'Selector' => 'radio',
'Fields' => Array (
- 'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'Type' => Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Manufacturer' => Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'QtyInStock' => Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'Type' => Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Manufacturer' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Price' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
),
),
Index: units/reports/reports_config.php
===================================================================
--- units/reports/reports_config.php (revision 14472)
+++ units/reports/reports_config.php (working copy)
@@ -74,7 +74,7 @@
'ItemSQLs' => Array( '' => 'SELECT * FROM %1$s',
),
'ListSortings' => Array (
- '' => Array (
+ '' => Array (
'Sorting' => Array ('Name' => 'asc'),
)
),
@@ -100,14 +100,14 @@
'FromDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ),
'ToDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ),
'Recursive' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
),
'SkipEmpty' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
),
@@ -120,12 +120,12 @@
'module' => 'core',
),
'Fields' => Array(
- 'Name' => Array( 'title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'Start' => Array( 'title' => 'la_col_Start', 'filter_block' => 'grid_date_range_filter'),
- 'End' => Array( 'title' => 'la_col_End', 'filter_block' => 'grid_date_range_filter'),
- 'GroupId' => Array( 'title' => 'la_col_Group', 'filter_block' => 'grid_options_filter'),
- 'Type' => Array( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'),
- 'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'),
+ 'Name' => Array('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'Start' => Array('filter_block' => 'grid_date_range_filter'),
+ 'End' => Array('filter_block' => 'grid_date_range_filter'),
+ 'GroupId' => Array( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter'),
+ 'Type' => Array('filter_block' => 'grid_options_filter'),
+ 'Amount' => Array('filter_block' => 'grid_float_range_filter'),
),
),
Index: units/reports/reports_event_handler.php
===================================================================
--- units/reports/reports_event_handler.php (revision 14472)
+++ units/reports/reports_event_handler.php (working copy)
@@ -372,10 +372,10 @@
),
'Fields' => Array (
'CategoryName' => Array ('title' => 'la_col_CategoryName', 'filter_block' => 'grid_like_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -436,11 +436,11 @@
'module' => 'core',
),
'Fields' => Array (
- 'Login' => Array ('title' => 'la_col_Login', 'filter_block' => 'grid_like_filter'),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
+ 'Login' => Array ('filter_block' => 'grid_like_filter'),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter'),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -475,10 +475,10 @@
),
'Fields' => Array (
'ProductName' => Array ('title' => 'la_col_ProductName', 'filter_block' => 'grid_like_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -543,8 +543,8 @@
),
'Fields' => Array(
'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
Index: units/sections/section_eh.php
===================================================================
--- units/sections/section_eh.php (revision 14472)
+++ units/sections/section_eh.php (working copy)
@@ -82,10 +82,10 @@
$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Fields', array_merge_recursive2($fields, $new_fields));
$new_columns = Array (
- 'BillingCountry' => Array ('title' => 'la_col_BillingCountry', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'ShippingCountry' => Array ('title' => 'la_col_ShippingCountry', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryCurrencyId' => Array ('title' => 'la_col_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryPaymentTypeId' => Array ('title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'BillingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'ShippingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryCurrencyId' => Array ('title' => 'column:la_fld_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryPaymentTypeId' => Array ('title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
);
$grids = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Grids');
Index: units/shipping/shipping_config.php
===================================================================
--- units/shipping/shipping_config.php (revision 14472)
+++ units/shipping/shipping_config.php (working copy)
@@ -127,7 +127,7 @@
'Sorting' => Array ('Name' => 'asc'),
)
),
-
+
'Fields' => Array (
'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')),
@@ -166,7 +166,7 @@
'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0),
'IsFreePromoShipping' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'formatter' => 'kOptionsFormatter',
'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'default' => 0, 'not_null' => 1,
),
@@ -174,7 +174,7 @@
'InsuranceType' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter',
- 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1,
+ 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1,
'not_null' => 1, 'default' => 2
),
),
@@ -188,14 +188,14 @@
'module' => 'core',
),
'Fields' => Array (
- 'ShippingID' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ),
- 'Type' => Array ( 'title' => 'la_col_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'SpeedCode' => Array ( 'title' => 'la_col_SpeedCode', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
- 'BaseFee' => Array ( 'title' => 'la_col_BaseFee', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'IsFreePromoShipping' => Array ( 'title' => 'la_col_IsFreePromoShipping', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 170, ),
- /*'CODFlatSurcharge' => Array ( 'title' => 'la_col_CODFlatSurcharge', 'filter_block' => 'grid_float_range_filter'),*/
+ 'ShippingID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ),
+ 'Type' => Array ( 'title' => 'column:la_fld_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'SpeedCode' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 130, ),
+ 'BaseFee' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'IsFreePromoShipping' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 170, ),
+// 'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter'),
),
),
Index: units/shipping_costs/shipping_costs_config.php
===================================================================
--- units/shipping_costs/shipping_costs_config.php (revision 14472)
+++ units/shipping_costs/shipping_costs_config.php (working copy)
@@ -57,20 +57,4 @@
'Flat' => Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
'PerUnit' => Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
),
-
- /*
- 'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array(
- 'default' => 'icon16_item.png',
- 'module' => 'core',
- ),
- 'Fields' => Array(
- 'Name' => Array( 'width'=>150, 'title'=>'la_col_Title', 'data_block'=>'grid_checkbox_td' ),
- 'CODallowed' => Array( 'width'=>100, 'title'=>'la_col_CODallowed' )
- ),
-
- ),
- ),
- */
);
\ No newline at end of file
Index: units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
--- units/shipping_quote_engines/shipping_quote_engines_config.php (revision 14472)
+++ units/shipping_quote_engines/shipping_quote_engines_config.php (working copy)
@@ -207,11 +207,11 @@
'module' => 'core',
),
'Fields' => Array (
- 'EngineId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'FlatSurcharge' => Array ( 'title' => 'la_col_FlatSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
- 'PercentSurcharge' => Array ( 'title' => 'la_col_PercentSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'FlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+ 'PercentSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
),
Index: units/taxes/taxes_config.php
===================================================================
--- units/taxes/taxes_config.php (revision 14472)
+++ units/taxes/taxes_config.php (working copy)
@@ -43,9 +43,9 @@
),*/
'IDField' => 'TaxZoneId',
'TitleField' => 'Name',
-
+
'TitlePresets' => Array (
- 'default' => Array (
+ 'default' => Array (
'new_status_labels' => Array ('tax' => '!la_title_AddingTaxZone!'),
'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'),
),
@@ -58,7 +58,7 @@
'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!",
),
),
-
+
'PermSection' => Array ('main' => 'in-commerce:taxes'),
'Sections' => Array (
@@ -94,17 +94,17 @@
'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => 1, 'default' => 1),
'TaxValue' => Array ('type' => 'double', 'not_null' => 1, 'default' => 0),
'ApplyToShipping' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
- 'default' => 0, 'not_null' => 1,
+ 'default' => 0, 'not_null' => 1,
),
'ApplyToProcessing' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
- 'default' => 0, 'not_null' => 1,
- ),
+ 'default' => 0, 'not_null' => 1,
+ ),
),
'Grids' => Array (
@@ -117,12 +117,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'TaxZoneId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'TaxValue' => Array ( 'title' => 'la_col_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),
- 'Type' => Array ( 'title' => 'la_col_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
- 'ApplyToShipping' => Array ( 'title' => 'la_col_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
- 'ApplyToProcessing' => Array ( 'title' => 'la_col_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'TaxZoneId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),
+ 'Type' => Array ( 'title' => 'column:la_fld_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'ApplyToShipping' => Array ( 'title' => 'column:la_fld_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+ 'ApplyToProcessing' => Array ( 'title' => 'column:la_fld_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
),
Index: units/taxesdestinations/taxesdestinations_config.php
===================================================================
--- units/taxesdestinations/taxesdestinations_config.php (revision 14472)
+++ units/taxesdestinations/taxesdestinations_config.php (working copy)
@@ -72,23 +72,4 @@
'StdDestId' => Array ('type' => 'int', 'default' => 0),
'DestValue' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
),
-
- /*'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array(
- 'default' => 'icon16_item.gif',
- 1 => 'icon16_item.gif',
- 0 => 'icon16_disabled.gif'
- 'module' => 'core',
- ),
- 'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'grid_checkbox_td'),
- 'AltName' => Array( 'title'=>'la_col_AltName' ),
- 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td' ),
- 'Enabled' => Array( 'title'=>'la_col_ImageEnabled' ),
- 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'preview' ),
- ),
-
- ),
- ),*/
);
\ No newline at end of file
Index: units/zones/zones_config.php
===================================================================
--- units/zones/zones_config.php (revision 14472)
+++ units/zones/zones_config.php (working copy)
@@ -32,8 +32,8 @@
'TitlePresets' => Array (
'default' => Array (
'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'),
- 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),
- ),
+ 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),
+ ),
'zones_edit' => Array ( 'prefixes' => Array ('z'), 'format' => "#z_status# - '#z_titlefield#'"),
),
'TableName' => TABLE_PREFIX . 'ShippingZones',
@@ -59,7 +59,7 @@
'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
'Name' => Array (
'type' => 'string', 'max_len' => 100,
- 'required' => 1, 'default' => '', 'not_null' => 1,
+ 'required' => 1, 'default' => '', 'not_null' => 1,
'error_msgs' => Array ('required' => 'Please fill in'),
),
'Type' => Array (
@@ -69,7 +69,7 @@
1 => 'la_ByCountry',
2 => 'la_ByState',
3 => 'la_ByZIP'
- ),
+ ),
'not_null' => 1, 'default' => 1,
),
'CODallowed' => Array (
@@ -89,10 +89,10 @@
'module' => 'core',
),
'Fields' => Array (
- 'ZoneID' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'CODallowed' => Array ( 'title' => 'la_col_CODallowed', 'filter_block' => 'grid_options_filter', 'width' => 120, )
+ 'ZoneID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Type' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'CODallowed' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 120, )
),
),
),
phrase_storage_automation_install-Dmitry.patch [^] (4,732 bytes) 2011-09-06 22:23
[Show Content]
Index: admin_templates/languages/phrase_edit.tpl
===================================================================
--- admin_templates/languages/phrase_edit.tpl (revision 14516)
+++ admin_templates/languages/phrase_edit.tpl (working copy)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="888" height="415"/>
+<inp2:adm_SetPopupSize width="888" height="510"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" prefix="phrases" title_preset="phrase_edit_single"/>
@@ -68,23 +68,33 @@
<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_Get name='phrases_label'/>"/>
<inp2:m_if check="m_Get" name="simple_mode">
- <inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="Phrase"/>
+ <inp2:m_ifnot check="m_IsDebugMode">
+ <inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="Phrase"/>
+ </inp2:m_ifnot>
</inp2:m_if>
<inp2:m_DefineElement name="phrase_element">
<inp2:m_if check="m_Get" name="simple_mode">
+ <inp2:m_ifnot check="m_IsDebugMode">
+ <inp2:m_Set use_simple_mode="1"/>
+ </inp2:m_ifnot>
+ </inp2:m_if>
+
+ <inp2:m_if check="m_Get" name="use_simple_mode">
<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
<inp2:m_else/>
<tr class="subsectiontitle">
<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
</tr>
- <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="la_fld_PrimaryTranslation"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="la_fld_Phrase" size="60"/>
- <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="la_fld_PhraseType"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="la_fld_Module"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module"/>
</inp2:m_if>
</inp2:m_DefineElement>
Index: install/install_schema.sql
===================================================================
--- install/install_schema.sql (revision 14516)
+++ install/install_schema.sql (working copy)
@@ -189,6 +189,16 @@
l3_Translation text,
l4_Translation text,
l5_Translation text,
+ l1_HintTranslation text,
+ l2_HintTranslation text,
+ l3_HintTranslation text,
+ l4_HintTranslation text,
+ l5_HintTranslation text,
+ l1_ColumnTranslation text,
+ l2_ColumnTranslation text,
+ l3_ColumnTranslation text,
+ l4_ColumnTranslation text,
+ l5_ColumnTranslation text,
PhraseType int(11) NOT NULL DEFAULT '0',
LastChanged int(10) unsigned DEFAULT NULL,
LastChangeIP varchar(15) NOT NULL DEFAULT '',
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 14516)
+++ install/upgrades.sql (working copy)
@@ -2043,4 +2043,16 @@
# ===== v 5.1.3 =====
UPDATE PortalUser
-SET Modified = NULL;
\ No newline at end of file
+SET Modified = NULL;
+
+ALTER TABLE Phrase
+ ADD l1_HintTranslation TEXT NULL AFTER l5_Translation,
+ ADD l2_HintTranslation TEXT NULL AFTER l1_HintTranslation,
+ ADD l3_HintTranslation TEXT NULL AFTER l2_HintTranslation,
+ ADD l4_HintTranslation TEXT NULL AFTER l3_HintTranslation,
+ ADD l5_HintTranslation TEXT NULL AFTER l4_HintTranslation,
+ ADD l1_ColumnTranslation TEXT NULL AFTER l5_HintTranslation,
+ ADD l2_ColumnTranslation TEXT NULL AFTER l1_ColumnTranslation,
+ ADD l3_ColumnTranslation TEXT NULL AFTER l2_ColumnTranslation,
+ ADD l4_ColumnTranslation TEXT NULL AFTER l3_ColumnTranslation,
+ ADD l5_ColumnTranslation TEXT NULL AFTER l4_ColumnTranslation;
\ No newline at end of file
phrase_storage_automation_Themes_Advanced-Dmitry.patch [^] (2,881 bytes) 2011-09-06 22:24
[Show Content]
Index: _install/english.lang
===================================================================
--- _install/english.lang (revision 14516)
+++ _install/english.lang (working copy)
@@ -154,6 +154,7 @@
<PHRASE Label="lu_fld_body" Module="Core" Type="0">Qm9keQ==</PHRASE>
<PHRASE Label="lu_fld_Captcha" Module="Core" Type="0">Q2FwdGNoYSBJbWFnZQ==</PHRASE>
<PHRASE Label="lu_fld_City" Module="Core" Type="0">Q2l0eQ==</PHRASE>
+ <PHRASE Label="lu_fld_ColumnTranslation" Module="Core" Type="0">Q29sdW1uIFRyYW5zbGF0aW9u</PHRASE>
<PHRASE Label="lu_fld_Comment" Module="Core" Type="0">Q29tbWVudA==</PHRASE>
<PHRASE Label="lu_fld_Company" Module="Core" Type="0">Q29tcGFueQ==</PHRASE>
<PHRASE Label="lu_fld_Country" Module="Core" Type="0">Q291bnRyeQ==</PHRASE>
@@ -167,6 +168,7 @@
<PHRASE Label="lu_fld_FileName" Module="Core" Type="0">RmlsZW5hbWU=</PHRASE>
<PHRASE Label="lu_fld_FirstName" Module="Core" Type="0">Rmlyc3QgbmFtZQ==</PHRASE>
<PHRASE Label="lu_fld_FullName" Module="Core" Type="0">RnVsbCBuYW1l</PHRASE>
+ <PHRASE Label="lu_fld_HintTranslation" Module="Core" Type="0">SGludCBUcmFuc2xhdGlvbg==</PHRASE>
<PHRASE Label="lu_fld_Image1" Module="Core" Type="0">Mm5kIEltYWdl</PHRASE>
<PHRASE Label="lu_fld_Image2" Module="Core" Type="0">M3JkIEltYWdl</PHRASE>
<PHRASE Label="lu_fld_LastName" Module="Core" Type="0">TGFzdCBuYW1l</PHRASE>
Index: phrases_edit.tpl
===================================================================
--- phrases_edit.tpl (revision 14516)
+++ phrases_edit.tpl (working copy)
@@ -54,8 +54,11 @@
<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="lu_fld_primary_translation"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="lu_fld_phrase" style="width: 300px;"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="lu_fld_translation" cols="52" rows="6" format="no_default" style="width: 300px; height: 100px;"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="HintTranslation" title="lu_fld_HintTranslation" cols="52" rows="3" format="no_default" style="width: 300px; height: 50px;"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="ColumnTranslation" title="lu_fld_ColumnTranslation" cols="52" rows="3" format="no_default" style="width: 300px; height: 50px;"/>
+
<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="lu_fld_module" is_last="1"/>
-
+
<inp2:m_RenderElement design="inp_edit_buttons" width="150">
<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get var="phrases_label"/>" />
<input type="hidden" id="next_template" name="next_template" value="<inp2:m_get var="next_template"/>" />
2011-09-06_2216-EmptyColumns.png [^] (109,836 bytes) 2011-09-06 22:24
phrase_storage_automation_core_v2.patch [^] (182,027 bytes) 2011-09-17 06:14
[Show Content]
Index: admin_templates/categories/permissions_tab.tpl
===================================================================
--- admin_templates/categories/permissions_tab.tpl (revision 14516)
+++ admin_templates/categories/permissions_tab.tpl (working copy)
@@ -67,7 +67,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
<inp2:m_set odd_even="table-color1"/>
<thead class="subsectiontitle">
- <td><inp2:m_phrase name="la_col_Description"/></td>
+ <td><inp2:m_phrase name="column:la_fld_Description"/></td>
<td><inp2:m_phrase name="la_col_Inherited"/></td>
<td><inp2:m_phrase name="la_col_InheritedFrom"/></td>
<td><inp2:m_phrase name="la_col_Access"/></td>
Index: admin_templates/incs/custom_blocks.tpl
===================================================================
--- admin_templates/incs/custom_blocks.tpl (revision 14516)
+++ admin_templates/incs/custom_blocks.tpl (working copy)
@@ -109,8 +109,9 @@
<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
+ <inp2:Field field="Prompt" result_to_var="title"/>
<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>', '<inp2:m_Param name="virtual_field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>')">
- <span class="<inp2:m_if check='{$SourcePrefix}_HasError' field='$virtual_field'>error-cell</inp2:m_if>"><inp2:Field field="Prompt" as_label="1"/></span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required"> *</span></inp2:m_if>:
+ <span class="<inp2:m_if check='{$SourcePrefix}_HasError' field='$virtual_field'>error-cell</inp2:m_if>"><inp2:Field field="Prompt" as_label="1"/></span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required"> *</span></inp2:m_if>:<inp2:m_if check="FieldHintLabel" title_label="$title"><span> <img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>" alt="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>"/></inp2:m_if>
<inp2:m_if check="FieldEquals" field="ElementType" value="textarea">
<br/>
Index: admin_templates/incs/form_blocks.tpl
===================================================================
--- admin_templates/incs/form_blocks.tpl (revision 14516)
+++ admin_templates/incs/form_blocks.tpl (working copy)
@@ -111,11 +111,11 @@
<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_if check="m_Param" name="title"><inp2:m_phrase label="$title"/></inp2:m_else/><inp2:m_Param name="title_text"/></inp2:m_if></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>
+ <span class="<inp2:m_if check='{$prefix}_HasError' field='$field'>error-cell</inp2:m_if>"><inp2:m_if check="m_Param" name="title"><inp2:m_phrase label="$title"/></inp2:m_else/><inp2:m_Param name="title_text"/></inp2:m_if></span></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:<inp2:m_if check="{$prefix}_FieldHintLabel" title_label="$title" direct_label="$hint_label"><span> <img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:$prefix_FieldHintLabel title_label='$title' direct_label='$hint_label' html_escape='1'/>" alt="<inp2:$prefix_FieldHintLabel title_label='$title' direct_label='$hint_label' html_escape='1'/>"/></inp2:m_if>
</label>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="inp_edit_field_caption" title="" title_text="" hint_label="" NamePrefix="">
+<inp2:m_DefineElement name="inp_edit_field_caption" title="la_fld_{$field}" title_text="" hint_label="" NamePrefix="">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', '<inp2:m_Param name='field' js_escape='1'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
<inp2:m_if check="m_Param" name="title">
Index: admin_templates/incs/grid_blocks.tpl
===================================================================
--- admin_templates/incs/grid_blocks.tpl (revision 14516)
+++ admin_templates/incs/grid_blocks.tpl (working copy)
@@ -505,7 +505,7 @@
</table>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_column_title" use_phrases="1">
+<inp2:m_DefineElement name="grid_column_title" title="column:la_fld_{$field}" use_phrases="1">
<table style="width: auto" class="layout-only-table"><tr>
<td style="vertical-align: middle; padding: 0px">
<a
@@ -549,7 +549,7 @@
<input type="checkbox" onclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].InvertSelection(); this.checked=false;" ondblclick="Grids['<inp2:m_param name="PrefixSpecial"/>'].ClearSelection(); this.checked=false;" />
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_column_title_no_sorting" use_phrases="1">
+<inp2:m_DefineElement name="grid_column_title_no_sorting" title="column:la_fld_{$field}" use_phrases="1">
<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1"><inp2:m_phrase name="$title"/><inp2:m_else/><inp2:m_param name="title"/></inp2:m_if>
</inp2:m_DefineElement>
Index: admin_templates/languages/phrase_edit.tpl
===================================================================
--- admin_templates/languages/phrase_edit.tpl (revision 14516)
+++ admin_templates/languages/phrase_edit.tpl (working copy)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="888" height="415"/>
+<inp2:adm_SetPopupSize width="888" height="510"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" section="in-portal:phrases" prefix="phrases" title_preset="phrase_edit_single"/>
@@ -73,18 +73,22 @@
<inp2:m_DefineElement name="phrase_element">
<inp2:m_if check="m_Get" name="simple_mode">
- <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
<inp2:m_else/>
<tr class="subsectiontitle">
<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
</tr>
- <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="la_fld_PrimaryTranslation"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="la_fld_Phrase" size="60"/>
- <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="la_fld_PhraseType"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="la_fld_Module"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module"/>
</inp2:m_if>
</inp2:m_DefineElement>
Index: admin_templates/regional/languages_export.tpl
===================================================================
--- admin_templates/regional/languages_export.tpl (revision 14516)
+++ admin_templates/regional/languages_export.tpl (working copy)
@@ -79,7 +79,7 @@
<table id="modules" border="1">
<tr>
- <th align="center" colspan="2"><inp2:m_Phrase name="la_col_Module"/></th>
+ <th align="center" colspan="2"><inp2:m_Phrase name="column:la_fld_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>
Index: admin_templates/regional/phrases_edit.tpl
===================================================================
--- admin_templates/regional/phrases_edit.tpl (revision 14516)
+++ admin_templates/regional/phrases_edit.tpl (working copy)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="888" height="415"/>
+<inp2:adm_SetPopupSize width="888" height="510"/>
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="phrase_edit"/>
@@ -78,12 +78,14 @@
<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
</tr>
- <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="la_fld_PrimaryTranslation"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="la_fld_Phrase" size="60"/>
- <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" rows="7" cols="50" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" size="60"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_Translation" title="la_fld_Translation" style="width: 100%; height: 100px;" control_options="{max_height: 100}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_HintTranslation" title="la_fld_HintTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
+ <inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="phrases" field="l{$language_id}_ColumnTranslation" title="la_fld_ColumnTranslation" style="width: 100%; height: 50px;" control_options="{max_height: 50}" allow_html="0"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="la_fld_PhraseType"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="la_fld_Module"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module"/>
</inp2:m_if>
</inp2:m_DefineElement>
Index: admin_templates/spelling_dictionary/spelling_dictionary_list.tpl
===================================================================
--- admin_templates/spelling_dictionary/spelling_dictionary_list.tpl (revision 14516)
+++ admin_templates/spelling_dictionary/spelling_dictionary_list.tpl (working copy)
@@ -14,7 +14,7 @@
}
var a_toolbar = new ToolBar();
- a_toolbar.AddButton( new ToolBarButton('new_spelling_dictionary', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+ a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
function() {
std_precreate_item('spelling-dictionary', 'spelling_dictionary/spelling_dictionary_edit');
} ) );
Index: admin_templates/submissions/submission_view.tpl
===================================================================
--- admin_templates/submissions/submission_view.tpl (revision 14516)
+++ admin_templates/submissions/submission_view.tpl (working copy)
@@ -150,7 +150,8 @@
<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', 'fld_<inp2:Field name='FormFieldId'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
- <inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/><inp2:m_if check="Field" name="Required" db="db"><span class="field-required"> *</span></inp2:m_if>:
+ <inp2:Field field="Prompt" result_to_var="title"/>
+ <inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/><inp2:m_if check="Field" name="Required" db="db"><span class="field-required"> *</span></inp2:m_if>:<inp2:m_if check="FieldHintLabel" title_label="$title"><span> <img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>" alt="<inp2:FieldHintLabel title_label='$title' html_escape='1'/>"/></inp2:m_if>
</td>
<td class="control-mid"> </td>
<script type="text/javascript">
Index: admin_templates/users/users_edit.tpl
===================================================================
--- admin_templates/users/users_edit.tpl (revision 14516)
+++ admin_templates/users/users_edit.tpl (working copy)
@@ -64,29 +64,29 @@
<inp2:m_RenderElement name="subsection" prefix="u" fields="PortalUserId,Login,Password" title="la_section_General"/>
<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="la_fld_Id"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword"/>
<inp2:m_RenderElement name="subsection" prefix="u" fields="FirstName,LastName,Company,Email,dob,Phone,Fax,Street,Street2,City,State,Zip,Country" title="la_prompt_PersonalInfo"/> <!-- OLD PHRASE, la_section_PersonalInformation -->
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="la_fld_Company"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email"/>
<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="la_prompt_birthday"/> <!-- OLD PHRASE, la_fld_BirthDate -->
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="la_fld_Phone"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="la_fld_Fax"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="la_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="la_fld_AddressLine2"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="la_fld_City"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="la_fld_State"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="la_fld_Zip"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country" has_empty="1"/>
- <inp2:m_RenderElement name="inp_edit_multioptions" prefix="u" field="DisplayToPublic" title="la_fld_DisplayToPublic"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" has_empty="1"/>
+ <inp2:m_RenderElement name="inp_edit_multioptions" prefix="u" field="DisplayToPublic"/>
<inp2:m_RenderElement name="subsection" prefix="u" fields="Status,CreatedOn,Modified" title="la_section_Properties"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="u" field="Status" title="la_fld_Status"/>
- <inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="CreatedOn" title="la_fld_CreatedOn"/>
- <inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="Modified" title="la_fld_Modified"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="u" field="Status"/>
+ <inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="CreatedOn"/>
+ <inp2:m_RenderElement name="inp_edit_date_time" prefix="u" field="Modified"/>
<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
<!-- custom fields: begin -->
Index: install/english.lang
===================================================================
--- install/english.lang (revision 14526)
+++ install/english.lang (working copy)
@@ -1,4 +1,4 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_Active" Module="Core" Type="1">QWN0aXZl</PHRASE>
@@ -63,52 +63,19 @@
<PHRASE Label="la_category_sortfield_prompt" Module="Core" Type="1">T3JkZXIgc2VjdGlvbnMgYnk=</PHRASE>
<PHRASE Label="la_Close" Module="Core" Type="1">Q2xvc2U=</PHRASE>
<PHRASE Label="la_col_Access" Module="Core" Type="1">QWNjZXNz</PHRASE>
- <PHRASE Label="la_col_Action" Module="Core" Type="1">QWN0aW9u</PHRASE>
<PHRASE Label="la_col_AdditionalPermissions" Module="Core" Type="1">QWRkaXRpb25hbA==</PHRASE>
- <PHRASE Label="la_col_AdminInterfaceLang" Module="Core" Type="1">QWRtaW4gUHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_col_AffectedItems" Module="Core" Type="1">QWZmZWN0ZWQgSXRlbXM=</PHRASE>
<PHRASE Label="la_col_AltName" Module="Core" Type="1">QWx0IFZhbHVl</PHRASE>
- <PHRASE Label="la_col_Bcc" Module="Core" Type="1">QmNj</PHRASE>
- <PHRASE Label="la_col_BounceDate" Module="Core" Type="1">Qm91bmNlZCBPbg==</PHRASE>
- <PHRASE Label="la_col_BounceInfo" Module="Core" Type="1">Qm91bmNlIEluZm8=</PHRASE>
<PHRASE Label="la_col_BuildDate" Module="Core" Type="1">QnVpbGQgRGF0ZQ==</PHRASE>
- <PHRASE Label="la_col_Category" Module="Core" Type="1">U2VjdGlvbg==</PHRASE>
<PHRASE Label="la_col_CategoryName" Module="Core" Type="1">U2VjdGlvbiBOYW1l</PHRASE>
- <PHRASE Label="la_col_Cc" Module="Core" Type="1">Q2M=</PHRASE>
- <PHRASE Label="la_col_Changes" Module="Core" Type="1">Q2hhbmdlcw==</PHRASE>
- <PHRASE Label="la_col_Charset" Module="Core" Type="1">Q2hhcnNldA==</PHRASE>
- <PHRASE Label="la_col_Country" Module="Core" Type="1">Q291bnRyeQ==</PHRASE>
- <PHRASE Label="la_col_CreatedOn" Module="Core" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
- <PHRASE Label="la_col_Description" Module="Core" Type="1">RGVzY3JpcHRpb24=</PHRASE>
- <PHRASE Label="la_col_DomainName" Module="Core" Type="1">RG9tYWluIE5hbWU=</PHRASE>
- <PHRASE Label="la_col_Duration" Module="Core" Type="1">RHVyYXRpb24=</PHRASE>
+ <PHRASE Label="la_col_ColumnPhrase" Module="Core" Type="1">Q29sdW1uIFBocmFzZQ==</PHRASE>
<PHRASE Label="la_col_Effective" Module="Core" Type="1">RWZmZWN0aXZl</PHRASE>
- <PHRASE Label="la_col_Email" Module="Core" Type="1">RW1haWw=</PHRASE>
- <PHRASE Label="la_col_EmailCommunicationRole" Module="Core" Type="1">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
<PHRASE Label="la_col_EmailEvents" Module="Core" Type="1">RW1haWwgRXZlbnRz</PHRASE>
- <PHRASE Label="la_col_EmailsQueued" Module="Core" Type="1">UXVldWU=</PHRASE>
- <PHRASE Label="la_col_EmailsSent" Module="Core" Type="1">U2VudA==</PHRASE>
- <PHRASE Label="la_col_EmailsTotal" Module="Core" Type="1">VG90YWw=</PHRASE>
- <PHRASE Label="la_col_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE>
<PHRASE Label="la_col_EnableEmailCommunication" Module="Core" Type="1">RW5hYmxlIEUtbWFpbCBDb21tdW5pY2F0aW9u</PHRASE>
- <PHRASE Label="la_col_EndDate" Module="Core" Type="1">RW5kIERhdGU=</PHRASE>
<PHRASE Label="la_col_Error" Module="Core" Type="1">Jm5ic3A7</PHRASE>
- <PHRASE Label="la_col_Event" Module="Core" Type="1">RXZlbnQ=</PHRASE>
<PHRASE Label="la_col_EventDescription" Module="Core" Type="1">RXZlbnQgRGVzY3JpcHRpb24=</PHRASE>
<PHRASE Label="la_col_EventParams" Module="Core" Type="1">RXZlbnQgUGFyYW1z</PHRASE>
- <PHRASE Label="la_col_FieldComparision" Module="Core" Type="1">TWF0Y2ggVHlwZQ==</PHRASE>
- <PHRASE Label="la_col_FieldName" Module="Core" Type="1">RmllbGQgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_FieldValue" Module="Core" Type="1">TWF0Y2ggVmFsdWU=</PHRASE>
- <PHRASE Label="la_col_FileName" Module="Core" Type="1">RmlsZW5hbWU=</PHRASE>
- <PHRASE Label="la_col_FilePath" Module="Core" Type="1">UGF0aA==</PHRASE>
- <PHRASE Label="la_col_FirstName" Module="Core" Type="1">Rmlyc3QgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_FromEmail" Module="Core" Type="1">RnJvbSBFLW1haWw=</PHRASE>
- <PHRASE Label="la_col_FrontEndOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
- <PHRASE Label="la_col_FrontRegistration" Module="Core" Type="1">QWxsb3cgUmVnaXN0cmF0aW9u</PHRASE>
- <PHRASE Label="la_col_GroupName" Module="Core" Type="1">R3JvdXAgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_Hits" Module="Core" Type="1">SGl0cw==</PHRASE>
- <PHRASE Label="la_col_Id" Module="Core" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_col_Image" Module="Core" Type="1">SW1hZ2U=</PHRASE>
+ <PHRASE Label="la_col_HintPhrase" Module="Core" Type="1">SGludCBQaHJhc2U=</PHRASE>
<PHRASE Label="la_col_ImageEnabled" Module="Core" Type="1">U3RhdHVz</PHRASE>
<PHRASE Label="la_col_ImageName" Module="Core" Type="1">SW1hZ2U=</PHRASE>
<PHRASE Label="la_col_ImageUrl" Module="Core" Type="1">VVJM</PHRASE>
@@ -116,46 +83,21 @@
<PHRASE Label="la_col_InheritedFrom" Module="Core" Type="1">SW5oZXJpdGVkIEZyb20=</PHRASE>
<PHRASE Label="la_col_InMenu" Module="Core" Type="1">SW4gTWVudQ==</PHRASE>
<PHRASE Label="la_col_IP" Module="Core" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_col_ISOCode" Module="Core" Type="1">SVNPIENvZGU=</PHRASE>
<PHRASE Label="la_col_IsPopular" Module="Core" Type="1">UG9wdWxhcg==</PHRASE>
- <PHRASE Label="la_col_IsPrimary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_col_IsPrimaryLanguage" Module="Core" Type="1">VXNlciBQcmltYXJ5</PHRASE>
- <PHRASE Label="la_col_IsSystem" Module="Core" Type="1">U3lzdGVt</PHRASE>
- <PHRASE Label="la_col_ItemField" Module="Core" Type="1">VXNlciBGaWVsZA==</PHRASE>
- <PHRASE Label="la_col_ItemId" Module="Core" Type="1">SXRlbSBJRA==</PHRASE>
<PHRASE Label="la_col_ItemPrefix" Module="Core" Type="1">SXRlbSBQcmVmaXg=</PHRASE>
<PHRASE Label="la_col_Keyword" Module="Core" Type="1">S2V5d29yZA==</PHRASE>
<PHRASE Label="la_col_Label" Module="Core" Type="1">TGFiZWw=</PHRASE>
- <PHRASE Label="la_col_Language" Module="Core" Type="1">TGFuZ3VhZ2U=</PHRASE>
<PHRASE Label="la_col_LanguagePackInstalled" Module="Core" Type="1">TGFuZ3VhZ2UgUGFjayBJbnN0YWxsZWQ=</PHRASE>
<PHRASE Label="la_col_LastChanged" Module="Core" Type="1">TGFzdCBDaGFuZ2Vk</PHRASE>
<PHRASE Label="la_col_LastCompiled" Module="Core" Type="1">TGFzdCBDb21waWxlZA==</PHRASE>
- <PHRASE Label="la_col_LastName" Module="Core" Type="1">TGFzdCBOYW1l</PHRASE>
- <PHRASE Label="la_col_LastRunOn" Module="Core" Type="1">TGFzdCBSdW4gT24=</PHRASE>
- <PHRASE Label="la_col_LastRunStatus" Module="Core" Type="1">TGFzdCBSdW4gU3RhdHVz</PHRASE>
<PHRASE Label="la_col_LastSendRetry" Module="Core" Type="1">TGFzdCBBdHRlbXB0</PHRASE>
- <PHRASE Label="la_col_LastUpdatedOn" Module="Core" Type="1">TGFzdCBVcGRhdGVkIE9u</PHRASE>
<PHRASE Label="la_col_LinkUrl" Module="Core" Type="1">TGluayBVUkw=</PHRASE>
- <PHRASE Label="la_col_LocalName" Module="Core" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_Location" Module="Core" Type="1">TG9jYXRpb24=</PHRASE>
- <PHRASE Label="la_col_Login" Module="Core" Type="1">TG9naW4=</PHRASE>
<PHRASE Label="la_col_MailingList" Module="Core" Type="1">TWFpbGluZyBMaXN0</PHRASE>
- <PHRASE Label="la_col_MasterId" Module="Core" Type="1">TWFzdGVyIElE</PHRASE>
- <PHRASE Label="la_col_MasterPrefix" Module="Core" Type="1">TWFzdGVyIFByZWZpeA==</PHRASE>
<PHRASE Label="la_col_MembershipExpires" Module="Core" Type="1">TWVtYmVyc2hpcCBFeHBpcmVz</PHRASE>
- <PHRASE Label="la_col_Message" Module="Core" Type="1">TWVzc2FnZQ==</PHRASE>
<PHRASE Label="la_col_MessageHeaders" Module="Core" Type="1">TWVzc2FnZSBIZWFkZXJz</PHRASE>
<PHRASE Label="la_col_MessageHtml" Module="Core" Type="1">SFRNTA==</PHRASE>
- <PHRASE Label="la_col_MessageText" Module="Core" Type="1">UGxhaW4gVGV4dA==</PHRASE>
- <PHRASE Label="la_col_MisspelledWord" Module="Core" Type="1">TWlzc3BlbGxlZCBXb3Jk</PHRASE>
- <PHRASE Label="la_col_Modified" Module="Core" Type="1">TW9kaWZpZWQgT24=</PHRASE>
- <PHRASE Label="la_col_Module" Module="Core" Type="1">TW9kdWxl</PHRASE>
- <PHRASE Label="la_col_Name" Module="Core" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_NextRunOn" Module="Core" Type="1">TmV4dCBSdW4gT24=</PHRASE>
- <PHRASE Label="la_col_OccuredOn" Module="Core" Type="1">T2NjdXJlZCBPbg==</PHRASE>
<PHRASE Label="la_col_OriginalValue" Module="Core" Type="1">T3JpZ2luYWwgVmFsdWU=</PHRASE>
- <PHRASE Label="la_col_PackName" Module="Core" Type="1">UGFjayBOYW1l</PHRASE>
- <PHRASE Label="la_col_PageTitle" Module="Core" Type="1">U2VjdGlvbiBUaXRsZQ==</PHRASE>
<PHRASE Label="la_col_Path" Module="Core" Type="1">UGF0aA==</PHRASE>
<PHRASE Label="la_col_PermAdd" Module="Core" Type="1">QWRk</PHRASE>
<PHRASE Label="la_col_PermDelete" Module="Core" Type="1">RGVsZXRl</PHRASE>
@@ -163,69 +105,27 @@
<PHRASE Label="la_col_PermissionName" Module="Core" Type="1">UGVybWlzc2lvbiBOYW1l</PHRASE>
<PHRASE Label="la_col_PermissionValue" Module="Core" Type="1">QWNjZXNz</PHRASE>
<PHRASE Label="la_col_PermView" Module="Core" Type="1">Vmlldw==</PHRASE>
- <PHRASE Label="la_col_Phrase" Module="Core" Type="1">UGhyYXNl</PHRASE>
<PHRASE Label="la_col_Phrases" Module="Core" Type="1">UGhyYXNlcw==</PHRASE>
- <PHRASE Label="la_col_PhraseType" Module="Core" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_PortalUserId" Module="Core" Type="1">VXNlciBJRA==</PHRASE>
- <PHRASE Label="la_col_Prefix" Module="Core" Type="1">UHJlZml4</PHRASE>
<PHRASE Label="la_col_Preview" Module="Core" Type="1">UHJldmlldw==</PHRASE>
- <PHRASE Label="la_col_Primary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_col_PrimaryGroup" Module="Core" Type="1">UHJpbWFyeSBHcm91cA==</PHRASE>
<PHRASE Label="la_col_PrimaryValue" Module="Core" Type="1">UHJpbWFyeSBWYWx1ZQ==</PHRASE>
- <PHRASE Label="la_col_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE>
<PHRASE Label="la_col_Prompt" Module="Core" Type="1">RmllbGQgUHJvbXB0</PHRASE>
- <PHRASE Label="la_col_Protected" Module="Core" Type="1">UHJvdGVjdGVk</PHRASE>
<PHRASE Label="la_col_Queued" Module="Core" Type="1">UXVldWVk</PHRASE>
- <PHRASE Label="la_col_Rating" Module="Core" Type="1">UmF0aW5n</PHRASE>
- <PHRASE Label="la_col_RecipientType" Module="Core" Type="1">UmVjaXBpZW50IFR5cGU=</PHRASE>
<PHRASE Label="la_col_Referer" Module="Core" Type="1">UmVmZXJlcg==</PHRASE>
- <PHRASE Label="la_col_ReferrerURL" Module="Core" Type="1">UmVmZXJyZXIgVVJM</PHRASE>
- <PHRASE Label="la_col_RelationshipType" Module="Core" Type="1">UmVsYXRpb24gVHlwZQ==</PHRASE>
- <PHRASE Label="la_col_RepliedOn" Module="Core" Type="1">UmVwbGllZCBPbg==</PHRASE>
- <PHRASE Label="la_col_ReplyStatus" Module="Core" Type="1">UmVwbGllZA==</PHRASE>
- <PHRASE Label="la_col_RequireLogin" Module="Core" Type="1">UmVxdWlyZSBMb2dpbg==</PHRASE>
<PHRASE Label="la_col_ResetToDefaultSorting" Module="Core" Type="1">UmVzZXQgdG8gZGVmYXVsdA==</PHRASE>
<PHRASE Label="la_col_ReviewCount" Module="Core" Type="1">Q29tbWVudHM=</PHRASE>
<PHRASE Label="la_col_ReviewedBy" Module="Core" Type="1">Q3JlYXRlZCBieQ==</PHRASE>
- <PHRASE Label="la_col_ReviewText" Module="Core" Type="1">Q29tbWVudA==</PHRASE>
- <PHRASE Label="la_col_RuleType" Module="Core" Type="1">UnVsZSBUeXBl</PHRASE>
- <PHRASE Label="la_col_RunInterval" Module="Core" Type="1">UnVuIEludGVydmFs</PHRASE>
- <PHRASE Label="la_col_RunMode" Module="Core" Type="1">UnVuIE1vZGU=</PHRASE>
- <PHRASE Label="la_col_SearchTerm" Module="Core" Type="1">U2VhcmNoIFRlcm0=</PHRASE>
<PHRASE Label="la_col_SendRetries" Module="Core" Type="1">QXR0ZW1wdHMg</PHRASE>
- <PHRASE Label="la_col_SentOn" Module="Core" Type="1">U2VudCBPbg==</PHRASE>
- <PHRASE Label="la_col_SentStatus" Module="Core" Type="1">U2VudA==</PHRASE>
<PHRASE Label="la_col_SessionEnd" Module="Core" Type="1">U2Vzc2lvbiBFbmQ=</PHRASE>
- <PHRASE Label="la_col_SessionLogId" Module="Core" Type="1">U2Vzc2lvbiBMb2cgSUQ=</PHRASE>
<PHRASE Label="la_col_SessionStart" Module="Core" Type="1">U2Vzc2lvbiBTdGFydA==</PHRASE>
- <PHRASE Label="la_col_ShortIsoCode" Module="Core" Type="1">U2hvcnQgSVNPIENvZGU=</PHRASE>
- <PHRASE Label="la_col_SkinName" Module="Core" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_SortBy" Module="Core" Type="1">U29ydCBieQ==</PHRASE>
- <PHRASE Label="la_col_SSLUrl" Module="Core" Type="1">U1NMIFVybA==</PHRASE>
- <PHRASE Label="la_col_StateCountry" Module="Core" Type="1">U3RhdGUgQ291bnRyeQ==</PHRASE>
- <PHRASE Label="la_col_Status" Module="Core" Type="1">U3RhdHVz</PHRASE>
- <PHRASE Label="la_col_StopWord" Module="Core" Type="1">U3RvcCBXb3Jk</PHRASE>
- <PHRASE Label="la_col_Subject" Module="Core" Type="1">U3ViamVjdA==</PHRASE>
- <PHRASE Label="la_col_SuggestedCorrection" Module="Core" Type="1">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
<PHRASE Label="la_col_System" Module="Core" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_SystemPath" Module="Core" Type="1">U3lzdGVtIFBhdGg=</PHRASE>
- <PHRASE Label="la_col_TargetId" Module="Core" Type="1">SXRlbQ==</PHRASE>
<PHRASE Label="la_col_TargetType" Module="Core" Type="1">SXRlbSBUeXBl</PHRASE>
- <PHRASE Label="la_col_TemplateType" Module="Core" Type="1">VGVtcGxhdGU=</PHRASE>
- <PHRASE Label="la_col_Theme" Module="Core" Type="1">VGhlbWU=</PHRASE>
- <PHRASE Label="la_col_ThesaurusTerm" Module="Core" Type="1">VGhlc2F1cnVzIFRlcm0=</PHRASE>
- <PHRASE Label="la_col_ThesaurusType" Module="Core" Type="1">VGhlc2F1cnVzIFR5cGU=</PHRASE>
- <PHRASE Label="la_col_Title" Module="Core" Type="1">VGl0bGU=</PHRASE>
- <PHRASE Label="la_col_ToEmail" Module="Core" Type="1">VG8gRS1tYWls</PHRASE>
- <PHRASE Label="la_col_Translation" Module="Core" Type="1">VmFsdWU=</PHRASE>
- <PHRASE Label="la_col_Type" Module="Core" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_UserCount" Module="Core" Type="1">VXNlcnM=</PHRASE>
<PHRASE Label="la_col_UserFirstLastName" Module="Core" Type="1">TGFzdG5hbWUgRmlyc3RuYW1l</PHRASE>
- <PHRASE Label="la_col_Username" Module="Core" Type="1">VXNlcm5hbWU=</PHRASE>
- <PHRASE Label="la_col_UseSecurityImage" Module="Core" Type="1">VXNlIFNlY3VyaXR5IEltYWdl</PHRASE>
<PHRASE Label="la_col_Value" Module="Core" Type="1">RmllbGQgVmFsdWU=</PHRASE>
- <PHRASE Label="la_col_Version" Module="Core" Type="1">VmVyc2lvbg==</PHRASE>
- <PHRASE Label="la_col_Visibility" Module="Core" Type="1">VmlzaWJpbGl0eQ==</PHRASE>
<PHRASE Label="la_col_Visible" Module="Core" Type="1">VmlzaWJsZQ==</PHRASE>
<PHRASE Label="la_col_VisitDate" Module="Core" Type="1">VmlzaXQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_common_ascending" Module="Core" Type="1">QXNjZW5kaW5n</PHRASE>
@@ -379,16 +279,17 @@
<PHRASE Label="la_Field" Module="Core" Type="1">RmllbGQ=</PHRASE>
<PHRASE Label="la_field_displayorder" Module="Core" Type="1">RGlzcGxheSBPcmRlcg==</PHRASE>
<PHRASE Label="la_field_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE>
- <PHRASE Label="la_fld_Action" Module="Core" Type="1">QWN0aW9u</PHRASE>
+ <PHRASE Label="la_fld_Action" Module="Core" Type="1" Column="QWN0aW9u">QWN0aW9u</PHRASE>
<PHRASE Label="la_fld_AddressLine1" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>
<PHRASE Label="la_fld_AddressLine2" Module="Core" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>
<PHRASE Label="la_fld_AdminEmail" Module="Core" Type="1">TWVzc2FnZXMgZnJvbSBTaXRlIEFkbWluIGFyZSBmcm9t</PHRASE>
- <PHRASE Label="la_fld_AdminInterfaceLang" Module="Core" Type="1">QWRtaW4gUHJpbWFyeQ==</PHRASE>
+ <PHRASE Label="la_fld_AdminInterfaceLang" Module="Core" Type="1" Column="QWRtaW4gUHJpbWFyeQ==">QWRtaW4gUHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_AdvancedCSS" Module="Core" Type="1">QWR2YW5jZWQgQ1NT</PHRASE>
<PHRASE Label="la_fld_AdvancedSearch" Module="Core" Type="1">QWR2YW5jZWQgU2VhcmNo</PHRASE>
<PHRASE Label="la_fld_AllowChangingRecipient" Module="Core" Type="1">QWxsb3cgQ2hhbmdpbmcgIlRvIiBSZWNpcGllbnQ=</PHRASE>
<PHRASE Label="la_fld_AllowChangingSender" Module="Core" Type="1">QWxsb3cgQ2hhbmdpbmcgU2VuZGVy</PHRASE>
<PHRASE Label="la_fld_AltValue" Module="Core" Type="1">QWx0IFZhbHVl</PHRASE>
+ <PHRASE Label="la_fld_Answer" Module="Core" Type="1">QW5zd2Vy</PHRASE>
<PHRASE Label="LA_FLD_ATTACHMENT" Module="Core" Type="1">QXR0YWNobWVudA==</PHRASE>
<PHRASE Label="la_fld_AutoCreateFileName" Module="Core" Type="1">QXV0byBDcmVhdGUgRmlsZSBOYW1l</PHRASE>
<PHRASE Label="la_fld_AutomaticFilename" Module="Core" Type="1">QXV0b21hdGljIEZpbGVuYW1l</PHRASE>
@@ -399,34 +300,35 @@
<PHRASE Label="la_fld_BackgroundImage" Module="Core" Type="1">QmFja2dyb3VuZCBJbWFnZQ==</PHRASE>
<PHRASE Label="la_fld_BackgroundPosition" Module="Core" Type="1">QmFja2dyb3VuZCBQb3NpdGlvbg==</PHRASE>
<PHRASE Label="la_fld_BackgroundRepeat" Module="Core" Type="1">QmFja2dyb3VuZCBSZXBlYXQ=</PHRASE>
- <PHRASE Label="la_fld_Bcc" Module="Core" Type="1">QmNj</PHRASE>
+ <PHRASE Label="la_fld_Bcc" Module="Core" Type="1" Column="QmNj">QmNj</PHRASE>
<PHRASE Label="la_fld_BlockPosition" Module="Core" Type="1">RWxlbWVudCBQb3NpdGlvbg==</PHRASE>
<PHRASE Label="la_fld_BorderBottom" Module="Core" Type="1">Qm9yZGVyIEJvdHRvbQ==</PHRASE>
<PHRASE Label="la_fld_BorderLeft" Module="Core" Type="1">Qm9yZGVyIExlZnQ=</PHRASE>
<PHRASE Label="la_fld_BorderRight" Module="Core" Type="1">Qm9yZGVyIFJpZ2h0</PHRASE>
<PHRASE Label="la_fld_Borders" Module="Core" Type="1">Qm9yZGVycw==</PHRASE>
<PHRASE Label="la_fld_BorderTop" Module="Core" Type="1">Qm9yZGVyIFRvcA==</PHRASE>
- <PHRASE Label="la_fld_BounceDate" Module="Core" Type="1">Qm91bmNlIERhdGU=</PHRASE>
+ <PHRASE Label="la_fld_BounceDate" Module="Core" Type="1" Column="Qm91bmNlZCBPbg==">Qm91bmNlIERhdGU=</PHRASE>
<PHRASE Label="la_fld_BounceEmail" Module="Core" Type="1">Qm91bmNlIEVtYWls</PHRASE>
- <PHRASE Label="la_fld_BounceInfo" Module="Core" Type="1">Qm91bmNlIEluZm8=</PHRASE>
- <PHRASE Label="la_fld_Category" Module="Core" Type="1">U2VjdGlvbg==</PHRASE>
+ <PHRASE Label="la_fld_BounceInfo" Module="Core" Type="1" Column="Qm91bmNlIEluZm8=">Qm91bmNlIEluZm8=</PHRASE>
+ <PHRASE Label="la_fld_Category" Module="Core" Type="1" Column="U2VjdGlvbg==">U2VjdGlvbg==</PHRASE>
<PHRASE Label="la_fld_CategoryFormat" Module="Core" Type="1">U2VjdGlvbiBGb3JtYXQ=</PHRASE>
<PHRASE Label="la_fld_CategoryId" Module="Core" Type="1">U2VjdGlvbiBJRA==</PHRASE>
<PHRASE Label="la_fld_CategorySeparator" Module="Core" Type="1">U2VjdGlvbiBzZXBhcmF0b3I=</PHRASE>
<PHRASE Label="la_fld_CategoryTemplate" Module="Core" Type="1">U2VjdGlvbiBUZW1wbGF0ZQ==</PHRASE>
- <PHRASE Label="la_fld_Cc" Module="Core" Type="1">Q2M=</PHRASE>
- <PHRASE Label="la_fld_Changes" Module="Core" Type="1">Q2hhbmdlcw==</PHRASE>
- <PHRASE Label="la_fld_Charset" Module="Core" Type="1">Q2hhcnNldA==</PHRASE>
+ <PHRASE Label="la_fld_Cc" Module="Core" Type="1" Column="Q2M=">Q2M=</PHRASE>
+ <PHRASE Label="la_fld_Changes" Module="Core" Type="1" Column="Q2hhbmdlcw==">Q2hhbmdlcw==</PHRASE>
+ <PHRASE Label="la_fld_Charset" Module="Core" Type="1" Column="Q2hhcnNldA==">Q2hhcnNldA==</PHRASE>
<PHRASE Label="la_fld_CheckDuplicatesMethod" Module="Core" Type="1">Q2hlY2sgRHVwbGljYXRlcyBieQ==</PHRASE>
<PHRASE Label="la_fld_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>
+ <PHRASE Label="la_fld_ColumnTranslation" Module="Core" Type="1" Hint="QXNzb2NpYXRlZCBjb2x1bW4gaGVhZGluZyB0cmFuc2xhdGlvbg==">Q29sdW1uIFBocmFzZQ==</PHRASE>
<PHRASE Label="la_fld_Comments" Module="Core" Type="1">Q29tbWVudHM=</PHRASE>
<PHRASE Label="la_fld_Company" Module="Core" Type="1">Q29tcGFueQ==</PHRASE>
<PHRASE Label="la_fld_ConfigHeader" Module="Core" Type="1">Q29uZmlndXJhdGlvbiBIZWFkZXIgTGFiZWw=</PHRASE>
<PHRASE Label="la_fld_ContentBlock" Module="Core" Type="1">Q29udGVudCBCbG9jaw==</PHRASE>
<PHRASE Label="la_fld_CopyLabels" Module="Core" Type="1">Q29weSBMYWJlbHMgZnJvbSB0aGlzIExhbmd1YWdl</PHRASE>
- <PHRASE Label="la_fld_Country" Module="Core" Type="1">Q291bnRyeQ==</PHRASE>
+ <PHRASE Label="la_fld_Country" Module="Core" Type="1" Column="Q291bnRyeQ==">Q291bnRyeQ==</PHRASE>
<PHRASE Label="la_fld_CreatedById" Module="Core" Type="1">Q3JlYXRlZCBCeQ==</PHRASE>
- <PHRASE Label="la_fld_CreatedOn" Module="Core" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_CreatedOn" Module="Core" Type="1" Column="Q3JlYXRlZCBPbg==">Q3JlYXRlZCBPbg==</PHRASE>
<PHRASE Label="la_fld_CSS" Module="Core" Type="1">Q1NTIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_Cursor" Module="Core" Type="1">Q3Vyc29y</PHRASE>
<PHRASE Label="la_fld_CustomDetailTemplate" Module="Core" Type="1">Q3VzdG9tIERldGFpbHMgVGVtcGxhdGU=</PHRASE>
@@ -435,28 +337,28 @@
<PHRASE Label="la_fld_CustomTemplate" Module="Core" Type="1">DQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KDQoNCg0KRGV0YWlscyBUZW1wbGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_DateFormat" Module="Core" Type="1">RGF0ZSBGb3JtYXQ=</PHRASE>
<PHRASE Label="la_fld_DecimalPoint" Module="Core" Type="1">RGVjaW1hbCBQb2ludA==</PHRASE>
- <PHRASE Label="la_fld_Description" Module="Core" Type="1">RGVzY3JpcHRpb24=</PHRASE>
+ <PHRASE Label="la_fld_Description" Module="Core" Type="1" Column="RGVzY3JpcHRpb24=">RGVzY3JpcHRpb24=</PHRASE>
<PHRASE Label="la_fld_Display" Module="Core" Type="1">RGlzcGxheQ==</PHRASE>
<PHRASE Label="la_fld_DisplayInGrid" Module="Core" Type="1">RGlzcGxheSBpbiBHcmlk</PHRASE>
<PHRASE Label="la_fld_DisplayName" Module="Core" Type="1">RmllbGQgTGFiZWw=</PHRASE>
<PHRASE Label="la_fld_DisplayToPublic" Module="Core" Type="1">RGlzcGxheSBUbyBQdWJsaWM=</PHRASE>
<PHRASE Label="la_fld_DomainIPRange" Module="Core" Type="1">UmFuZ2Ugb2YgSVBz</PHRASE>
- <PHRASE Label="la_fld_DomainName" Module="Core" Type="1">RG9tYWluIE5hbWU=</PHRASE>
+ <PHRASE Label="la_fld_DomainName" Module="Core" Type="1" Column="RG9tYWluIE5hbWU=">RG9tYWluIE5hbWU=</PHRASE>
<PHRASE Label="la_fld_DoNotEncode" Module="Core" Type="1">QXMgUGxhaW4gVGV4dA==</PHRASE>
- <PHRASE Label="la_fld_Duration" Module="Core" Type="1">RHVyYXRpb24=</PHRASE>
+ <PHRASE Label="la_fld_Duration" Module="Core" Type="1" Column="RHVyYXRpb24=">RHVyYXRpb24=</PHRASE>
<PHRASE Label="la_fld_EditorsPick" Module="Core" Type="1">RWRpdG9ycyBQaWNr</PHRASE>
<PHRASE Label="la_fld_ElapsedTime" Module="Core" Type="1">RWxhcHNlZCBUaW1l</PHRASE>
- <PHRASE Label="la_fld_Email" Module="Core" Type="1">RS1tYWls</PHRASE>
- <PHRASE Label="la_fld_EmailCommunicationRole" Module="Core" Type="1">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
- <PHRASE Label="la_fld_EmailsQueued" Module="Core" Type="1">RW1haWxzIGluIFF1ZXVl</PHRASE>
- <PHRASE Label="la_fld_EmailsSent" Module="Core" Type="1">RW1haWxzIFNlbnQ=</PHRASE>
- <PHRASE Label="la_fld_EmailsTotal" Module="Core" Type="1">RW1haWxzIFRvdGFs</PHRASE>
+ <PHRASE Label="la_fld_Email" Module="Core" Type="1" Column="RW1haWw=">RS1tYWls</PHRASE>
+ <PHRASE Label="la_fld_EmailCommunicationRole" Module="Core" Type="1" Column="RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==">RS1tYWlsIENvbW11bmljYXRpb24gUm9sZQ==</PHRASE>
+ <PHRASE Label="la_fld_EmailsQueued" Module="Core" Type="1" Column="UXVldWU=">RW1haWxzIGluIFF1ZXVl</PHRASE>
+ <PHRASE Label="la_fld_EmailsSent" Module="Core" Type="1" Column="U2VudA==">RW1haWxzIFNlbnQ=</PHRASE>
+ <PHRASE Label="la_fld_EmailsTotal" Module="Core" Type="1" Column="VG90YWw=">RW1haWxzIFRvdGFs</PHRASE>
<PHRASE Label="la_fld_Enable" Module="Core" Type="1">RW5hYmxl</PHRASE>
- <PHRASE Label="la_fld_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE>
+ <PHRASE Label="la_fld_Enabled" Module="Core" Type="1" Column="RW5hYmxlZA==">RW5hYmxlZA==</PHRASE>
<PHRASE Label="la_fld_EnablePageCache" Module="Core" Type="1">RW5hYmxlIENhY2hpbmcgZm9yIHRoaXMgU2VjdGlvbg==</PHRASE>
<PHRASE Label="la_fld_ErrorTag" Module="Core" Type="1">RXJyb3IgVGFn</PHRASE>
<PHRASE Label="la_fld_EstimatedTime" Module="Core" Type="1">RXN0aW1hdGVkIFRpbWU=</PHRASE>
- <PHRASE Label="la_fld_Event" Module="Core" Type="1">RXZlbnQ=</PHRASE>
+ <PHRASE Label="la_fld_Event" Module="Core" Type="1" Column="RXZlbnQ=">RXZlbnQ=</PHRASE>
<PHRASE Label="la_fld_Expire" Module="Core" Type="1">RXhwaXJl</PHRASE>
<PHRASE Label="la_fld_ExportColumns" Module="Core" Type="1">RXhwb3J0IGNvbHVtbnM=</PHRASE>
<PHRASE Label="la_fld_ExportEmailEvents" Module="Core" Type="1">RXhwb3J0IFNwZWNpZmllZCBFbWFpbCBFdmVudHM=</PHRASE>
@@ -471,18 +373,18 @@
<PHRASE Label="la_fld_ExternalUrl" Module="Core" Type="1">RXh0ZXJuYWwgVVJM</PHRASE>
<PHRASE Label="la_fld_ExtraHeaders" Module="Core" Type="1">RXh0cmEgSGVhZGVycw==</PHRASE>
<PHRASE Label="la_fld_Fax" Module="Core" Type="1">RmF4</PHRASE>
- <PHRASE Label="la_fld_FieldComparision" Module="Core" Type="1">TWF0Y2ggVHlwZQ==</PHRASE>
- <PHRASE Label="la_fld_FieldName" Module="Core" Type="1">RmllbGQgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_FieldComparision" Module="Core" Type="1" Column="TWF0Y2ggVHlwZQ==">TWF0Y2ggVHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_FieldName" Module="Core" Type="1" Column="RmllbGQgTmFtZQ==">RmllbGQgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_FieldsEnclosedBy" Module="Core" Type="1">RmllbGRzIGVuY2xvc2VkIGJ5</PHRASE>
<PHRASE Label="la_fld_FieldsSeparatedBy" Module="Core" Type="1">RmllbGRzIHNlcGFyYXRlZCBieQ==</PHRASE>
<PHRASE Label="la_fld_FieldTitles" Module="Core" Type="1">RmllbGQgVGl0bGVz</PHRASE>
<PHRASE Label="la_fld_FieldType" Module="Core" Type="1">RmllbGQgVHlwZQ==</PHRASE>
- <PHRASE Label="la_fld_FieldValue" Module="Core" Type="1">TWF0Y2ggVmFsdWU=</PHRASE>
+ <PHRASE Label="la_fld_FieldValue" Module="Core" Type="1" Column="TWF0Y2ggVmFsdWU=">TWF0Y2ggVmFsdWU=</PHRASE>
<PHRASE Label="la_fld_FileContents" Module="Core" Type="1">RmlsZSBDb250ZW50cw==</PHRASE>
- <PHRASE Label="la_fld_Filename" Module="Core" Type="1">RmlsZW5hbWU=</PHRASE>
+ <PHRASE Label="la_fld_Filename" Module="Core" Type="1" Column="RmlsZW5hbWU=">RmlsZW5hbWU=</PHRASE>
<PHRASE Label="la_fld_FilenameReplacements" Module="Core" Type="1">RmlsZW5hbWUgUmVwbGFjZW1lbnRz</PHRASE>
- <PHRASE Label="la_fld_FilePath" Module="Core" Type="1">UGF0aA==</PHRASE>
- <PHRASE Label="la_fld_FirstName" Module="Core" Type="1">Rmlyc3QgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_FilePath" Module="Core" Type="1" Column="UGF0aA==">UGF0aA==</PHRASE>
+ <PHRASE Label="la_fld_FirstName" Module="Core" Type="1" Column="Rmlyc3QgTmFtZQ==">Rmlyc3QgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_Font" Module="Core" Type="1">Rm9udA==</PHRASE>
<PHRASE Label="la_fld_FontColor" Module="Core" Type="1">Rm9udCBDb2xvcg==</PHRASE>
<PHRASE Label="la_fld_FontFamily" Module="Core" Type="1">Rm9udCBGYW1pbHk=</PHRASE>
@@ -492,20 +394,21 @@
<PHRASE Label="la_fld_Form" Module="Core" Type="1">T25saW5lIEZvcm0=</PHRASE>
<PHRASE Label="la_fld_FormSubmittedTemplate" Module="Core" Type="1">T25saW5lIEZvcm0gU3VibWl0dGVkIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_FriendlyURL" Module="Core" Type="1">U2hvcnQgVVJM</PHRASE>
- <PHRASE Label="la_fld_FromEmail" Module="Core" Type="1">RnJvbSBFbWFpbA==</PHRASE>
- <PHRASE Label="la_fld_FrontEndOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
- <PHRASE Label="la_fld_FrontRegistration" Module="Core" Type="1">QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==</PHRASE>
- <PHRASE Label="la_fld_Group" Module="Core" Type="1">VXNlciBHcm91cA==</PHRASE>
+ <PHRASE Label="la_fld_FromEmail" Module="Core" Type="1" Column="RnJvbSBFLW1haWw=">RnJvbSBFbWFpbA==</PHRASE>
+ <PHRASE Label="la_fld_FrontEndOnly" Module="Core" Type="1" Column="RnJvbnQtRW5kIE9ubHk=">RnJvbnQtRW5kIE9ubHk=</PHRASE>
+ <PHRASE Label="la_fld_FrontRegistration" Module="Core" Type="1" Column="QWxsb3cgUmVnaXN0cmF0aW9u">QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==</PHRASE>
+ <PHRASE Label="la_fld_Group" Module="Core" Type="1" Column="R3JvdXA=">VXNlciBHcm91cA==</PHRASE>
<PHRASE Label="la_fld_GroupId" Module="Core" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_fld_GroupName" Module="Core" Type="1">R3JvdXAgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_GroupName" Module="Core" Type="1" Column="R3JvdXAgTmFtZQ==">R3JvdXAgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_Height" Module="Core" Type="1">SGVpZ2h0</PHRASE>
- <PHRASE Label="la_fld_Hits" Module="Core" Type="1">SGl0cw==</PHRASE>
+ <PHRASE Label="la_fld_HintTranslation" Module="Core" Type="1" Hint="QXNzb2NpYXRlZCBmaWVsZCB1c2FnZSB0cmFuc2xhdGlvbg==">SGludCBQaHJhc2U=</PHRASE>
+ <PHRASE Label="la_fld_Hits" Module="Core" Type="1" Column="SGl0cw==">SGl0cw==</PHRASE>
<PHRASE Label="la_fld_Hot" Module="Core" Type="1">SG90</PHRASE>
<PHRASE Label="LA_FLD_HTMLVERSION" Module="Core" Type="1">SFRNTCBWZXJzaW9u</PHRASE>
<PHRASE Label="la_fld_IconDisabledURL" Module="Core" Type="1">SWNvbiBVUkwgKGRpc2FibGVkKQ==</PHRASE>
<PHRASE Label="la_fld_IconURL" Module="Core" Type="1">SWNvbiBVUkw=</PHRASE>
- <PHRASE Label="la_fld_Id" Module="Core" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_fld_Image" Module="Core" Type="1">SW1hZ2U=</PHRASE>
+ <PHRASE Label="la_fld_Id" Module="Core" Type="1" Column="SUQ=">SUQ=</PHRASE>
+ <PHRASE Label="la_fld_Image" Module="Core" Type="1" Column="SW1hZ2U=">SW1hZ2U=</PHRASE>
<PHRASE Label="la_fld_ImportCategory" Module="Core" Type="1">SW1wb3J0IFNlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_ImportColumns" Module="Core" Type="1">SW1wb3J0IENvbHVtbnM=</PHRASE>
<PHRASE Label="la_fld_ImportFile" Module="Core" Type="1">SW1wb3J0IEZpbGU=</PHRASE>
@@ -515,31 +418,33 @@
<PHRASE Label="la_fld_InputTimeFormat" Module="Core" Type="1">SW5wdXQgVGltZSBGb3JtYXQ=</PHRASE>
<PHRASE Label="la_fld_InstallModules" Module="Core" Type="1">SW5zdGFsbCBNb2R1bGVz</PHRASE>
<PHRASE Label="la_fld_InstallPhraseTypes" Module="Core" Type="1">SW5zdGFsbCBQaHJhc2UgVHlwZXM=</PHRASE>
- <PHRASE Label="la_fld_IPAddress" Module="Core" Type="1">SVAgQWRkcmVzcw==</PHRASE>
+ <PHRASE Label="la_fld_IPAddress" Module="Core" Type="1" Column="SVAgQWRkcmVzcw==">SVAgQWRkcmVzcw==</PHRASE>
<PHRASE Label="la_fld_IsBaseCategory" Module="Core" Type="1">VXNlIGN1cnJlbnQgc2VjdGlvbiBhcyByb290IGZvciB0aGUgZXhwb3J0</PHRASE>
- <PHRASE Label="la_fld_ISOCode" Module="Core" Type="1">SVNPIENvZGU=</PHRASE>
- <PHRASE Label="la_fld_IsPrimary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
+ <PHRASE Label="la_fld_ISOCode" Module="Core" Type="1" Column="SVNPIENvZGU=">SVNPIENvZGU=</PHRASE>
+ <PHRASE Label="la_fld_IsPrimary" Module="Core" Type="1" Column="UHJpbWFyeQ==">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_IsRequired" Module="Core" Type="1">UmVxdWlyZWQ=</PHRASE>
- <PHRASE Label="la_fld_IsSystem" Module="Core" Type="1">SXMgU3lzdGVt</PHRASE>
+ <PHRASE Label="la_fld_IsSystem" Module="Core" Type="1" Column="U3lzdGVt">SXMgU3lzdGVt</PHRASE>
<PHRASE Label="la_fld_IsSystemTemplate" Module="Core" Type="1">U3lzdGVtIFRlbXBsYXRl</PHRASE>
- <PHRASE Label="la_fld_ItemField" Module="Core" Type="1">VXNlciBGaWVsZA==</PHRASE>
- <PHRASE Label="la_fld_ItemId" Module="Core" Type="1">SXRlbSBJRA==</PHRASE>
+ <PHRASE Label="la_fld_ItemField" Module="Core" Type="1" Column="VXNlciBGaWVsZA==">VXNlciBGaWVsZA==</PHRASE>
+ <PHRASE Label="la_fld_ItemId" Module="Core" Type="1" Column="SXRlbSBJRA==">SXRlbSBJRA==</PHRASE>
<PHRASE Label="la_fld_ItemTemplate" Module="Core" Type="1">SXRlbSBUZW1wbGF0ZQ==</PHRASE>
- <PHRASE Label="la_fld_Language" Module="Core" Type="1">TGFuZ3VhZ2U=</PHRASE>
+ <PHRASE Label="la_fld_Language" Module="Core" Type="1" Column="TGFuZ3VhZ2U=">TGFuZ3VhZ2U=</PHRASE>
<PHRASE Label="la_fld_LanguageFile" Module="Core" Type="1">TGFuZ3VhZ2UgRmlsZQ==</PHRASE>
<PHRASE Label="la_fld_LanguageId" Module="Core" Type="1">TGFuZ3VhZ2UgSUQ=</PHRASE>
<PHRASE Label="la_fld_Languages" Module="Core" Type="1">TGFuZ3VhZ2Vz</PHRASE>
- <PHRASE Label="la_fld_LastName" Module="Core" Type="1">TGFzdCBOYW1l</PHRASE>
- <PHRASE Label="la_fld_LastRunOn" Module="Core" Type="1">TGFzdCBSdW4gT24=</PHRASE>
- <PHRASE Label="la_fld_LastRunStatus" Module="Core" Type="1">TGFzdCBSdW4gU3RhdHVz</PHRASE>
- <PHRASE Label="la_fld_LastUpdatedOn" Module="Core" Type="1">TGFzdCBVcGRhdGVkIE9u</PHRASE>
+ <PHRASE Label="la_fld_LastName" Module="Core" Type="1" Column="TGFzdCBOYW1l">TGFzdCBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_LastRunOn" Module="Core" Type="1" Column="TGFzdCBSdW4gT24=">TGFzdCBSdW4gT24=</PHRASE>
+ <PHRASE Label="la_fld_LastRunStatus" Module="Core" Type="1" Column="TGFzdCBSdW4gU3RhdHVz">TGFzdCBSdW4gU3RhdHVz</PHRASE>
+ <PHRASE Label="la_fld_LastUpdatedOn" Module="Core" Type="1" Column="TGFzdCBVcGRhdGVkIE9u">TGFzdCBVcGRhdGVkIE9u</PHRASE>
<PHRASE Label="la_fld_Left" Module="Core" Type="1">TGVmdA==</PHRASE>
<PHRASE Label="la_fld_LineEndings" Module="Core" Type="1">TGluZSBlbmRpbmdz</PHRASE>
<PHRASE Label="la_fld_LineEndingsInside" Module="Core" Type="1">TGluZSBFbmRpbmdzIEluc2lkZSBGaWVsZHM=</PHRASE>
+ <PHRASE Label="la_fld_ListingId" Module="Core" Type="1" Column="TGlzdGluZyBJZA==">SUQ=</PHRASE>
+ <PHRASE Label="la_fld_ListingType" Module="Core" Type="1" Column="TGlzdGluZyBUeXBl">TGlzdGluZyBUeXBl</PHRASE>
<PHRASE Label="la_fld_Locale" Module="Core" Type="1">TG9jYWxl</PHRASE>
- <PHRASE Label="la_fld_LocalName" Module="Core" Type="1">TG9jYWwgTmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_Location" Module="Core" Type="1">TG9jYXRpb24=</PHRASE>
- <PHRASE Label="la_fld_Login" Module="Core" Type="1">TG9naW4=</PHRASE>
+ <PHRASE Label="la_fld_LocalName" Module="Core" Type="1" Column="TmFtZQ==">TG9jYWwgTmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_Location" Module="Core" Type="1" Column="TG9jYXRpb24=">TG9jYXRpb24=</PHRASE>
+ <PHRASE Label="la_fld_Login" Module="Core" Type="1" Column="TG9naW4=">TG9naW4=</PHRASE>
<PHRASE Label="la_fld_Logo" Module="Core" Type="1">TG9nbyBpbWFnZQ==</PHRASE>
<PHRASE Label="la_fld_LogoBottom" Module="Core" Type="1">Qm90dG9tIExvZ28gSW1hZ2U=</PHRASE>
<PHRASE Label="la_fld_LogoLogin" Module="Core" Type="1">TG9nbyBMb2dpbg==</PHRASE>
@@ -548,32 +453,32 @@
<PHRASE Label="la_fld_MarginRight" Module="Core" Type="1">TWFyZ2luIFJpZ2h0</PHRASE>
<PHRASE Label="la_fld_Margins" Module="Core" Type="1">TWFyZ2lucw==</PHRASE>
<PHRASE Label="la_fld_MarginTop" Module="Core" Type="1">TWFyZ2luIFRvcA==</PHRASE>
- <PHRASE Label="la_fld_MasterId" Module="Core" Type="1">TWFzdGVyIElE</PHRASE>
- <PHRASE Label="la_fld_MasterPrefix" Module="Core" Type="1">TWFzdGVyIFByZWZpeA==</PHRASE>
+ <PHRASE Label="la_fld_MasterId" Module="Core" Type="1" Column="TWFzdGVyIElE">TWFzdGVyIElE</PHRASE>
+ <PHRASE Label="la_fld_MasterPrefix" Module="Core" Type="1" Column="TWFzdGVyIFByZWZpeA==">TWFzdGVyIFByZWZpeA==</PHRASE>
<PHRASE Label="la_fld_MaxCategories" Module="Core" Type="1">TWF4aW11bSBudW1iZXIgb2YgU2VjdGlvbnMgb24gSXRlbSBjYW4gYmUgYWRkZWQgdG8=</PHRASE>
<PHRASE Label="la_fld_MenuIcon" Module="Core" Type="1">Q3VzdG9tIE1lbnUgSWNvbiAoaWUuIGltZy9tZW51X3Byb2R1Y3RzLmdpZik=</PHRASE>
<PHRASE Label="la_fld_MenuStatus" Module="Core" Type="1">TWVudSBTdGF0dXM=</PHRASE>
<PHRASE Label="la_fld_MergeToSubmission" Module="Core" Type="1">TWVyZ2UgdG8gU3VibWlzc2lvbg==</PHRASE>
- <PHRASE Label="la_fld_Message" Module="Core" Type="1">TWVzc2FnZQ==</PHRASE>
+ <PHRASE Label="la_fld_Message" Module="Core" Type="1" Column="TWVzc2FnZQ==">TWVzc2FnZQ==</PHRASE>
<PHRASE Label="la_fld_MessageBody" Module="Core" Type="1">TWVzc2FnZSBCb2R5</PHRASE>
- <PHRASE Label="la_fld_MessageText" Module="Core" Type="1">UGxhaW4gVGV4dCBWZXJzaW9u</PHRASE>
+ <PHRASE Label="la_fld_MessageText" Module="Core" Type="1" Column="UGxhaW4gVGV4dA==">UGxhaW4gVGV4dCBWZXJzaW9u</PHRASE>
<PHRASE Label="la_fld_MessageType" Module="Core" Type="1">TWVzc2FnZSBUeXBl</PHRASE>
<PHRASE Label="la_fld_MetaDescription" Module="Core" Type="1">TWV0YSBEZXNjcmlwdGlvbg==</PHRASE>
<PHRASE Label="la_fld_MetaKeywords" Module="Core" Type="1">TWV0YSBLZXl3b3Jkcw==</PHRASE>
- <PHRASE Label="la_fld_MisspelledWord" Module="Core" Type="1">TWlzc3BlbGxlZCBXb3Jk</PHRASE>
- <PHRASE Label="la_fld_Modified" Module="Core" Type="1">TW9kaWZpZWQ=</PHRASE>
- <PHRASE Label="la_fld_Module" Module="Core" Type="1">TW9kdWxl</PHRASE>
+ <PHRASE Label="la_fld_MisspelledWord" Module="Core" Type="1" Column="TWlzc3BlbGxlZCBXb3Jk">TWlzc3BlbGxlZCBXb3Jk</PHRASE>
+ <PHRASE Label="la_fld_Modified" Module="Core" Type="1" Column="TW9kaWZpZWQgT24=">TW9kaWZpZWQ=</PHRASE>
+ <PHRASE Label="la_fld_Module" Module="Core" Type="1" Column="TW9kdWxl">TW9kdWxl</PHRASE>
<PHRASE Label="la_fld_ModuleName" Module="Core" Type="1">TW9kdWxl</PHRASE>
<PHRASE Label="la_fld_MultiLingual" Module="Core" Type="1">TXVsdGlsaW5ndWFs</PHRASE>
- <PHRASE Label="la_fld_Name" Module="Core" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_Name" Module="Core" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_New" Module="Core" Type="1">TmV3</PHRASE>
- <PHRASE Label="la_fld_NextRunOn" Module="Core" Type="1">TmV4dCBSdW4gT24=</PHRASE>
+ <PHRASE Label="la_fld_NextRunOn" Module="Core" Type="1" Column="TmV4dCBSdW4gT24=">TmV4dCBSdW4gT24=</PHRASE>
<PHRASE Label="la_fld_Notes" Module="Core" Type="1">Tm90ZXM=</PHRASE>
- <PHRASE Label="la_fld_OccuredOn" Module="Core" Type="1">T2NjdXJlZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_OccuredOn" Module="Core" Type="1" Column="T2NjdXJlZCBPbg==">T2NjdXJlZCBPbg==</PHRASE>
<PHRASE Label="la_fld_Options" Module="Core" Type="1">T3B0aW9ucw==</PHRASE>
<PHRASE Label="la_fld_OptionTitle" Module="Core" Type="1">T3B0aW9uIFRpdGxl</PHRASE>
<PHRASE Label="la_fld_OverridePageCacheKey" Module="Core" Type="1">T3ZlcndyaXRlIERlZmF1bHQgQ2FjaGluZyBLZXk=</PHRASE>
- <PHRASE Label="la_fld_PackName" Module="Core" Type="1">UGFjayBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_PackName" Module="Core" Type="1" Column="UGFjayBOYW1l">UGFjayBOYW1l</PHRASE>
<PHRASE Label="la_fld_PaddingBottom" Module="Core" Type="1">UGFkZGluZyBCb3R0b20=</PHRASE>
<PHRASE Label="la_fld_PaddingLeft" Module="Core" Type="1">UGFkZGluZyBMZWZ0</PHRASE>
<PHRASE Label="la_fld_PaddingRight" Module="Core" Type="1">UGFkZGluZyBSaWdodA==</PHRASE>
@@ -583,108 +488,110 @@
<PHRASE Label="la_fld_PageContentTitle" Module="Core" Type="1">VGl0bGUgKE9uIFBhZ2Up</PHRASE>
<PHRASE Label="la_fld_PageExpiration" Module="Core" Type="1">Q2FjaGUgRXhwaXJhdGlvbiBpbiBzZWNvbmRz</PHRASE>
<PHRASE Label="la_fld_PageMentTitle" Module="Core" Type="1">VGl0bGUgKE1lbnUgSXRlbSk=</PHRASE>
- <PHRASE Label="la_fld_PageTitle" Module="Core" Type="1">U2VjdGlvbiBUaXRsZQ==</PHRASE>
+ <PHRASE Label="la_fld_PageTitle" Module="Core" Type="1" Column="U2VjdGlvbiBUaXRsZQ==">U2VjdGlvbiBUaXRsZQ==</PHRASE>
<PHRASE Label="la_fld_ParentSection" Module="Core" Type="1">UGFyZW50IFNlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_Password" Module="Core" Type="1">UGFzc3dvcmQ=</PHRASE>
<PHRASE Label="la_fld_PercentsCompleted" Module="Core" Type="1">UGVyY2VudHMgQ29tcGxldGVk</PHRASE>
- <PHRASE Label="la_fld_Phone" Module="Core" Type="1">UGhvbmU=</PHRASE>
- <PHRASE Label="la_fld_Phrase" Module="Core" Type="1">TGFiZWw=</PHRASE>
- <PHRASE Label="la_fld_PhraseType" Module="Core" Type="1">UGhyYXNlIFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_Phone" Module="Core" Type="1" Column="UGhvbmU=">UGhvbmU=</PHRASE>
+ <PHRASE Label="la_fld_Phrase" Module="Core" Type="1" Column="UGhyYXNl">TGFiZWw=</PHRASE>
+ <PHRASE Label="la_fld_PhraseType" Module="Core" Type="1" Column="VHlwZQ==">UGhyYXNlIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_Pop" Module="Core" Type="1">UG9w</PHRASE>
<PHRASE Label="la_fld_Popular" Module="Core" Type="1">UG9wdWxhcg==</PHRASE>
<PHRASE Label="la_fld_Port" Module="Core" Type="1">UG9ydA==</PHRASE>
<PHRASE Label="la_fld_Position" Module="Core" Type="1">UG9zaXRpb24=</PHRASE>
- <PHRASE Label="la_fld_Prefix" Module="Core" Type="1">UHJlZml4</PHRASE>
- <PHRASE Label="la_fld_Primary" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
+ <PHRASE Label="la_fld_Prefix" Module="Core" Type="1" Column="UHJlZml4">UHJlZml4</PHRASE>
+ <PHRASE Label="la_fld_Primary" Module="Core" Type="1" Column="UHJpbWFyeQ==">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_PrimaryCategory" Module="Core" Type="1">UHJpbWFyeSBTZWN0aW9u</PHRASE>
<PHRASE Label="la_fld_PrimaryLang" Module="Core" Type="1">UHJpbWFyeQ==</PHRASE>
<PHRASE Label="la_fld_PrimaryTranslation" Module="Core" Type="1">UHJpbWFyeSBMYW5ndWFnZSBQaHJhc2U=</PHRASE>
- <PHRASE Label="la_fld_Priority" Module="Core" Type="1">T3JkZXI=</PHRASE>
+ <PHRASE Label="la_fld_Priority" Module="Core" Type="1" Column="T3JkZXI=">T3JkZXI=</PHRASE>
<PHRASE Label="la_fld_ProcessUnmatchedEmails" Module="Core" Type="1">Q29udmVydCB1bm1hdGNoZWQgZS1tYWlscyBpbnRvIG5ldyBzdWJtaXNzaW9ucw==</PHRASE>
- <PHRASE Label="la_fld_Protected" Module="Core" Type="1">UHJvdGVjdGVk</PHRASE>
- <PHRASE Label="la_fld_Qty" Module="Core" Type="1">UXVhbnRpdHk=</PHRASE>
- <PHRASE Label="la_fld_Rating" Module="Core" Type="1">UmF0aW5n</PHRASE>
+ <PHRASE Label="la_fld_Protected" Module="Core" Type="1" Column="UHJvdGVjdGVk">UHJvdGVjdGVk</PHRASE>
+ <PHRASE Label="la_fld_Qty" Module="Core" Type="1" Column="UXR5">UXVhbnRpdHk=</PHRASE>
+ <PHRASE Label="la_fld_Rating" Module="Core" Type="1" Column="UmF0aW5n">UmF0aW5n</PHRASE>
<PHRASE Label="la_fld_RecipientAddress" Module="Core" Type="1">UmVjaXBpZW50J3MgQWRkcmVzcw==</PHRASE>
<PHRASE Label="la_fld_RecipientAddressType" Module="Core" Type="1">UmVjaXBpZW50J3MgQWRkcmVzcyBUeXBl</PHRASE>
<PHRASE Label="la_fld_RecipientName" Module="Core" Type="1">UmVjaXBpZW50J3MgTmFtZQ==</PHRASE>
<PHRASE Label="la_fld_Recipients" Module="Core" Type="1">UmVjaXBpZW50cw==</PHRASE>
- <PHRASE Label="la_fld_RecipientType" Module="Core" Type="1">UmVjaXBpZW50IFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_RecipientType" Module="Core" Type="1" Column="UmVjaXBpZW50IFR5cGU=">UmVjaXBpZW50IFR5cGU=</PHRASE>
<PHRASE Label="la_fld_RedirectOnIPMatch" Module="Core" Type="1">Rm9yY2UgUmVkaXJlY3QgKHdoZW4gdXNlcidzIElQIG1hdGNoZXMp</PHRASE>
- <PHRASE Label="la_fld_ReferrerURL" Module="Core" Type="1">UmVmZXJyZXIgVVJM</PHRASE>
+ <PHRASE Label="la_fld_ReferrerURL" Module="Core" Type="1" Column="UmVmZXJyZXIgVVJM">UmVmZXJyZXIgVVJM</PHRASE>
<PHRASE Label="la_fld_RelatedSearchKeyword" Module="Core" Type="1">S2V5d29yZA==</PHRASE>
- <PHRASE Label="la_fld_RelationshipType" Module="Core" Type="1">VHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_RelationshipType" Module="Core" Type="1" Column="UmVsYXRpb24gVHlwZQ==">VHlwZQ==</PHRASE>
<PHRASE Label="la_fld_RemoteUrl" Module="Core" Type="1">UmVtb3RlIFVSTA==</PHRASE>
<PHRASE Label="la_fld_ReplaceDuplicates" Module="Core" Type="1">UmVwbGFjZSBEdXBsaWNhdGVz</PHRASE>
- <PHRASE Label="la_fld_Replacement" Module="Core" Type="1">UmVwbGFjZW1lbnQ=</PHRASE>
+ <PHRASE Label="la_fld_Replacement" Module="Core" Type="1" Column="UmVwbGFjZW1lbnQ=">UmVwbGFjZW1lbnQ=</PHRASE>
<PHRASE Label="la_fld_ReplacementTags" Module="Core" Type="1">UmVwbGFjZW1lbnQgVGFncw==</PHRASE>
- <PHRASE Label="la_fld_RepliedOn" Module="Core" Type="1">UmVwbGllZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_RepliedOn" Module="Core" Type="1" Column="UmVwbGllZCBPbg==">UmVwbGllZCBPbg==</PHRASE>
<PHRASE Label="la_fld_ReplyBcc" Module="Core" Type="1">UmVwbHkgQmNj</PHRASE>
<PHRASE Label="la_fld_ReplyCc" Module="Core" Type="1">UmVwbHkgQ2M=</PHRASE>
<PHRASE Label="la_fld_ReplyFromEmail" Module="Core" Type="1">UmVwbHkgRnJvbSBFLW1haWw=</PHRASE>
<PHRASE Label="la_fld_ReplyFromName" Module="Core" Type="1">UmVwbHkgRnJvbSBOYW1l</PHRASE>
<PHRASE Label="la_fld_ReplyMessageSignature" Module="Core" Type="1">UmVwbHkgTWVzc2FnZSBTaWduYXR1cmU=</PHRASE>
- <PHRASE Label="la_fld_ReplyStatus" Module="Core" Type="1">UmVwbGllZA==</PHRASE>
- <PHRASE Label="la_fld_Required" Module="Core" Type="1">UmVxdWlyZWQ=</PHRASE>
- <PHRASE Label="la_fld_ReviewText" Module="Core" Type="1">Q29tbWVudA==</PHRASE>
- <PHRASE Label="la_fld_RuleType" Module="Core" Type="1">UnVsZSBUeXBl</PHRASE>
- <PHRASE Label="la_fld_RunInterval" Module="Core" Type="1">UnVuIEludGVydmFs</PHRASE>
- <PHRASE Label="la_fld_RunMode" Module="Core" Type="1">UnVuIE1vZGU=</PHRASE>
+ <PHRASE Label="la_fld_ReplyStatus" Module="Core" Type="1" Column="UmVwbGllZA==">UmVwbGllZA==</PHRASE>
+ <PHRASE Label="la_fld_Required" Module="Core" Type="1" Column="UmVxdWlyZWQ=">UmVxdWlyZWQ=</PHRASE>
+ <PHRASE Label="la_fld_RequireLogin" Module="Core" Type="1" Column="UmVxdWlyZSBMb2dpbg==">UmVxdWlyZSBMb2dpbg==</PHRASE>
+ <PHRASE Label="la_fld_ReviewText" Module="Core" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
+ <PHRASE Label="la_fld_RuleType" Module="Core" Type="1" Column="UnVsZSBUeXBl">UnVsZSBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_RunInterval" Module="Core" Type="1" Column="UnVuIEludGVydmFs">UnVuIEludGVydmFs</PHRASE>
+ <PHRASE Label="la_fld_RunMode" Module="Core" Type="1" Column="UnVuIE1vZGU=">UnVuIE1vZGU=</PHRASE>
<PHRASE Label="la_fld_RunTime" Module="Core" Type="1">UnVuIFRpbWU=</PHRASE>
<PHRASE Label="la_fld_SameAsThumb" Module="Core" Type="1">U2FtZSBBcyBUaHVtYg==</PHRASE>
- <PHRASE Label="la_fld_SearchTerm" Module="Core" Type="1">U2VhcmNoIFRlcm0=</PHRASE>
+ <PHRASE Label="la_fld_SearchTerm" Module="Core" Type="1" Column="U2VhcmNoIFRlcm0=">U2VhcmNoIFRlcm0=</PHRASE>
<PHRASE Label="la_fld_SenderAddress" Module="Core" Type="1">U2VuZGVyJ3MgQWRkcmVzcw==</PHRASE>
<PHRASE Label="la_fld_SenderName" Module="Core" Type="1">U2VuZGVyJ3MgTmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_SentOn" Module="Core" Type="1">U2VudCBPbg==</PHRASE>
- <PHRASE Label="la_fld_SentStatus" Module="Core" Type="1">U2VudA==</PHRASE>
+ <PHRASE Label="la_fld_SentOn" Module="Core" Type="1" Column="U2VudCBPbg==">U2VudCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_SentStatus" Module="Core" Type="1" Column="U2VudA==">U2VudA==</PHRASE>
<PHRASE Label="la_fld_Server" Module="Core" Type="1">U2VydmVy</PHRASE>
- <PHRASE Label="la_fld_SessionLogId" Module="Core" Type="1">U2Vzc2lvbiBMb2cgSUQ=</PHRASE>
- <PHRASE Label="la_fld_ShortIsoCode" Module="Core" Type="1">U2hvcnQgSVNPIENvZGU=</PHRASE>
+ <PHRASE Label="la_fld_SessionLogId" Module="Core" Type="1" Column="U2Vzc2lvbiBMb2cgSUQ=">U2Vzc2lvbiBMb2cgSUQ=</PHRASE>
+ <PHRASE Label="la_fld_ShortIsoCode" Module="Core" Type="1" Column="U2hvcnQgSVNPIENvZGU=">U2hvcnQgSVNPIENvZGU=</PHRASE>
<PHRASE Label="la_fld_SimpleSearch" Module="Core" Type="1">U2ltcGxlIFNlYXJjaA==</PHRASE>
- <PHRASE Label="la_fld_SkinName" Module="Core" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_SkinName" Module="Core" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_SkipFirstRow" Module="Core" Type="1">U2tpcCBGaXJzdCBSb3c=</PHRASE>
<PHRASE Label="la_fld_SortValues" Module="Core" Type="1">U29ydCBWYWx1ZXM=</PHRASE>
- <PHRASE Label="la_fld_SSLUrl" Module="Core" Type="1">U1NMIEZ1bGwgVVJM</PHRASE>
+ <PHRASE Label="la_fld_SSLUrl" Module="Core" Type="1" Column="U1NMIFVybA==">U1NMIEZ1bGwgVVJM</PHRASE>
+ <PHRASE Label="la_fld_StartDate" Module="Core" Type="1" Column="U3RhcnQgRGF0ZQ==">U3RhcnQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_State" Module="Core" Type="1">U3RhdGU=</PHRASE>
- <PHRASE Label="la_fld_StateCountry" Module="Core" Type="1">U3RhdGUgQ291bnRyeQ==</PHRASE>
- <PHRASE Label="la_fld_Status" Module="Core" Type="1">U3RhdHVz</PHRASE>
- <PHRASE Label="la_fld_StopWord" Module="Core" Type="1">U3RvcCBXb3Jk</PHRASE>
- <PHRASE Label="la_fld_Subject" Module="Core" Type="1">U3ViamVjdA==</PHRASE>
+ <PHRASE Label="la_fld_StateCountry" Module="Core" Type="1" Column="U3RhdGUgQ291bnRyeQ==">U3RhdGUgQ291bnRyeQ==</PHRASE>
+ <PHRASE Label="la_fld_Status" Module="Core" Type="1" Column="U3RhdHVz">U3RhdHVz</PHRASE>
+ <PHRASE Label="la_fld_StopWord" Module="Core" Type="1" Column="U3RvcCBXb3Jk">U3RvcCBXb3Jk</PHRASE>
+ <PHRASE Label="la_fld_Subject" Module="Core" Type="1" Column="U3ViamVjdA==">U3ViamVjdA==</PHRASE>
<PHRASE Label="la_fld_SubmissionTime" Module="Core" Type="1">U3VibWl0dGVkIE9u</PHRASE>
- <PHRASE Label="la_fld_SuggestedCorrection" Module="Core" Type="1">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
+ <PHRASE Label="la_fld_SuggestedCorrection" Module="Core" Type="1" Column="U3VnZ2VzdGVkIENvcnJlY3Rpb24=">U3VnZ2VzdGVkIENvcnJlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_SymLinkCategoryId" Module="Core" Type="1">UG9pbnRzIHRvIFNlY3Rpb24=</PHRASE>
<PHRASE Label="la_fld_TableName" Module="Core" Type="1">VGFibGUgTmFtZSBpbiBEYXRhYmFzZSA=</PHRASE>
<PHRASE Label="la_fld_Tag" Module="Core" Type="1">VGFn</PHRASE>
- <PHRASE Label="la_fld_TargetId" Module="Core" Type="1">SXRlbQ==</PHRASE>
+ <PHRASE Label="la_fld_TargetId" Module="Core" Type="1" Column="SXRlbQ==">SXRlbQ==</PHRASE>
<PHRASE Label="la_fld_TemplateFile" Module="Core" Type="1">VGVtcGxhdGUgRmlsZQ==</PHRASE>
- <PHRASE Label="la_fld_TemplateType" Module="Core" Type="1">VGVtcGxhdGU=</PHRASE>
+ <PHRASE Label="la_fld_TemplateType" Module="Core" Type="1" Column="VGVtcGxhdGU=">VGVtcGxhdGU=</PHRASE>
<PHRASE Label="la_fld_TextAlign" Module="Core" Type="1">VGV4dCBBbGlnbg==</PHRASE>
<PHRASE Label="la_fld_TextDecoration" Module="Core" Type="1">VGV4dCBEZWNvcmF0aW9u</PHRASE>
<PHRASE Label="LA_FLD_TEXTVERSION" Module="Core" Type="1">VGV4dCBWZXJzaW9u</PHRASE>
- <PHRASE Label="la_fld_Theme" Module="Core" Type="1">VGhlbWU=</PHRASE>
+ <PHRASE Label="la_fld_Theme" Module="Core" Type="1" Column="VGhlbWU=">VGhlbWU=</PHRASE>
<PHRASE Label="la_fld_Themes" Module="Core" Type="1">VGhlbWVz</PHRASE>
- <PHRASE Label="la_fld_ThesaurusTerm" Module="Core" Type="1">VGhlc2F1cnVzIFRlcm0=</PHRASE>
- <PHRASE Label="la_fld_ThesaurusType" Module="Core" Type="1">VGhlc2F1cnVzIFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_ThesaurusTerm" Module="Core" Type="1" Column="VGhlc2F1cnVzIFRlcm0=">VGhlc2F1cnVzIFRlcm0=</PHRASE>
+ <PHRASE Label="la_fld_ThesaurusType" Module="Core" Type="1" Column="VGhlc2F1cnVzIFR5cGU=">VGhlc2F1cnVzIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_ThousandSep" Module="Core" Type="1">VGhvdXNhbmRzIFNlcGFyYXRvcg==</PHRASE>
<PHRASE Label="la_fld_TimeFormat" Module="Core" Type="1">VGltZSBGb3JtYXQ=</PHRASE>
- <PHRASE Label="la_fld_Title" Module="Core" Type="1">VGl0bGU=</PHRASE>
+ <PHRASE Label="la_fld_Title" Module="Core" Type="1" Column="VGl0bGU=">VGl0bGU=</PHRASE>
<PHRASE Label="la_fld_To" Module="Core" Type="1">VG8=</PHRASE>
- <PHRASE Label="la_fld_ToEmail" Module="Core" Type="1">VG8gRS1tYWls</PHRASE>
+ <PHRASE Label="la_fld_ToEmail" Module="Core" Type="1" Column="VG8gRS1tYWls">VG8gRS1tYWls</PHRASE>
<PHRASE Label="la_fld_Top" Module="Core" Type="1">VG9w</PHRASE>
<PHRASE Label="la_fld_TrackingCode" Module="Core" Type="1">QW5hbHl0aWNzIFRyYWNraW5nIENvZGU=</PHRASE>
- <PHRASE Label="la_fld_Translation" Module="Core" Type="1">UGhyYXNl</PHRASE>
- <PHRASE Label="la_fld_Type" Module="Core" Type="1">VHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_Translation" Module="Core" Type="1" Column="VmFsdWU=">UGhyYXNl</PHRASE>
+ <PHRASE Label="la_fld_Type" Module="Core" Type="1" Column="VHlwZQ==">VHlwZQ==</PHRASE>
<PHRASE Label="la_fld_UnitSystem" Module="Core" Type="1">TWVhc3VyZXMgU3lzdGVt</PHRASE>
<PHRASE Label="la_fld_Upload" Module="Core" Type="1">VXBsb2FkIEZpbGUgRnJvbSBMb2NhbCBQQw==</PHRASE>
- <PHRASE Label="la_fld_URL" Module="Core" Type="1">VVJM</PHRASE>
+ <PHRASE Label="la_fld_URL" Module="Core" Type="1" Column="VVJM">VVJM</PHRASE>
<PHRASE Label="la_fld_UseExternalUrl" Module="Core" Type="1">TGluayB0byBFeHRlcm5hbCBVUkw=</PHRASE>
<PHRASE Label="la_fld_UseMenuIcon" Module="Core" Type="1">VXNlIEN1c3RvbSBNZW51IEljb24=</PHRASE>
<PHRASE Label="la_fld_UserDocsUrl" Module="Core" Type="1">VXNlciBEb2N1bWVudGF0aW9uIFVSTA==</PHRASE>
<PHRASE Label="la_fld_UserGroups" Module="Core" Type="1">VXNlciBHcm91cHM=</PHRASE>
- <PHRASE Label="la_fld_Username" Module="Core" Type="1">VXNlcm5hbWU=</PHRASE>
- <PHRASE Label="la_fld_UseSecurityImage" Module="Core" Type="1">VXNlIFNlY3VyaXR5IEltYWdl</PHRASE>
+ <PHRASE Label="la_fld_Username" Module="Core" Type="1" Column="VXNlcm5hbWU=">VXNlcm5hbWU=</PHRASE>
+ <PHRASE Label="la_fld_UseSecurityImage" Module="Core" Type="1" Column="VXNlIFNlY3VyaXR5IEltYWdl">VXNlIFNlY3VyaXR5IEltYWdl</PHRASE>
<PHRASE Label="la_fld_VerifyPassword" Module="Core" Type="1">UmUtZW50ZXIgUGFzc3dvcmQ=</PHRASE>
- <PHRASE Label="la_fld_Version" Module="Core" Type="1">VmVyc2lvbg==</PHRASE>
- <PHRASE Label="la_fld_Visibility" Module="Core" Type="1">VmlzaWJpbGl0eQ==</PHRASE>
+ <PHRASE Label="la_fld_Version" Module="Core" Type="1" Column="VmVyc2lvbg==">VmVyc2lvbg==</PHRASE>
+ <PHRASE Label="la_fld_Visibility" Module="Core" Type="1" Column="VmlzaWJpbGl0eQ==">VmlzaWJpbGl0eQ==</PHRASE>
<PHRASE Label="la_fld_Votes" Module="Core" Type="1">Vm90ZXM=</PHRASE>
<PHRASE Label="la_fld_Width" Module="Core" Type="1">V2lkdGg=</PHRASE>
<PHRASE Label="la_fld_Z-Index" Module="Core" Type="1">Wi1JbmRleA==</PHRASE>
Index: install/install_schema.sql
===================================================================
--- install/install_schema.sql (revision 14516)
+++ install/install_schema.sql (working copy)
@@ -189,6 +189,16 @@
l3_Translation text,
l4_Translation text,
l5_Translation text,
+ l1_HintTranslation text,
+ l2_HintTranslation text,
+ l3_HintTranslation text,
+ l4_HintTranslation text,
+ l5_HintTranslation text,
+ l1_ColumnTranslation text,
+ l2_ColumnTranslation text,
+ l3_ColumnTranslation text,
+ l4_ColumnTranslation text,
+ l5_ColumnTranslation text,
PhraseType int(11) NOT NULL DEFAULT '0',
LastChanged int(10) unsigned DEFAULT NULL,
LastChangeIP varchar(15) NOT NULL DEFAULT '',
Index: install/upgrades.php
===================================================================
--- install/upgrades.php (revision 14516)
+++ install/upgrades.php (working copy)
@@ -1768,4 +1768,65 @@
$this->Conn->Query($sql);
}
}
+
+ /**
+ * Update to 5.1.3; Merges column and field phrases
+ *
+ * @param string $mode when called mode {before, after)
+ */
+ function Upgrade_5_1_3($mode)
+ {
+ if ($mode != 'after') {
+ return ;
+ }
+
+ $sql = 'SELECT *
+ FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseKey LIKE "LA_COL_%"';
+ $column_phrases = $this->Conn->Query($sql, 'PhraseKey');
+
+ $sql = 'SELECT *
+ FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseKey LIKE "LA_FLD_%"';
+ $field_phrases = $this->Conn->Query($sql, 'PhraseKey');
+
+ $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ /* @var $ml_helper kMultiLanguageHelper */
+
+ $delete_ids = Array ();
+ $language_count = $ml_helper->getLanguageCount();
+
+ foreach ($column_phrases as $phrase_key => $phrase_info) {
+ $field_phrase_key = 'LA_FLD_' . substr($phrase_key, 7);
+
+ if ( !isset($field_phrases[$field_phrase_key]) ) {
+ continue;
+ }
+
+ $fields_hash = Array ();
+
+ // copy column phrase main translation into field phrase column translation
+ for ($i = 1; $i <= $language_count; $i++) {
+ if ( !$ml_helper->LanguageFound($i) ) {
+ continue;
+ }
+
+ $fields_hash['l' . $i . '_ColumnTranslation'] = $phrase_info['l' . $i . '_Translation'];
+ }
+
+ $delete_ids[] = $phrase_info['PhraseId'];
+ $this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Phrase', 'PhraseId = ' . $field_phrases[$field_phrase_key]['PhraseId']);
+ }
+
+ // delete all column phrases, that were absorbed by field phrases
+ if ( $delete_ids ) {
+ $sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
+ WHERE PhraseId IN (' . implode(',', $delete_ids) . ')';
+ $this->Conn->Query($sql);
+
+
+ $sql = 'DELETE FROM ' . TABLE_PREFIX . 'PhraseCache';
+ $this->Conn->Query($sql);
+ }
+ }
}
\ No newline at end of file
Index: kernel/db/db_tag_processor.php
===================================================================
--- kernel/db/db_tag_processor.php (revision 14520)
+++ kernel/db/db_tag_processor.php (working copy)
@@ -905,6 +905,20 @@
return $value;
}
+ function FieldHintLabel($params)
+ {
+ if ( isset($params['direct_label']) && $params['direct_label'] ) {
+ $label = $params['direct_label'];
+ $hint = $this->Application->Phrase($label, false);
+ }
+ else {
+ $label = $params['title_label'];
+ $hint = $this->Application->Phrase('hint:' . $label, false);
+ }
+
+ return $hint; // $hint != strtoupper('!' . $label . '!') ? $hint : '';
+ }
+
/**
* Returns formatted date + time on current language
*
Index: kernel/languages/phrases_cache.php
===================================================================
--- kernel/languages/phrases_cache.php (revision 14516)
+++ kernel/languages/phrases_cache.php (working copy)
@@ -110,7 +110,7 @@
// front-end viewed in content mode
$this->_editExisting = true;
$this->_editMissing = true;
- $this->_simpleEditingMode = true;
+ $this->_simpleEditingMode = !$this->Application->isDebugMode();
$this->_translateHtmlTag = 'span';
}
@@ -186,10 +186,10 @@
return;
}
- $sql = 'SELECT l' . $this->LanguageId . '_Translation, PhraseKey
+ $sql = 'SELECT l' . $this->LanguageId . '_Translation AS Translation, l' . $this->LanguageId . '_HintTranslation AS HintTranslation, l' . $this->LanguageId . '_ColumnTranslation AS ColumnTranslation, PhraseKey
FROM ' . TABLE_PREFIX . 'Phrase
WHERE PhraseId IN (' . implode(',', $ids) . ') AND l' . $this->LanguageId . '_Translation IS NOT NULL';
- $this->Phrases = $this->Conn->GetCol($sql, 'PhraseKey');
+ $this->Phrases = $this->Conn->Query($sql, 'PhraseKey');
/*foreach($phrases as $phrase => $tanslation)
{
@@ -205,7 +205,7 @@
// uppercase phrase name for cases, when this method is called outside this class
$cache_key = ($allow_editing ? '' : 'NE:') . mb_strtoupper($label);
- $this->Phrases[$cache_key] = $value;
+ $this->Phrases[$cache_key] = Array ('Translation' => $value, 'HintTranslation' => $value, 'ColumnTranslation' => $value);
}
function NeedsCacheUpdate()
@@ -238,7 +238,7 @@
function GetPhrase($label, $allow_editing = true, $use_admin = false)
{
- if (!isset($this->LanguageId)) {
+ if ( !isset($this->LanguageId) ) {
//actually possible when custom field contains references to language labels and its being rebuilt in OnAfterConfigRead
//which is triggered by Sections rebuild, which in turn read all the configs and all of that happens BEFORE seeting the language...
return 'impossible case';
@@ -247,21 +247,31 @@
// cut exclamation marks - depricated form of passing phrase name from templates
$label = preg_replace('/^!(.*)!$/', '\\1', $label);
- if (strlen($label) == 0) {
+ if ( strlen($label) == 0 ) {
return '';
}
$original_label = $this->_escapePhraseName ? addslashes($label) : $label;
$label = mb_strtoupper($label);
+ if ( substr($label, 0, 5) == 'HINT:' || substr($label, 0, 7) == 'COLUMN:' ) {
+ // don't just check for ":" since phrases could have ":" in their names (e.g. advanced permission labels)
+ list ($field_prefix, $label) = explode(':', $label, 2);
+ $translation_field = mb_convert_case($field_prefix, MB_CASE_TITLE) . 'Translation';
+ }
+ else {
+ $translation_field = 'Translation';
+ }
+
$cache_key = ($allow_editing ? '' : 'NE:') . $label;
- if (array_key_exists($cache_key, $this->Phrases)) {
- $translated_label = $this->Phrases[$cache_key];
+ if ( isset($this->Phrases[$cache_key]) ) {
+ $translated_label = $this->Phrases[$cache_key][$translation_field];
if ($this->_editExisting && $allow_editing && !array_key_exists($label, $this->_missingPhrases)) {
// option to change translation for Labels
- $edit_url = 'javascript:translate_phrase(\'' . $original_label . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPreparePhrase\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
+ $original_label = explode(':', $original_label, 2);
+ $edit_url = 'javascript:translate_phrase(\'' . end($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPreparePhrase\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
$translated_label = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Edit translation">' . $translated_label . '</' . $this->_translateHtmlTag . '>';
if ($this->fromTag) {
@@ -274,12 +284,12 @@
$this->LoadPhraseByLabel($label, $original_label, $allow_editing, $use_admin);
- return $this->GetPhrase($label, $allow_editing);
+ return $this->GetPhrase($original_label, $allow_editing);
}
function LoadPhraseByLabel($label, $original_label, $allow_editing = true, $use_admin = false)
{
- if (!$allow_editing && !$use_admin && !array_key_exists($label, $this->_missingPhrases) && array_key_exists($label, $this->Phrases)) {
+ if ( !$allow_editing && !$use_admin && !isset($this->_missingPhrases[$label]) && isset($this->Phrases[$label]) ) {
// label is aready translated, but it's version without on the fly translation code is requested
$this->Phrases['NE:' . $label] = $this->Phrases[$label];
@@ -288,7 +298,7 @@
$language_id = $use_admin ? $this->AdminLanguageId : $this->LanguageId;
- $sql = 'SELECT PhraseId, l' . $language_id . '_Translation
+ $sql = 'SELECT PhraseId, l' . $language_id . '_Translation AS Translation, l' . $language_id . '_HintTranslation AS HintTranslation, l' . $language_id . '_ColumnTranslation AS ColumnTranslation
FROM ' . TABLE_PREFIX . 'Phrase
WHERE (PhraseKey = ' . $this->Conn->qstr($label) . ') AND (l' . $language_id . '_Translation IS NOT NULL)';
$res = $this->Conn->GetRow($sql);
@@ -297,7 +307,8 @@
$translation = '!' . $label . '!';
if ($this->_editMissing && $allow_editing) {
- $edit_url = str_replace('#LABEL#', $original_label, $this->_editLinkMask);
+ $original_label = explode(':', $original_label, 2);
+ $edit_url = str_replace('#LABEL#', end($original_label), $this->_editLinkMask);
$translation = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Translate">!' . $label . '!</' . $this->_translateHtmlTag . '>';
if ($this->fromTag) {
@@ -314,7 +325,7 @@
}
$cache_key = ($allow_editing ? '' : 'NE:') . $label;
- $this->Phrases[$cache_key] = $res['l' . $language_id . '_Translation'];
+ $this->Phrases[$cache_key] = $res;
array_push($this->Ids, $res['PhraseId']);
$this->Ids = array_unique($this->Ids); // just to make sure
Index: kernel/utility/formatters/multilang_formatter.php
===================================================================
--- kernel/utility/formatters/multilang_formatter.php (revision 14516)
+++ kernel/utility/formatters/multilang_formatter.php (working copy)
@@ -189,8 +189,13 @@
$grids[$name]['Fields'][$field_name]['format'] = 'no_default';
}
+ if ( !isset($grid['Fields'][$field_name]['title']) ) {
+ $grids[$name]['Fields'][$field_name]['title'] = 'column:la_fld_' . $field_name;
+ }
+
array_rename_key($grids[$name]['Fields'], $field_name, $lang_field_name);
}
+
// update sort fields - used for sorting and filtering in SQLs
foreach ($grid['Fields'] as $grid_fld_name => $fld_options) {
if (isset($fld_options['sort_field']) && $fld_options['sort_field'] == $field_name) {
Index: kernel/utility/multibyte.php
===================================================================
--- kernel/utility/multibyte.php (revision 14516)
+++ kernel/utility/multibyte.php (working copy)
@@ -67,4 +67,20 @@
return strlen($str);
}
+ function mb_convert_case ($str, $mode = MB_CASE_UPPER, $encoding = null)
+ {
+ if ( $mode == MB_CASE_UPPER ) {
+ return strtoupper($str);
+ }
+ elseif ( $mode == MB_CASE_LOWER ) {
+ return strtolower($str);
+ }
+
+ // $mode == MB_CASE_TITLE
+ $words = explode(' ', $str);
+ $words = array_map('strtolower', $words);
+ $words = array_map('ucfirst', $words);
+
+ return implode(' ', $words);
+ }
}
\ No newline at end of file
Index: units/agents/agents_config.php
===================================================================
--- units/agents/agents_config.php (revision 14516)
+++ units/agents/agents_config.php (working copy)
@@ -142,16 +142,16 @@
0 => 'icon16_disabled.png',
),
'Fields' => Array (
- 'AgentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'AgentName' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'AgentType' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
- 'Event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 280, ),
-// 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 65, ),
- 'RunInterval' => Array ('title' => 'la_col_RunInterval', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
- 'RunMode' => Array ('title' => 'la_col_RunMode', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
- 'LastRunOn' => Array ('title' => 'la_col_LastRunOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'LastRunStatus' => Array ('title' => 'la_col_LastRunStatus', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'NextRunOn' => Array ('title' => 'la_col_NextRunOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'AgentId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'AgentName' => Array ('title' => 'column:la_fld_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'AgentType' => Array ('title' => 'column:la_fld_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+ 'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 280, ),
+// 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 65, ),
+ 'RunInterval' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
+ 'RunMode' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
+ 'LastRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'LastRunStatus' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'NextRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
),
),
),
Index: units/ban_rules/ban_rules_config.php
===================================================================
--- units/ban_rules/ban_rules_config.php (revision 14516)
+++ units/ban_rules/ban_rules_config.php (working copy)
@@ -134,12 +134,12 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'RuleId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'RuleType' => Array ('title' => 'la_col_RuleType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'ItemField' => Array ('title' => 'la_col_ItemField', 'filter_block' => 'grid_options_filter', 'width' => 130, ),
- 'ItemVerb' => Array ('title' => 'la_col_FieldComparision', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'ItemValue' => Array ('title' => 'la_col_FieldValue', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'RuleId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'RuleType' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'ItemField' => Array ('filter_block' => 'grid_options_filter', 'width' => 130, ),
+ 'ItemVerb' => Array ('title' => 'column:la_fld_FieldComparision', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'ItemValue' => Array ('title' => 'column:la_fld_FieldValue', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 90, ),
),
),
),
Index: units/categories/categories_config.php
===================================================================
--- units/categories/categories_config.php (revision 14516)
+++ units/categories/categories_config.php (working copy)
@@ -434,15 +434,15 @@
'NEW' => 'icon16_section_new.png', // section is new
),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 65),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
- 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
@@ -462,16 +462,15 @@
'NEW' => 'icon16_section_new.png', // section is new
),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75),
- 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
-
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
+ 'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
@@ -489,17 +488,15 @@
'NEW' => 'icon16_section_new.png', // section is new
),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75),
- 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter'),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
-
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Priority' => Array ('filter_block' => 'grid_options_filter', 'width' => 65),
+ 'IsMenu' => Array ('title' => 'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: units/category_items/category_items_config.php
===================================================================
--- units/category_items/category_items_config.php (revision 14516)
+++ units/category_items/category_items_config.php (working copy)
@@ -79,7 +79,7 @@
),
'Fields' => Array (
- 'CategoryName' => Array( 'title'=>'la_col_Category', 'data_block' => 'grid_checkbox_category_td'),
+ 'CategoryName' => Array( 'title'=>'column:la_fld_Category', 'data_block' => 'grid_checkbox_category_td'),
),
),
),
Index: units/country_states/country_states_config.php
===================================================================
--- units/country_states/country_states_config.php (revision 14516)
+++ units/country_states/country_states_config.php (working copy)
@@ -121,12 +121,12 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'CountryStateId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Name' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'IsoCode' => Array ('title' => 'la_col_IsoCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Type' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'StateCountryId' => Array ('title' => 'la_col_StateCountry', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
- 'ShortIsoCode' => Array ('title' => 'la_col_ShortIsoCode', 'filter_block' => 'grid_like_filter', 'width' => 125, ),
+ 'CountryStateId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'IsoCode' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'StateCountryId' => Array ('title' => 'column:la_fld_StateCountry', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
+ 'ShortIsoCode' => Array ('filter_block' => 'grid_like_filter', 'width' => 125, ),
),
),
),
Index: units/custom_fields/custom_fields_config.php
===================================================================
--- units/custom_fields/custom_fields_config.php (revision 14516)
+++ units/custom_fields/custom_fields_config.php (working copy)
@@ -151,11 +151,11 @@
'default' => 'icon16_item.png',
),
'Fields' => Array (
- 'CustomFieldId' => Array ( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'CustomFieldId' => Array ( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'FieldName' => Array ( 'title'=>'la_prompt_FieldName', 'width' => 250, ),
'FieldLabel' => Array ( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td', 'width' => 250, ),
'DisplayOrder' => Array ('title' => 'la_prompt_DisplayOrder', 'filter_block' => 'grid_range_filter', 'width' => 105, ),
-// 'IsSystem' => Array ('title' => 'la_col_IsSystem', 'filter_block' => 'grid_options_filter'),
+// 'IsSystem' => Array ('title' => 'column:la_fld_IsSystem', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: units/email_events/email_events_config.php
===================================================================
--- units/email_events/email_events_config.php (revision 14516)
+++ units/email_events/email_events_config.php (working copy)
@@ -61,7 +61,7 @@
),
// for mass mailing
- 'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
+ 'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
),
@@ -230,12 +230,12 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Event' => Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Module' => Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'Enabled' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'EventId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
@@ -247,14 +247,14 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'EventId' => Array ( 'title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Event' => Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Subject' => Array ( 'title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
- 'Enabled' => Array ( 'title' => 'la_col_Enabled', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'Module' => Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'FrontEndOnly' => Array ('title' => 'la_col_FrontEndOnly', 'filter_block' => 'grid_options_filter', 'width' => 120, 'hidden' => 1),
+ 'EventId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Event' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Subject' => Array ('filter_block' => 'grid_like_filter', 'no_special' => 0, 'width' => 300, ),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
+ 'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'FrontEndOnly' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, 'hidden' => 1),
),
),
),
Index: units/email_queue/email_queue_config.php
===================================================================
--- units/email_queue/email_queue_config.php (revision 14516)
+++ units/email_queue/email_queue_config.php (working copy)
@@ -79,10 +79,10 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'EmailQueueId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', 'width' => 80, ),
'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
Index: units/files/files_config.php
===================================================================
--- units/files/files_config.php (revision 14516)
+++ units/files/files_config.php (working copy)
@@ -87,9 +87,9 @@
'Default' => Array (
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Fields' => Array(
- 'FileId' => Array ('title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
- 'FileName' => Array ('title' => 'la_col_FileName', 'filter_block' => 'grid_like_filter'),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
+ 'FileId' => Array ('title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
+ 'FileName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Status' => Array ('filter_block' => 'grid_options_filter'),
),
),
),
Index: units/forms/form_fields/form_fields_config.php
===================================================================
--- units/forms/form_fields/form_fields_config.php (revision 14516)
+++ units/forms/form_fields/form_fields_config.php (working copy)
@@ -99,15 +99,15 @@
'Default' => Array(
'Icons' => Array('default'=>'icon16_item.png'),
'Fields' => Array(
- 'FormFieldId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
+ 'FormFieldId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
'FieldName' => Array( 'title'=>'la_prompt_FieldName', 'filter_block' => 'grid_like_filter', 'width' => 100 ),
'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'label_grid_data_td', 'filter_block' => 'grid_like_filter', 'width' => 150 ),
'Priority' => Array('title' => 'la_prompt_Priority', 'filter_block' => 'grid_range_filter', 'width' => 80 ),
'ElementType' => Array('title' => 'la_prompt_ElementType', 'filter_block' => 'grid_options_filter'),
'Required' => Array('title' => 'la_prompt_Required', 'filter_block' => 'grid_options_filter'),
'DisplayInGrid' => Array('title' => 'la_prompt_DisplayInGrid', 'filter_block' => 'grid_options_filter', 'width' => 150 ),
- 'Visibility' => Array('title' => 'la_col_Visibility', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'EmailCommunicationRole' => Array('title' => 'la_col_EmailCommunicationRole', 'filter_block' => 'grid_options_filter', 'width' => 150),
+ 'Visibility' => Array('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'EmailCommunicationRole' => Array('filter_block' => 'grid_options_filter', 'width' => 150),
),
),
),
Index: units/forms/form_submissions/form_submissions_config.php
===================================================================
--- units/forms/form_submissions/form_submissions_config.php (revision 14516)
+++ units/forms/form_submissions/form_submissions_config.php (working copy)
@@ -155,12 +155,12 @@
'Default' => Array(
'Icons' => Array('default' => 'icon16_item.png', 1 => 'icon16_replied.gif', 2 => 'icon16_not_replied.gif', 3 => 'icon16_new_email.gif', 4 => 'icon16_bounce.gif'),
'Fields' => Array(
- 'FormSubmissionId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'sort_field' => 'FormFieldId', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
- 'SubmissionTime' => Array( 'title'=>'la_prompt_SumbissionTime', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
- 'IPAddress' => Array ('title' => 'la_col_IPAddress', 'filter_block' => 'grid_like_filter', 'width' => 100 ),
- 'ReferrerURL' => Array ('title' => 'la_col_ReferrerURL', 'filter_block' => 'grid_like_filter', 'first_chars' => 100, 'width' => 200 ),
- 'LogStatus' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100 ),
- 'LastUpdatedOn' => Array ('title' => 'la_col_LastUpdatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
+ 'FormSubmissionId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'sort_field' => 'FormFieldId', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
+ 'SubmissionTime' => Array ('title' => 'la_prompt_SumbissionTime', 'filter_block' => 'grid_date_range_filter', 'width' => 145 ),
+ 'IPAddress' => Array ('filter_block' => 'grid_like_filter', 'width' => 100 ),
+ 'ReferrerURL' => Array ('filter_block' => 'grid_like_filter', 'first_chars' => 100, 'width' => 200 ),
+ 'LogStatus' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 100 ),
+ 'LastUpdatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145 ),
),
),
),
Index: units/forms/forms/forms_config.php
===================================================================
--- units/forms/forms/forms_config.php (revision 14516)
+++ units/forms/forms/forms_config.php (working copy)
@@ -206,11 +206,11 @@
2 => 'icon16_pending.png',
),
'Fields' => Array(
- 'FormId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Title' => Array( 'title' => 'la_col_Title', 'filter_block' => 'grid_like_filter', 'width' => 220, ),
- 'Description' => Array( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
- 'RequireLogin' => Array ('title' => 'la_col_RequireLogin', 'filter_block' => 'grid_options_filter', 'width' => 80,),
- 'UseSecurityImage' => Array ('title' => 'la_col_UseSecurityImage', 'filter_block' => 'grid_options_filter', 'width' => 110,),
+ 'FormId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Title' => Array ('filter_block' => 'grid_like_filter', 'width' => 220, ),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 300, ),
+ 'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 80,),
+ 'UseSecurityImage' => Array ('filter_block' => 'grid_options_filter', 'width' => 110,),
'EnableEmailCommunication' => Array ('title' => 'la_col_EnableEmailCommunication', 'filter_block' => 'grid_options_filter', 'width' => 120,),
),
),
Index: units/forms/submission_log/submission_log_config.php
===================================================================
--- units/forms/submission_log/submission_log_config.php (revision 14516)
+++ units/forms/submission_log/submission_log_config.php (working copy)
@@ -111,19 +111,19 @@
'Default' => Array (
'Icons' => Array (0 => 'icon16_not_replied.gif', 1 => 'icon16_replied.gif'),
'Fields' => Array (
- 'SubmissionLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
- 'Subject' => Array ('title' => 'la_col_Subject', 'data_block' => 'grid_subject_td', 'filter_block' => 'grid_like_filter',),
- 'Message' => Array ('title' => 'la_col_Message', 'filter_block' => 'grid_like_filter', 'first_chars' => 100),
- 'ReplyStatus' => Array ('title' => 'la_col_ReplyStatus', 'filter_block' => 'grid_options_filter',),
- 'SentStatus' => Array ('title' => 'la_col_SentStatus', 'filter_block' => 'grid_options_filter',),
- 'FromEmail' => Array ('title' => 'la_col_FromEmail', 'filter_block' => 'grid_like_filter',),
- 'ToEmail' => Array ('title' => 'la_col_ToEmail', 'filter_block' => 'grid_like_filter',),
- 'SentOn' => Array ('title' => 'la_col_SentOn', 'filter_block' => 'grid_date_range_filter',),
- 'RepliedOn' => Array ('title' => 'la_col_RepliedOn', 'filter_block' => 'grid_date_range_filter',),
- 'Cc' => Array ('title' => 'la_col_Cc', 'filter_block' => 'grid_like_filter', 'hidden' => 1),
- 'Bcc' => Array ('title' => 'la_col_Bcc', 'filter_block' => 'grid_like_filter', 'hidden' => 1),
- 'BounceInfo' => Array ('title' => 'la_col_BounceInfo', 'filter_block' => 'grid_like_filter', 'hidden' => 1),
- 'BounceDate' => Array ('title' => 'la_col_BounceDate', 'filter_block' => 'grid_date_range_filter', 'hidden' => 1),
+ 'SubmissionLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
+ 'Subject' => Array ('data_block' => 'grid_subject_td', 'filter_block' => 'grid_like_filter',),
+ 'Message' => Array ('filter_block' => 'grid_like_filter', 'first_chars' => 100),
+ 'ReplyStatus' => Array ('filter_block' => 'grid_options_filter',),
+ 'SentStatus' => Array ('filter_block' => 'grid_options_filter',),
+ 'FromEmail' => Array ('filter_block' => 'grid_like_filter',),
+ 'ToEmail' => Array ('filter_block' => 'grid_like_filter',),
+ 'SentOn' => Array ('filter_block' => 'grid_date_range_filter',),
+ 'RepliedOn' => Array ('filter_block' => 'grid_date_range_filter',),
+ 'Cc' => Array ('filter_block' => 'grid_like_filter', 'hidden' => 1),
+ 'Bcc' => Array ('filter_block' => 'grid_like_filter', 'hidden' => 1),
+ 'BounceInfo' => Array ('filter_block' => 'grid_like_filter', 'hidden' => 1),
+ 'BounceDate' => Array ('filter_block' => 'grid_date_range_filter', 'hidden' => 1),
),
),
),
Index: units/groups/groups_config.php
===================================================================
--- units/groups/groups_config.php (revision 14516)
+++ units/groups/groups_config.php (working copy)
@@ -127,18 +127,18 @@
'Default' => Array (
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 200, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 200, ),
'UserCount' => Array ('title' => 'la_col_UserCount', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
- 'FrontRegistration' => Array ('title' => 'la_col_FrontRegistration', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'FrontRegistration' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
'UserGroups' => Array (
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 150, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 150, ),
),
),
@@ -146,9 +146,9 @@
'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
'Selector' => 'radio',
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 150, ),
- 'Description' => Array ('title' => 'la_col_Description', 'width' => 250, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 150, ),
+ 'Description' => Array ('width' => 250, ),
),
),
@@ -159,9 +159,9 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_GroupName', 'width' => 150, ),
- 'Description' => Array ('title' => 'la_col_Description', 'width' => 250, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_GroupName', 'width' => 150, ),
+ 'Description' => Array ('width' => 250, ),
),
),
),
Index: units/helpers/col_picker_helper.php
===================================================================
--- units/helpers/col_picker_helper.php (revision 14516)
+++ units/helpers/col_picker_helper.php (working copy)
@@ -182,7 +182,7 @@
// we NEED to recall dummy here to apply fields changes imposed by formatters,
// such as replacing multilingual field titles etc.
- $dummy =& $this->Application->recallObject($prefix, null, array('skip_autoload'=>1));
+ $dummy =& $this->Application->recallObject($prefix, null, Array ('skip_autoload' => 1));
$counter = 0;
$hidden = array();
@@ -197,7 +197,7 @@
}
$fields[$counter] = $name;
- $titles[$name] = $options['title'];
+ $titles[$name] = isset($options['title']) ? $options['title'] : 'column:la_fld_' . $name;
$widths[$name] = isset($options['width']) ? $options['width'] : $this->defaultColumnWidth; // only once per grid !
if (isset($options['hidden']) && $options['hidden']) {
Index: units/helpers/language_import_helper.php
===================================================================
--- units/helpers/language_import_helper.php (revision 14524)
+++ units/helpers/language_import_helper.php (working copy)
@@ -24,6 +24,10 @@
* ==========
* All data, that will end up in Language table is now attributes of LANGUAGE node
* and is name exactly as field name, that will be used to store that data.
+*
+* v4
+* ==========
+* Hint & Column translation added to each phrase translation
*/
defined('FULL_PATH') or die('restricted access!');
@@ -111,7 +115,7 @@
*
* @var int
*/
- var $_latestVersion = 3;
+ var $_latestVersion = 4;
/**
* Prefix-based serial numbers, that should be changed after import is finished
@@ -178,7 +182,7 @@
// copy data from temp tables to live
foreach ($this->_languages as $language_id) {
- $this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation', 'PhraseType'));
+ $this->_performUpgrade($language_id, 'phrases', 'PhraseKey', Array ('l%s_Translation', 'l%s_HintTranslation', 'l%s_ColumnTranslation', 'PhraseType'));
$this->_performUpgrade($language_id, 'emailevents', 'EventId', Array ('l%s_Subject', 'Headers', 'MessageType', 'l%s_Body'));
$this->_performUpgrade($language_id, 'country-state', 'CountryStateId', Array ('l%s_Name'));
}
@@ -317,14 +321,40 @@
$ret .= "\t\t" . '<PHRASES>' . "\n";
foreach ($phrases as $phrase_id => $phrase) {
$translation = $phrase['l' . $language_id . '_Translation'];
+ $hint_translation = $phrase['l' . $language_id . '_HintTranslation'];
+ $column_translation = $phrase['l' . $language_id . '_ColumnTranslation'];
if (!$translation) {
// phrase is not translated on given language
continue;
}
- $data = $this->_exportEncoding == 'base64' ? base64_encode($translation) : '<![CDATA[' . $translation . ']]>';
- $ret .= "\t\t\t" . '<PHRASE Label="' . $phrase['Phrase'] . '" Module="' . $phrase['Module'] . '" Type="' . $phrase['PhraseType'] . '">' . $data . '</PHRASE>' . "\n";
+ if ( $this->_exportEncoding == 'base64' ) {
+ $data = base64_encode($translation);
+ $hint_translation = base64_encode($hint_translation);
+ $column_translation = base64_encode($column_translation);
+ }
+ else {
+ $data = '<![CDATA[' . $translation . ']]>';
+ $hint_translation = htmlspecialchars($hint_translation);
+ $column_translation = htmlspecialchars($column_translation);
+ }
+
+ $attributes = Array (
+ 'Label="' . $phrase['Phrase'] . '"',
+ 'Module="' . $phrase['Module'] . '"',
+ 'Type="' . $phrase['PhraseType'] . '"'
+ );
+
+ if ( $phrase['l' . $language_id . '_HintTranslation'] ) {
+ $attributes[] = 'Hint="' . $hint_translation . '"';
+ }
+
+ if ( $phrase['l' . $language_id . '_ColumnTranslation'] ) {
+ $attributes[] = 'Column="' . $column_translation . '"';
+ }
+
+ $ret .= "\t\t\t" . '<PHRASE ' . implode(' ', $attributes) . '>' . $data . '</PHRASE>' . "\n";
}
$ret .= "\t\t" . '</PHRASES>' . "\n";
@@ -804,18 +834,26 @@
);
$translation = $phrase_node->Data;
+ $hint_translation = isset($phrase_node->Attributes['HINT']) ? $phrase_node->Attributes['HINT'] : '';
+ $column_translation = isset($phrase_node->Attributes['COLUMN']) ? $phrase_node->Attributes['COLUMN'] : '';
if (array_key_exists($fields_hash['PhraseType'], $this->phrase_types_allowed)) {
if ($language_encoding != 'plain') {
$translation = base64_decode($translation);
+ $hint_translation = base64_decode($hint_translation);
+ $column_translation = base64_decode($column_translation);
}
if (array_key_exists($phrase_key, $other_translations)) {
$other_translations[$phrase_key]['l' . $language_id . '_Translation'] = $translation;
+ $other_translations[$phrase_key]['l' . $language_id . '_HintTranslation'] = $hint_translation;
+ $other_translations[$phrase_key]['l' . $language_id . '_ColumnTranslation'] = $column_translation;
}
else {
$other_translations[$phrase_key] = Array (
- 'l' . $language_id . '_Translation' => $translation
+ 'l' . $language_id . '_Translation' => $translation,
+ 'l' . $language_id . '_HintTranslation' => $hint_translation,
+ 'l' . $language_id . '_ColumnTranslation' => $column_translation,
);
}
Index: units/images/images_config.php
===================================================================
--- units/images/images_config.php (revision 14516)
+++ units/images/images_config.php (working copy)
@@ -172,7 +172,7 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array(
- 'ImageId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'ImageId' => Array( 'title'=>'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'image_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'AltName' => Array( 'title'=>'la_col_AltName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
Index: units/languages/languages_config.php
===================================================================
--- units/languages/languages_config.php (revision 14516)
+++ units/languages/languages_config.php (working copy)
@@ -83,7 +83,7 @@
),
'events_list' => Array (
'prefixes' => Array ('lang', 'emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!",
- ),
+ ),
'email_messages_edit' => Array (
'prefixes' => Array ('lang', 'emailevents'),
'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailevents_titlefield#'",
@@ -228,13 +228,13 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array(
- 'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'PackName' => Array ('title' => 'la_col_PackName', 'filter_block' => 'grid_options_filter', 'width' => 150, ),//
+ 'LanguageId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'PackName' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),//
'PrimaryLang' => Array ('title' => 'la_col_IsPrimaryLanguage', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'AdminInterfaceLang' => Array ('title' => 'la_col_AdminInterfaceLang', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'Charset' => Array ('title' => 'la_col_Charset', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
- 'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+ 'AdminInterfaceLang' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'Charset' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Priority' => Array ('filter_block' => 'grid_like_filter', 'width' => 60, ),
+ 'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ),
),
),
@@ -247,10 +247,10 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array (
- 'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
- 'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 120),
- 'LocalName' => Array ('title' => 'la_col_Prefix', 'filter_block' => 'grid_options_filter', 'width' => 120),
- 'IconURL' => Array ('title' => 'la_col_Image', 'filter_block' => 'grid_empty_filter', 'width' => 80),
+ 'LanguageId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+ 'PackName' => Array ('title' => 'column:la_fld_Language', 'filter_block' => 'grid_options_filter', 'width' => 120),
+ 'LocalName' => Array ('title' => 'column:la_fld_Prefix', 'filter_block' => 'grid_options_filter', 'width' => 120),
+ 'IconURL' => Array ('title' => 'column:la_fld_Image', 'filter_block' => 'grid_empty_filter', 'width' => 80),
),
),*/
),
Index: units/logs/change_logs/change_logs_config.php
===================================================================
--- units/logs/change_logs/change_logs_config.php (revision 14516)
+++ units/logs/change_logs/change_logs_config.php (working copy)
@@ -40,7 +40,7 @@
'TableName' => TABLE_PREFIX.'ChangeLogs',
'TitlePresets' => Array (
- 'default' => Array (
+ 'default' => Array (
'edit_status_labels' => Array ('change-log' => '!la_title_EditingChangeLog!'),
),
@@ -140,20 +140,20 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'ChangeLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'ChangeLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'PortalUserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 70, ),
- 'UserLogin' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'UserFirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserLastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserEmail' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'SessionLogId' => Array ('title' => 'la_col_SessionLogId', 'filter_block' => 'grid_range_filter', 'width' => 120, ),
- 'Action' => Array ('title' => 'la_col_Action', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'OccuredOn' => Array ('title' => 'la_col_OccuredOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'MasterPrefix' => Array ('title' => 'la_col_MasterPrefix', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'MasterId' => Array ('title' => 'la_col_MasterId', 'filter_block' => 'grid_range_filter', 'width' => 90, ),
+ 'UserLogin' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'UserFirstName' => Array ('title' => 'column:la_fld_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserLastName' => Array ('title' => 'column:la_fld_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserEmail' => Array ('title' => 'column:la_fld_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'SessionLogId' => Array ('filter_block' => 'grid_range_filter', 'width' => 120, ),
+ 'Action' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'OccuredOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+ 'MasterPrefix' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'MasterId' => Array ('filter_block' => 'grid_range_filter', 'width' => 90, ),
'Prefix' => Array ('title' => 'la_col_ItemPrefix', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'ItemId' => Array ('title' => 'la_col_ItemId', 'filter_block' => 'grid_range_filter', 'width' => 120, ),
- 'Changes' => Array ('title' => 'la_col_Changes', 'data_block' => 'grid_changes_td', 'filter_block' => 'grid_like_filter', 'format' => 'auto_cut', 'width' => 225, ),
+ 'ItemId' => Array ('filter_block' => 'grid_range_filter', 'width' => 120, ),
+ 'Changes' => Array ('data_block' => 'grid_changes_td', 'filter_block' => 'grid_like_filter', 'format' => 'auto_cut', 'width' => 225, ),
),
),
),
Index: units/logs/email_logs/email_logs_config.php
===================================================================
--- units/logs/email_logs/email_logs_config.php (revision 14516)
+++ units/logs/email_logs/email_logs_config.php (working copy)
@@ -77,13 +77,13 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'EmailLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'EmailLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
'fromuser' => Array ('title' => 'la_prompt_FromUsername', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'addressto' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 170, ),
+ 'subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'event' => Array ('filter_block' => 'grid_like_filter', 'width' => 170, ),
'timestamp' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- // 'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
+// 'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
),
),
),
Index: units/logs/search_logs/search_logs_config.php
===================================================================
--- units/logs/search_logs/search_logs_config.php (revision 14516)
+++ units/logs/search_logs/search_logs_config.php (working copy)
@@ -81,7 +81,7 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'SearchLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'SearchLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
'Keyword' => Array ('title' => 'la_col_Keyword', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
'SearchType' => Array ('title' => 'la_prompt_SearchType', 'filter_block' => 'grid_options_filter', 'width' => 110, ),
Index: units/logs/session_logs/session_logs_config.php
===================================================================
--- units/logs/session_logs/session_logs_config.php (revision 14516)
+++ units/logs/session_logs/session_logs_config.php (working copy)
@@ -137,16 +137,16 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'SessionLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'SessionLogId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'PortalUserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 70, ),
- 'UserLogin' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'UserFirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserLastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
- 'UserEmail' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserLogin' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'UserFirstName' => Array ('title' => 'column:la_fld_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserLastName' => Array ('title' => 'column:la_fld_LastName', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
+ 'UserEmail' => Array ('title' => 'column:la_fld_Email', 'filter_block' => 'grid_like_filter', 'width' => 120, ),
'SessionStart' => Array ('title' => 'la_col_SessionStart', 'filter_block' => 'grid_date_range_filter', 'width' => 120, ),
'SessionEnd' => Array ('title' => 'la_col_SessionEnd', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Duration' => Array ('title' => 'la_col_Duration', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Duration' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
'IP' => Array ('title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'AffectedItems' => Array ('title' => 'la_col_AffectedItems', 'data_block' => 'affected_td', 'width' => 120, ),
),
Index: units/mailing_lists/mailing_lists_config.php
===================================================================
--- units/mailing_lists/mailing_lists_config.php (revision 14516)
+++ units/mailing_lists/mailing_lists_config.php (working copy)
@@ -131,14 +131,14 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'MailingId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'MessageText' => Array ('title' => 'la_col_MessageText', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
+ 'MailingId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Subject' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'MessageText' => Array ('filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
'MessageHtml' => Array ('title' => 'la_col_MessageHtml', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'EmailsQueued' => Array ('title' => 'la_col_EmailsQueued', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'EmailsSent' => Array ('title' => 'la_col_EmailsSent', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'EmailsTotal' => Array ('title' => 'la_col_EmailsTotal', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'EmailsQueued' => Array ('filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'EmailsSent' => Array ('filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'EmailsTotal' => Array ('filter_block' => 'grid_range_filter', 'width' => 80, ),
),
),
),
Index: units/modules/modules_config.php
===================================================================
--- units/modules/modules_config.php (revision 14516)
+++ units/modules/modules_config.php (working copy)
@@ -100,11 +100,11 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'Name' => Array('title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td_no_icon', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Version' => Array('title' => 'la_col_Version', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Path' => Array('title' => 'la_col_SystemPath', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Name' => Array('data_block' => 'grid_checkbox_td_no_icon', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Version' => Array('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Path' => Array('title' => 'la_col_SystemPath', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'BuildDate' => Array('title' => 'la_col_BuildDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Loaded' => Array('title' => 'la_col_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Loaded' => Array('title' => 'column:la_fld_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
),
Index: units/phrases/phrases_config.php
===================================================================
--- units/phrases/phrases_config.php (revision 14516)
+++ units/phrases/phrases_config.php (working copy)
@@ -92,6 +92,8 @@
'' => Array (
'PrimaryTranslation' => 'l%4$s_Translation',
'CurrentTranslation' => 'l%5$s_Translation',
+ 'CurrentHintTranslation' => 'l%5$s_HintTranslation',
+ 'CurrentColumnTranslation' => 'l%5$s_ColumnTranslation',
),
),
@@ -114,6 +116,8 @@
),
'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
'Translation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
+ 'HintTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
+ 'ColumnTranslation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'),
'PhraseType' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1,
@@ -131,6 +135,8 @@
'VirtualFields' => Array (
'PrimaryTranslation' => Array ('type' => 'string', 'default' => ''),
'CurrentTranslation' => Array ('type' => 'string', 'default' => ''),
+ 'CurrentHintTranslation' => Array ('type' => 'string', 'default' => ''),
+ 'CurrentColumnTranslation' => Array ('type' => 'string', 'default' => ''),
// for language pack import/export
'LangFile' => Array (
@@ -170,13 +176,15 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'PhraseId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+ 'PhraseId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
'Phrase' => Array ('title' => 'la_col_Label', 'data_block' => 'grid_checkbox_td', 'width' => 200),
- 'CurrentTranslation' => Array ('title' => 'la_col_Phrase', 'width' => 200),
+ 'CurrentTranslation' => Array ('title' => 'column:la_fld_Phrase', 'width' => 200),
'PrimaryTranslation' => Array ('title' => 'la_col_PrimaryValue', 'width' => 200),
- 'PhraseType' => Array ('title' => 'la_col_PhraseType', 'filter_block' => 'grid_options_filter', 'width' => 60),
- 'LastChanged' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
- 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'PhraseType' => Array ('filter_block' => 'grid_options_filter', 'width' => 60),
+ 'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CurrentHintTranslation' => Array ('title' => 'la_col_HintPhrase', 'width' => 200, 'hidden' => 1),
+ 'CurrentColumnTranslation' => Array ('title' => 'la_col_ColumnPhrase', 'width' => 200, 'hidden' => 1),
),
),
@@ -188,12 +196,14 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'PhraseId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+ 'PhraseId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
'Phrase' => Array ('title' => 'la_col_Label', 'filter_block' => 'grid_like_filter', 'width' => 170),
- 'CurrentTranslation' => Array ('title' => 'la_col_Phrase', 'filter_block' => 'grid_like_filter', 'width' => 180),
- 'PhraseType' => Array ('title' => 'la_col_Location', 'filter_block' => 'grid_options_filter', 'width' => 80),
- 'LastChanged' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
- 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CurrentTranslation' => Array ('title' => 'column:la_fld_Phrase', 'filter_block' => 'grid_like_filter', 'width' => 180),
+ 'PhraseType' => Array ('title' => 'column:la_fld_Location', 'filter_block' => 'grid_options_filter', 'width' => 80),
+ 'LastChanged' => Array ('title' => 'column:la_fld_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145),
+ 'Module' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CurrentHintTranslation' => Array ('title' => 'la_col_HintPhrase', 'width' => 200, 'hidden' => 1),
+ 'CurrentColumnTranslation' => Array ('title' => 'la_col_ColumnPhrase', 'width' => 200, 'hidden' => 1),
),
),
),
Index: units/related_searches/related_searches_config.php
===================================================================
--- units/related_searches/related_searches_config.php (revision 14516)
+++ units/related_searches/related_searches_config.php (working copy)
@@ -83,9 +83,9 @@
1 => 'icon16_item.png'
),
'Fields' => Array(
- 'RelatedSearchId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'RelatedSearchId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
'Keyword' => Array( 'title'=>'la_col_Keyword', 'data_block' => 'grid_keyword_td', 'filter_block' => 'grid_like_filter'),
- 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
+ 'Enabled' => Array( 'title'=>'column:la_fld_Status', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: units/relationship/relationship_config.php
===================================================================
--- units/relationship/relationship_config.php (revision 14516)
+++ units/relationship/relationship_config.php (working copy)
@@ -98,11 +98,11 @@
'0_1' => 'icon16_relation_reciprocal_disabled.gif'
), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
'Fields' => Array(
- 'RelationshipId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'ItemType' => Array( 'title'=>'la_col_TargetType', 'filter_block' => 'grid_like_filter', 'width' => 80, ),
- 'Type' => Array( 'title'=>'la_col_RelationshipType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'RelationshipId' => Array ('title' => 'column:la_fld_Id', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'ItemName' => Array( 'title' => 'column:la_fld_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'ItemType' => Array( 'title' => 'la_col_TargetType', 'filter_block' => 'grid_like_filter', 'width' => 80, ),
+ 'Type' => Array( 'title' => 'column:la_fld_RelationshipType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Enabled' => Array('filter_block' => 'grid_options_filter', 'width' => 70, ),
),
),
),
Index: units/reviews/reviews_config.php
===================================================================
--- units/reviews/reviews_config.php (revision 14516)
+++ units/reviews/reviews_config.php (working copy)
@@ -183,12 +183,12 @@
2 => 'icon16_pending.png',
),
'Fields' => Array (
- 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'ReviewText' => Array ( 'title' => 'la_col_ReviewText', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
+ 'ReviewId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ReviewText' => Array ('filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
'ReviewedBy' => Array ( 'title' => 'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'CreatedOn' => Array ( 'title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Rating' => Array ( 'title' => 'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Rating' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
@@ -200,12 +200,12 @@
2 => 'icon16_pending.png',
),
'Fields' => Array (
- 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'ReviewText' => Array ( 'title' => 'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
+ 'ReviewId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ReviewText' => Array ('data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
'ReviewedBy' => Array ( 'title' => 'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'CreatedOn' => Array ( 'title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Rating' => Array ( 'title' => 'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Rating' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
),
Index: units/selectors/selectors_config.php
===================================================================
--- units/selectors/selectors_config.php (revision 14516)
+++ units/selectors/selectors_config.php (working copy)
@@ -129,19 +129,19 @@
'Icons' => Array(
'default'=>'icon16_selector.gif'),
'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'SelectorName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
),
),
'BlockStyles' => Array(
'Icons' => Array('default'=>'icon16_selector.gif'),
'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'SelectorName' => Array( 'title'=>'la_col_SelectorName', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
- 'ParentId' => Array('title'=>'la_col_Basedon', 'filter_block' => 'grid_options_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'SelectorName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('data_block' => 'grid_description_td', 'filter_block' => 'grid_like_filter'),
+ 'ParentId' => Array ('title' => 'la_col_Basedon', 'filter_block' => 'grid_options_filter'),
),
),
),
Index: units/site_domains/site_domains_config.php
===================================================================
--- units/site_domains/site_domains_config.php (revision 14516)
+++ units/site_domains/site_domains_config.php (working copy)
@@ -142,13 +142,13 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'DomainId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'DomainName' => Array ('title' => 'la_col_DomainName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'SSLUrl' => Array ('title' => 'la_col_SSLUrl', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Country' => Array ('title' => 'la_col_Country', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryLanguageId' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryThemeId' => Array ('title' => 'la_col_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'DomainId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'DomainName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'SSLUrl' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Country' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryLanguageId' => Array ('title' => 'column:la_fld_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryThemeId' => Array ('title' => 'column:la_fld_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'Priority' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
),
),
),
Index: units/skins/skins_config.php
===================================================================
--- units/skins/skins_config.php (revision 14516)
+++ units/skins/skins_config.php (working copy)
@@ -169,9 +169,9 @@
1 => 'icon16_primary.png',
),
'Fields' => Array(
- 'SkinId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array( 'title'=>'la_col_SkinName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'IsPrimary' => Array( 'title'=>'la_col_IsPrimary', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'SkinId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ('title' => 'column:la_fld_SkinName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'IsPrimary' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: units/spelling_dictionary/spelling_dictionary_config.php
===================================================================
--- units/spelling_dictionary/spelling_dictionary_config.php (revision 14516)
+++ units/spelling_dictionary/spelling_dictionary_config.php (working copy)
@@ -45,7 +45,7 @@
'spelling_dictionary_list' => Array (
'prefixes' => Array ('spelling-dictionary_List'), 'format' => "!la_title_SpellingDictionary!",
- 'toolbar_buttons' => Array ('new_spelling_dictionary', 'edit', 'delete', 'export', 'view', 'dbl-click'),
+ 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'export', 'view', 'dbl-click'),
),
'spelling_dictionary_edit' => Array (
'prefixes' => Array ('spelling-dictionary'), 'format' => "#spelling-dictionary_status# '#spelling-dictionary_titlefield#'",
@@ -55,8 +55,8 @@
'PermSection' => Array('main' => 'in-portal:spelling_dictionary'),
- /*
- 'Sections' => Array (
+
+ /*'Sections' => Array (
'in-portal:spelling_dictionary' => Array (
'parent' => 'in-portal:website_setting_folder',
'icon' => 'spelling_dictionary',
@@ -66,9 +66,9 @@
'priority' => 7,
'type' => stTREE,
),
- ),
- */
+ ),*/
+
'ListSQLs' => Array (
'' => ' SELECT %1$s.* %2$s FROM %1$s',
),
@@ -89,9 +89,9 @@
'Default' => Array (
'Icons' => Array ('default' => 'icon16_spelling_dictionary.gif'),
'Fields' => Array (
- 'SpellingDictionaryId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
- 'MisspelledWord' => Array ('title' => 'la_col_MisspelledWord', 'filter_block' => 'grid_like_filter',),
- 'SuggestedCorrection' => Array ('title' => 'la_col_SuggestedCorrection', 'filter_block' => 'grid_like_filter',),
+ 'SpellingDictionaryId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
+ 'MisspelledWord' => Array ('filter_block' => 'grid_like_filter',),
+ 'SuggestedCorrection' => Array ('filter_block' => 'grid_like_filter',),
),
),
),
Index: units/statistics/statistics_config.php
===================================================================
--- units/statistics/statistics_config.php (revision 14516)
+++ units/statistics/statistics_config.php (working copy)
@@ -68,9 +68,9 @@
'Default' => Array(
'Icons' => Array('default' => 'icon16_item.png'),
'Fields' => Array(
- 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'),
- 'LastName' => Array( 'title'=>'la_col_LastName'),
- 'FirstName' => Array( 'title'=>'la_col_FirstName'),
+ 'Login' => Array('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td'),
+ 'LastName' => Array(),
+ 'FirstName' => Array(),
),
),
Index: units/stop_words/stop_words_config.php
===================================================================
--- units/stop_words/stop_words_config.php (revision 14516)
+++ units/stop_words/stop_words_config.php (working copy)
@@ -91,8 +91,8 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'StopWordId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'StopWord' => Array ('title' => 'la_col_StopWord', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'StopWordId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'StopWord' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
),
),
),
Index: units/structure/structure_config.php
===================================================================
--- units/structure/structure_config.php (revision 14516)
+++ units/structure/structure_config.php (working copy)
@@ -68,7 +68,7 @@
'IDField' => 'CategoryId',
- 'StatusField' => Array('IsMenu'),
+ 'StatusField' => Array('Status'),
'TitleField' => 'Name', // field, used in bluebar when editing existing item
@@ -217,13 +217,13 @@
'Default' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
- 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
@@ -231,26 +231,26 @@
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Selector' => 'radio',
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter'),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter' ),
- 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter' ),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
'AllPages' => Array(
'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'),
'Fields' => Array(
- 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'filter_width' => '20' ),
- 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter' ),
- 'Path' => Array( 'title'=>'la_col_Path', 'data_block'=>'page_path_td', 'sort_field' => 'CachedNavbar', 'filter_block' => 'grid_like_filter' ),
- 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter' ),
- 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'hidden' => true ),
- 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter' ),
- 'Protected' => Array( 'title'=>'la_col_Protected', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'CategoryId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 55),
+ 'Name' => Array ('title'=>'column:la_fld_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Path' => Array ('title'=>'la_col_Path', 'data_block' => 'page_path_td', 'sort_field' => 'CachedNavbar', 'filter_block' => 'grid_like_filter' ),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 170),
+ 'Template' => Array ('title' => 'column:la_fld_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220),
+ 'IsMenu' => Array ('title' => 'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70),
+ 'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: units/stylesheets/stylesheets_config.php
===================================================================
--- units/stylesheets/stylesheets_config.php (revision 14516)
+++ units/stylesheets/stylesheets_config.php (working copy)
@@ -157,10 +157,10 @@
1 => 'icon16_item.png'
),
'Fields' => Array(
- 'Name' => Array('title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'Description' => Array('title'=>'la_col_Description', 'first_chars' => 100, 'filter_block' => 'grid_like_filter'),
- 'Enabled' => Array('title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
- 'LastCompiled' => Array('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'),
+ 'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'Description' => Array ('first_chars' => 100, 'filter_block' => 'grid_like_filter'),
+ 'Enabled' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter'),
+ 'LastCompiled' => Array ('title' => 'la_col_LastCompiled', 'filter_block' => 'grid_date_range_filter'),
),
),
),
Index: units/theme_files/theme_files_config.php
===================================================================
--- units/theme_files/theme_files_config.php (revision 14516)
+++ units/theme_files/theme_files_config.php (working copy)
@@ -75,10 +75,10 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'FileId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'FileName' => Array( 'title'=>'la_col_FileName', 'width' => 150, ),
- 'FilePath' => Array( 'title'=>'la_col_FilePath', 'width' => 300, ),
- 'Description' => Array( 'title'=>'la_col_Description', 'width' => 300, ),
+ 'FileId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'FileName' => Array ('width' => 150, ),
+ 'FilePath' => Array ('width' => 300, ),
+ 'Description' => Array ('width' => 300, ),
),
),
Index: units/themes/themes_config.php
===================================================================
--- units/themes/themes_config.php (revision 14516)
+++ units/themes/themes_config.php (working copy)
@@ -92,7 +92,7 @@
'TableName' => TABLE_PREFIX.'Theme',
'SubItems' => Array('theme-file'),
-
+
'AutoDelete' => true,
'AutoClone' => true,
@@ -141,11 +141,11 @@
'1_1' => 'icon16_primary.png',
),
'Fields' => Array(
- 'ThemeId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Description' => Array( 'title'=>'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
-// 'PrimaryTheme' => Array( 'title'=>'la_col_Primary', 'filter_block' => 'grid_options_filter'),
+ 'ThemeId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Description' => Array('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Enabled' => Array( 'title'=>'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 200, ),
+// 'PrimaryTheme' => Array( 'title'=>'column:la_fld_Primary', 'filter_block' => 'grid_options_filter'),
'LanguagePackInstalled' => Array ('title' => 'la_col_LanguagePackInstalled', 'filter_block' => 'grid_options_filter', 'width' => 200,),
),
),
Index: units/thesaurus/thesaurus_config.php
===================================================================
--- units/thesaurus/thesaurus_config.php (revision 14516)
+++ units/thesaurus/thesaurus_config.php (working copy)
@@ -101,10 +101,10 @@
1 => 'icon16_item.png',
),
'Fields' => Array (
- 'ThesaurusId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'SearchTerm' => Array ('title' => 'la_col_SearchTerm', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'ThesaurusTerm' => Array ('title' => 'la_col_ThesaurusTerm', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-// 'ThesaurusType' => Array ('title' => 'la_col_ThesaurusType', 'filter_block' => 'grid_options_filter',),
+ 'ThesaurusId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'SearchTerm' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'ThesaurusTerm' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+// 'ThesaurusType' => Array ('filter_block' => 'grid_options_filter',),
),
),
),
Index: units/translator/translator_config.php
===================================================================
--- units/translator/translator_config.php (revision 14516)
+++ units/translator/translator_config.php (working copy)
@@ -30,7 +30,7 @@
),
'IDField' => 'N/A',
- 'TitlePresets' => Array (
+ 'TitlePresets' => Array (
'trans_edit' => Array (
'prefixes' => Array('trans'), 'format' => '!la_title_EditingTranslation!',
'toolbar_buttons' => Array ('select', 'cancel'),
@@ -46,6 +46,5 @@
'Language' => Array(),
'SwitchLanguage' => Array('formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language', 'option_key_field' => 'LanguageId','option_title_field' => 'PackName'),
'Translation' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => ''),
- ),
- 'Grids' => Array(),
+ ),
);
\ No newline at end of file
Index: units/user_groups/user_groups_config.php
===================================================================
--- units/user_groups/user_groups_config.php (revision 14516)
+++ units/user_groups/user_groups_config.php (working copy)
@@ -48,9 +48,9 @@
'GroupUsers' => Array(
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array(
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'UserName' => Array ('title'=>'la_col_UserFirstLastName', 'width' => 200, ),
- 'UserLogin' => Array ('title'=>'la_col_Login', 'width' => 100, ),
+ 'UserLogin' => Array ('title'=>'column:la_fld_Login', 'width' => 100, ),
'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
@@ -120,9 +120,9 @@
1 => 'icon16_primary.png'
),
'Fields' => Array(
- 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'GroupName' => Array ('title'=>'la_col_GroupName', 'width' => 100, ),
- 'GroupDescription' => Array ('title'=>'la_col_Description', 'width' => 150, ),
+ 'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'GroupName' => Array ('width' => 100, ),
+ 'GroupDescription' => Array ('title' => 'column:la_fld_Description', 'width' => 150, ),
'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
Index: units/users/users_config.php
===================================================================
--- units/users/users_config.php (revision 14516)
+++ units/users/users_config.php (working copy)
@@ -489,14 +489,14 @@
2 => 'icon16_user_pending.png'
),
'Fields' => Array(
- 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
- 'LastName' => Array( 'title'=>'la_col_LastName', 'filter_block' => 'grid_like_filter'),
- 'FirstName' => Array( 'title'=>'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
- 'Email' => Array( 'title'=>'la_col_Email', 'filter_block' => 'grid_like_filter'),
- 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'),
- 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
- 'Modified' => Array('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter'),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter'),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Email' => Array ('filter_block' => 'grid_like_filter'),
+ 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'),
+ 'Modified' => Array('filter_block' => 'grid_date_range_filter'),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -509,14 +509,14 @@
),
'Selector' => 'radio',
'Fields' => Array(
- 'Login' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'CreatedOn' => Array('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'Modified' => Array('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_login_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+ 'Modified' => Array('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -528,12 +528,12 @@
2 => 'icon16_admin_disabled.png',
),
'Fields' => Array (
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -545,14 +545,14 @@
2 => 'icon16_user_pending.png'
),
'Fields' => Array(
- 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
- 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Email' => Array ('title' => 'la_col_Email', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70),
+ 'Login' => Array ('title' => 'column:la_fld_Username', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Email' => Array ('filter_block' => 'grid_like_filter', 'width' => 200, ),
'PrimaryGroup' => Array ('title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_like_filter', 'width' => 140),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100),
'Modified' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 100),
),
),
Index: units/visits/visits_config.php
===================================================================
--- units/visits/visits_config.php (revision 14516)
+++ units/visits/visits_config.php (working copy)
@@ -157,7 +157,7 @@
'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'UserName' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'UserName' => Array ('title' => 'column:la_fld_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
),
),
@@ -167,8 +167,8 @@
'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'UserName' => Array ( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 105, ),
+ 'UserName' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 105, ),
'OrderTotalAmountSum' => Array ( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter', 'width' => 95, ),
'OrderAffiliateCommissionSum' => Array ( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter', 'width' => 160, ),
),
phrase_storage_automation_modules_v2.patch [^] (229,703 bytes) 2011-09-17 06:15
[Show Content]
Index: custom/admin_templates/widgets/widget_edit.tpl
===================================================================
--- custom/admin_templates/widgets/widget_edit.tpl (revision 14516)
+++ custom/admin_templates/widgets/widget_edit.tpl (working copy)
@@ -67,23 +67,23 @@
<table class="edit-form">
<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
<inp2:m_RenderElement name="inp_id_label" prefix="$prefix" field="$id_field" title="la_fld_Id"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Title" title="la_fld_Title" style="width: 100px"/>
- <inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="Good" title="la_fld_Good"/>
- <inp2:m_RenderElement name="inp_edit_fck" prefix="$prefix" field="Description" title="la_fld_Description"/>
- <inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Status" title="la_fld_Status"/>
- <inp2:m_RenderElement name="inp_edit_options" prefix="$prefix" field="Type" title="la_fld_Type" has_empty="1"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Title" style="width: 100px"/>
+ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="Good"/>
+ <inp2:m_RenderElement name="inp_edit_fck" prefix="$prefix" field="Description"/>
+ <inp2:m_RenderElement name="inp_edit_radio" prefix="$prefix" field="Status"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="$prefix" field="Type" has_empty="1"/>
<!--##
- <inp2:m_RenderElement name="inp_edit_date" prefix="$prefix" field="CreatedOn" title="la_fld_CreatedOn"/>
+ <inp2:m_RenderElement name="inp_edit_date" prefix="$prefix" field="CreatedOn"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="$prefix" field="IsSystem" title="la_fld_IsSystemTemplate" onchange="OnSystemClick()"/>
##-->
- <inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Qty" title="la_fld_Qty" style="width: 50px"/>
- <inp2:m_RenderElement name="inp_edit_textarea" prefix="$prefix" field="Phone" title="la_fld_Phone"/>
- <inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Email" title="la_fld_Email" style="width: 200px"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Qty" style="width: 50px"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="$prefix" field="Phone"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="$prefix" field="Email" style="width: 200px"/>
- <inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="Image" title="la_fld_Image"/>
- <inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="DataFile" title="la_fld_DataFile"/>
+ <inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="Image"/>
+ <inp2:m_RenderElement name="inp_edit_swf_upload" prefix="$prefix" field="DataFile"/>
<inp2:m_RenderElement name="inp_edit_filler"/>
</table>
</div>
Index: custom/install/english.lang
===================================================================
--- custom/install/english.lang (revision 14516)
+++ custom/install/english.lang (working copy)
@@ -1,10 +1,8 @@
-<LANGUAGES>
- <LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><UNITSYSTEM>2</UNITSYSTEM>
+<LANGUAGES Version="4">
+ <LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
- <PHRASE Label="la_col_Good" Module="Custom" Type="1">R29vZA==</PHRASE>
- <PHRASE Label="la_col_Phone" Module="Custom" Type="1">UGhvbmU=</PHRASE>
<PHRASE Label="la_fld_DataFile" Module="Custom" Type="1">RGF0YSBmaWxl</PHRASE>
- <PHRASE Label="la_fld_Good" Module="Custom" Type="1">R29vZA==</PHRASE>
+ <PHRASE Label="la_fld_Good" Module="Custom" Type="1" Column="R29vZA==">R29vZA==</PHRASE>
<PHRASE Label="la_opt_Custom" Module="Custom" Type="1">Q3VzdG9t</PHRASE>
<PHRASE Label="la_opt_Default" Module="Custom" Type="1">RGVmYXVsdA==</PHRASE>
<PHRASE Label="la_tab_Widgets" Module="Custom" Type="1">V2lkZ2V0cw==</PHRASE>
Index: custom/units/widgets/widgets_config.php
===================================================================
--- custom/units/widgets/widgets_config.php (revision 14516)
+++ custom/units/widgets/widgets_config.php (working copy)
@@ -194,18 +194,18 @@
'Default' => Array (
// 'Icons' => Array ('default' => 'icon16_custom.gif'),
'Fields' => Array (
- 'WidgetId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'Title' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_custom_td'),
- 'Image' => Array ('title' => 'la_col_Image', 'data_block' => 'grid_image_td'),
- 'Type' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
- 'Good' => Array ('title' => 'la_col_Good'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_float_range_filter'),
- 'Email' => Array ('title' => 'la_col_Email'),
- 'Phone' => Array ('title' => 'la_col_Phone'),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
- 'Description' => Array ('title' => 'la_col_Description'),
- 'VirtualActionField' => Array ('title' => 'la_col_Action', 'data_block' => 'grid_delete_td'),
+ 'WidgetId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'Title' => Array ('title' => 'column:la_fld_Name', 'data_block' => 'grid_custom_td'),
+ 'Image' => Array ('data_block' => 'grid_image_td'),
+ 'Type' => Array ('filter_block' => 'grid_options_filter'),
+ 'Status' => Array ('filter_block' => 'grid_options_filter'),
+ 'Good' => Array ('filter_block' => 'grid_like_filter'),
+ 'Qty' => Array ('header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_float_range_filter'),
+ 'Email' => Array ('filter_block' => 'grid_like_filter'),
+ 'Phone' => Array ('filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'),
+ 'Description' => Array ('filter_block' => 'grid_like_filter'),
+ 'VirtualActionField' => Array ('title' => 'column:la_fld_Action', 'data_block' => 'grid_delete_td'),
),
),
),
Index: in-auction/install/english.lang
===================================================================
--- in-auction/install/english.lang (revision 14516)
+++ in-auction/install/english.lang (working copy)
@@ -1,5 +1,5 @@
-<LANGUAGES>
- <LANGUAGE PackName="English" Encoding="base64"><DATEFORMAT>m/d/Y</DATEFORMAT><TIMEFORMAT>g:i A</TIMEFORMAT><INPUTDATEFORMAT>m/d/Y</INPUTDATEFORMAT><INPUTTIMEFORMAT>g:i:s A</INPUTTIMEFORMAT><DECIMAL>.</DECIMAL><THOUSANDS>,</THOUSANDS><CHARSET>utf-8</CHARSET><DOCS_URL>http://docs.in-portal.org/eng/index.php</DOCS_URL><UNITSYSTEM>2</UNITSYSTEM>
+<LANGUAGES Version="4">
+ <LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_Add_a_custom_detail" Module="In-Auction" Type="1">QWRkIGEgY3VzdG9tIGRldGFpbA==</PHRASE>
<PHRASE Label="la_ASP" Module="In-Auction" Type="1">QVNQ</PHRASE>
@@ -7,55 +7,36 @@
<PHRASE Label="la_Cancelled" Module="In-Auction" Type="1">Q2FuY2VsbGVk</PHRASE>
<PHRASE Label="la_choosen" Module="In-Auction" Type="1">Y2hvb3Nlbg==</PHRASE>
<PHRASE Label="la_ClosingRate" Module="In-Auction" Type="1">Q2xvc2luZyBSYXRl</PHRASE>
- <PHRASE Label="la_col_AnswerStatus" Module="In-Auction" Type="1">QW5zd2VyIFN0YXR1cw==</PHRASE>
- <PHRASE Label="la_col_AutoRelist" Module="In-Auction" Type="1">QXV0byBSZWxpc3Q=</PHRASE>
<PHRASE Label="la_col_B" Module="In-Auction" Type="1">Qg==</PHRASE>
- <PHRASE Label="la_col_BidCounter" Module="In-Auction" Type="1">QmlkIENvdW50ZXI=</PHRASE>
<PHRASE Label="la_col_Bids" Module="In-Auction" Type="1">Qmlkcw==</PHRASE>
<PHRASE Label="la_col_BuyItNow" Module="In-Auction" Type="1">QnV5SXROb3c=</PHRASE>
<PHRASE Label="la_col_ClosedOn" Module="In-Auction" Type="1">Q2xvc2VkIE9u</PHRASE>
<PHRASE Label="la_col_ClosingTime" Module="In-Auction" Type="1">Q2xvc2luZyBUaW1l</PHRASE>
- <PHRASE Label="la_col_ContinueUntilQuantity" Module="In-Auction" Type="1">TWluLiBRdHk=</PHRASE>
<PHRASE Label="la_col_CurrentBid" Module="In-Auction" Type="1">Q3VycmVudCBCaWQ=</PHRASE>
- <PHRASE Label="la_col_CurrentPrice" Module="In-Auction" Type="1">Q3VycmVudCBQcmljZQ==</PHRASE>
- <PHRASE Label="la_col_DurationSeconds" Module="In-Auction" Type="1">RHVyYXRpb24gU2Vjb25kcw==</PHRASE>
<PHRASE Label="la_col_eBayAmount" Module="In-Auction" Type="1">ZUJheSBBbW91bnQ=</PHRASE>
<PHRASE Label="la_col_eBayGMV" Module="In-Auction" Type="1">ZUJheSBHTVY=</PHRASE>
<PHRASE Label="la_col_eBayListing" Module="In-Auction" Type="1">ZUJheSBMaXN0aW5n</PHRASE>
<PHRASE Label="la_col_eBayProfit" Module="In-Auction" Type="1">ZUJheSBQcm9maXQ=</PHRASE>
<PHRASE Label="la_col_eBayQty" Module="In-Auction" Type="1">ZUJheSBRdHk=</PHRASE>
- <PHRASE Label="la_col_EndTime" Module="In-Auction" Type="1">RW5kIFRpbWU=</PHRASE>
<PHRASE Label="la_col_F" Module="In-Auction" Type="1">Rg==</PHRASE>
<PHRASE Label="la_col_FH" Module="In-Auction" Type="1">Rkg=</PHRASE>
- <PHRASE Label="la_col_Fixed" Module="In-Auction" Type="1">Rml4ZWQ=</PHRASE>
<PHRASE Label="la_col_FP" Module="In-Auction" Type="1">RlA=</PHRASE>
<PHRASE Label="la_col_G" Module="In-Auction" Type="1">Rw==</PHRASE>
<PHRASE Label="la_col_GP" Module="In-Auction" Type="1">R1A=</PHRASE>
<PHRASE Label="la_col_H" Module="In-Auction" Type="1">SA==</PHRASE>
- <PHRASE Label="la_col_LastProcessed" Module="In-Auction" Type="1">TGFzdCBQcm9jZXNzZWQ=</PHRASE>
<PHRASE Label="la_col_ListingDuration" Module="In-Auction" Type="1">RHVyYXRpb24=</PHRASE>
- <PHRASE Label="la_col_ListingId" Module="In-Auction" Type="1">TGlzdGluZyBJZA==</PHRASE>
- <PHRASE Label="la_col_ListingType" Module="In-Auction" Type="1">TGlzdGluZyBUeXBl</PHRASE>
- <PHRASE Label="la_col_LogId" Module="In-Auction" Type="1">TG9nIElk</PHRASE>
- <PHRASE Label="la_col_OriginalListingId" Module="In-Auction" Type="1">T3JpZ2luYWwgTGlzdGluZyBJZA==</PHRASE>
<PHRASE Label="la_col_Paid" Module="In-Auction" Type="1">UGFpZA==</PHRASE>
- <PHRASE Label="la_col_PayPalSellerEmail" Module="In-Auction" Type="1">UGF5UGFsIFNlbGxlciBFbWFpbA==</PHRASE>
<PHRASE Label="la_col_ProductId" Module="In-Auction" Type="1">UHJvZHVjdCBJZA==</PHRASE>
<PHRASE Label="la_col_Relist" Module="In-Auction" Type="1">UmVsaXN0</PHRASE>
- <PHRASE Label="la_col_RequestTime" Module="In-Auction" Type="1">UmVxdWVzdCBUaW1l</PHRASE>
- <PHRASE Label="la_col_RequestType" Module="In-Auction" Type="1">UmVxdWVzdCBUeXBl</PHRASE>
<PHRASE Label="la_col_Reserve" Module="In-Auction" Type="1">UmVzZXJ2ZQ==</PHRASE>
<PHRASE Label="la_col_ReservePrice" Module="In-Auction" Type="1">UmVzZXJ2ZSBQcmljZQ==</PHRASE>
<PHRASE Label="la_col_ScheduleName" Module="In-Auction" Type="1">U2NoZWR1bGU=</PHRASE>
<PHRASE Label="la_col_Sold" Module="In-Auction" Type="1">U29sZA==</PHRASE>
- <PHRASE Label="la_col_StartTime" Module="In-Auction" Type="1">U3RhcnQgVGltZQ==</PHRASE>
<PHRASE Label="la_col_StoreAmount" Module="In-Auction" Type="1">U3RvcmUgQW1vdW50</PHRASE>
<PHRASE Label="la_col_StoreGMV" Module="In-Auction" Type="1">U3RvcmUgR01W</PHRASE>
<PHRASE Label="la_col_StoreProfit" Module="In-Auction" Type="1">U3RvcmUgUHJvZml0</PHRASE>
<PHRASE Label="la_col_StoreQty" Module="In-Auction" Type="1">U3RvcmUgUXR5</PHRASE>
<PHRASE Label="la_col_TemplateName" Module="In-Auction" Type="1">VGVtcGxhdGUgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_UseGallery" Module="In-Auction" Type="1">VXNlIEdhbGxlcnk=</PHRASE>
- <PHRASE Label="la_col_UseGalleryPlus" Module="In-Auction" Type="1">VXNlIEdhbGxlcnkgUGx1cw==</PHRASE>
<PHRASE Label="la_col_Winner" Module="In-Auction" Type="1">V2lubmVy</PHRASE>
<PHRASE Label="la_col_WinningBid" Module="In-Auction" Type="1">V2lubmluZyBCaWQ=</PHRASE>
<PHRASE Label="la_Completed" Module="In-Auction" Type="1">Q29tcGxldGVk</PHRASE>
@@ -89,32 +70,31 @@
<PHRASE Label="la_eBayStoreFixed" Module="In-Auction" Type="1">ZUJheSBTdG9yZSAvIEZpeGVk</PHRASE>
<PHRASE Label="la_Ended" Module="In-Auction" Type="1">RW5kZWQ=</PHRASE>
<PHRASE Label="la_Fees" Module="In-Auction" Type="1">RmVlcw==</PHRASE>
- <PHRASE Label="la_fld_Answer" Module="In-Auction" Type="1">QW5zd2Vy</PHRASE>
- <PHRASE Label="la_fld_AnswerStatus" Module="In-Auction" Type="1">QW5zd2VyIFN0YXR1cw==</PHRASE>
+ <PHRASE Label="la_fld_AnswerStatus" Module="In-Auction" Type="1" Column="QW5zd2VyIFN0YXR1cw==">QW5zd2VyIFN0YXR1cw==</PHRASE>
<PHRASE Label="la_fld_AuctionBuyItNowPrice" Module="In-Auction" Type="1">QXVjdGlvbiBCdXkgSXQgTm93IFByaWNl</PHRASE>
<PHRASE Label="la_fld_AuctionListingDuration" Module="In-Auction" Type="1">QXVjdGlvbiBMaXN0aW5nIER1cmF0aW9u</PHRASE>
<PHRASE Label="la_fld_AuctionPrimaryCategoryId" Module="In-Auction" Type="1">QXVjdGlvbiBQcmltYXJ5IENhdGVnb3J5IElE</PHRASE>
<PHRASE Label="la_fld_AuctionReservePrice" Module="In-Auction" Type="1">QXVjdGlvbiBSZXNlcnZlIFByaWNl</PHRASE>
<PHRASE Label="la_fld_AuctionSecondaryCategoryId" Module="In-Auction" Type="1">QXVjdGlvbiBTZWNvbmRhcnkgQ2F0ZWdvcnkgSUQ=</PHRASE>
<PHRASE Label="la_fld_AuctionStartPrice" Module="In-Auction" Type="1">QXVjdGlvbiBTdGFydCBQcmljZQ==</PHRASE>
- <PHRASE Label="la_fld_AutoRelist" Module="In-Auction" Type="1">QXV0byBSZWxpc3Q=</PHRASE>
- <PHRASE Label="la_fld_BidCounter" Module="In-Auction" Type="1">QmlkIENvdW50ZXI=</PHRASE>
+ <PHRASE Label="la_fld_AutoRelist" Module="In-Auction" Type="1" Column="QXV0byBSZWxpc3Q=">QXV0byBSZWxpc3Q=</PHRASE>
+ <PHRASE Label="la_fld_BidCounter" Module="In-Auction" Type="1" Column="QmlkIENvdW50ZXI=">QmlkIENvdW50ZXI=</PHRASE>
<PHRASE Label="la_fld_BlockFromScheduling" Module="In-Auction" Type="1">QmxvY2sgRnJvbSBTY2hlZHVsaW5n</PHRASE>
- <PHRASE Label="la_fld_ContinueUntilQuantity" Module="In-Auction" Type="1">TWluLiBRdHk=</PHRASE>
- <PHRASE Label="la_fld_CurrentPrice" Module="In-Auction" Type="1">Q3VycmVudCBQcmljZQ==</PHRASE>
+ <PHRASE Label="la_fld_ContinueUntilQuantity" Module="In-Auction" Type="1" Column="TWluLiBRdHk=">TWluLiBRdHk=</PHRASE>
+ <PHRASE Label="la_fld_CurrentPrice" Module="In-Auction" Type="1" Column="Q3VycmVudCBQcmljZQ==">Q3VycmVudCBQcmljZQ==</PHRASE>
<PHRASE Label="la_fld_DetailTemplate" Module="In-Auction" Type="1">RGV0YWlsIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_DetailTemplateBody" Module="In-Auction" Type="1">RGV0YWlsIFRlbXBsYXRlIEJvZHk=</PHRASE>
<PHRASE Label="la_fld_DetailTemplateId" Module="In-Auction" Type="1">RGV0YWlsIFRlbXBsYXRlIElk</PHRASE>
- <PHRASE Label="la_fld_DurationSeconds" Module="In-Auction" Type="1">RHVyYXRpb24gU2Vjb25kcw==</PHRASE>
+ <PHRASE Label="la_fld_DurationSeconds" Module="In-Auction" Type="1" Column="RHVyYXRpb24gU2Vjb25kcw==">RHVyYXRpb24gU2Vjb25kcw==</PHRASE>
<PHRASE Label="la_fld_eBayListingId" Module="In-Auction" Type="1">ZUJheSBMaXN0aW5nIElk</PHRASE>
- <PHRASE Label="la_fld_EndTime" Module="In-Auction" Type="1">RW5kIFRpbWU=</PHRASE>
+ <PHRASE Label="la_fld_EndTime" Module="In-Auction" Type="1" Column="RW5kIFRpbWU=">RW5kIFRpbWU=</PHRASE>
<PHRASE Label="la_fld_EnhancementBoldTitle" Module="In-Auction" Type="1">RW5oYW5jZW1lbnQgQm9sZCBUaXRsZQ==</PHRASE>
<PHRASE Label="la_fld_EnhancementBorder" Module="In-Auction" Type="1">RW5oYW5jZW1lbnQgQm9yZGVy</PHRASE>
<PHRASE Label="la_fld_EnhancementFeatured" Module="In-Auction" Type="1">RW5oYW5jZW1lbnQgRmVhdHVyZWQ=</PHRASE>
<PHRASE Label="la_fld_EnhancementHighlight" Module="In-Auction" Type="1">RW5oYW5jZW1lbnQgSGlnaGxpZ2h0</PHRASE>
<PHRASE Label="la_fld_EnhancementHomePageFeatured" Module="In-Auction" Type="1">RW5oYW5jZW1lbnQgSG9tZSBQYWdlIEZlYXR1cmVk</PHRASE>
<PHRASE Label="la_fld_Errors" Module="In-Auction" Type="1">RXJyb3Jz</PHRASE>
- <PHRASE Label="la_fld_Fixed" Module="In-Auction" Type="1">Rml4ZWQ=</PHRASE>
+ <PHRASE Label="la_fld_Fixed" Module="In-Auction" Type="1" Column="Rml4ZWQ=">Rml4ZWQ=</PHRASE>
<PHRASE Label="la_fld_GetItFast" Module="In-Auction" Type="1">R2V0IEl0IEZhc3Q=</PHRASE>
<PHRASE Label="la_fld_HasReturnPolicy" Module="In-Auction" Type="1">SGFzIFJldHVybiBQb2xpY3k=</PHRASE>
<PHRASE Label="la_fld_HitCounter" Module="In-Auction" Type="1">SGl0IENvdW50ZXI=</PHRASE>
@@ -122,26 +102,26 @@
<PHRASE Label="la_fld_ImageUrls" Module="In-Auction" Type="1">SW1hZ2UgVVJMcw==</PHRASE>
<PHRASE Label="la_fld_InsuranceAmount" Module="In-Auction" Type="1">SW5zdXJhbmNlIEFtb3VudA==</PHRASE>
<PHRASE Label="la_fld_InsuranceType" Module="In-Auction" Type="1">SW5zdXJhbmNlIFR5cGU=</PHRASE>
- <PHRASE Label="la_fld_LastProcessed" Module="In-Auction" Type="1">TGFzdCBQcm9jZXNzZWQ=</PHRASE>
+ <PHRASE Label="la_fld_LastProcessed" Module="In-Auction" Type="1" Column="TGFzdCBQcm9jZXNzZWQ=">TGFzdCBQcm9jZXNzZWQ=</PHRASE>
<PHRASE Label="la_fld_ListingDescription" Module="In-Auction" Type="1">TGlzdGluZyBEZXNjcmlwdGlvbg==</PHRASE>
- <PHRASE Label="la_fld_ListingQuantity" Module="In-Auction" Type="1">TGlzdGluZyBRdWFudGl0eQ==</PHRASE>
+ <PHRASE Label="la_fld_ListingQuantity" Module="In-Auction" Type="1" Column="TGlzdGluZyBRdHk=">TGlzdGluZyBRdWFudGl0eQ==</PHRASE>
<PHRASE Label="la_fld_ListingTitle" Module="In-Auction" Type="1">TGlzdGluZyBUaXRsZQ==</PHRASE>
<PHRASE Label="la_fld_Listing_Id" Module="In-Auction" Type="1">TGlzdGluZyBJZA==</PHRASE>
- <PHRASE Label="la_fld_LogId" Module="In-Auction" Type="1">TG9nIElk</PHRASE>
- <PHRASE Label="la_fld_OriginalListingId" Module="In-Auction" Type="1">T3JpZ2luYWwgTGlzdGluZyBJZA==</PHRASE>
+ <PHRASE Label="la_fld_LogId" Module="In-Auction" Type="1" Column="TG9nIElk">TG9nIElk</PHRASE>
+ <PHRASE Label="la_fld_OriginalListingId" Module="In-Auction" Type="1" Column="T3JpZ2luYWwgTGlzdGluZyBJZA==">T3JpZ2luYWwgTGlzdGluZyBJZA==</PHRASE>
<PHRASE Label="la_fld_PaymentInstructions" Module="In-Auction" Type="1">UGF5bWVudCBJbnN0cnVjdGlvbnM=</PHRASE>
<PHRASE Label="la_fld_PaymentMethod" Module="In-Auction" Type="1">UGF5bWVudCBNZXRob2Q=</PHRASE>
- <PHRASE Label="la_fld_PayPalSellerEmail" Module="In-Auction" Type="1">UGF5UGFsIFNlbGxlciBFLW1haWw=</PHRASE>
+ <PHRASE Label="la_fld_PayPalSellerEmail" Module="In-Auction" Type="1" Column="UGF5UGFsIFNlbGxlciBFbWFpbA==">UGF5UGFsIFNlbGxlciBFLW1haWw=</PHRASE>
<PHRASE Label="la_fld_RefundType" Module="In-Auction" Type="1">UmVmdW5kIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_Request" Module="In-Auction" Type="1">UmVxdWVzdA==</PHRASE>
- <PHRASE Label="la_fld_RequestTime" Module="In-Auction" Type="1">UmVxdWVzdCBUaW1l</PHRASE>
- <PHRASE Label="la_fld_RequestType" Module="In-Auction" Type="1">UmVxdWVzdCBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_RequestTime" Module="In-Auction" Type="1" Column="UmVxdWVzdCBUaW1l">UmVxdWVzdCBUaW1l</PHRASE>
+ <PHRASE Label="la_fld_RequestType" Module="In-Auction" Type="1" Column="UmVxdWVzdCBUeXBl">UmVxdWVzdCBUeXBl</PHRASE>
<PHRASE Label="la_fld_ReturnPolicyDetails" Module="In-Auction" Type="1">UmV0dXJuIFBvbGljeSBEZXRhaWxz</PHRASE>
<PHRASE Label="la_fld_ReturnRequestDays" Module="In-Auction" Type="1">UmV0dXJuIFJlcXVlc3QgRGF5cw==</PHRASE>
<PHRASE Label="la_fld_Schedule" Module="In-Auction" Type="1">U2NoZWR1bGU=</PHRASE>
<PHRASE Label="la_fld_ScheduleId" Module="In-Auction" Type="1">U2NoZWR1bGUgSWQ=</PHRASE>
<PHRASE Label="la_fld_ShippingAsParent" Module="In-Auction" Type="1">U2hpcHBpbmcgQXMgUGFyZW50</PHRASE>
- <PHRASE Label="la_fld_StartTime" Module="In-Auction" Type="1">U3RhcnQgVGltZQ==</PHRASE>
+ <PHRASE Label="la_fld_StartTime" Module="In-Auction" Type="1" Column="U3RhcnQgVGltZQ==">U3RhcnQgVGltZQ==</PHRASE>
<PHRASE Label="la_fld_StoreBuyItNowPrice" Module="In-Auction" Type="1">U3RvcmUgQnV5IEl0IE5vdyBQcmljZQ==</PHRASE>
<PHRASE Label="la_fld_StoreListingDuration" Module="In-Auction" Type="1">U3RvcmUgTGlzdGluZyBEdXJhdGlvbg==</PHRASE>
<PHRASE Label="la_fld_StorePrimaryCategory" Module="In-Auction" Type="1">U3RvcmUgUHJpbWFyeSBDYXRlZ29yeQ==</PHRASE>
@@ -150,8 +130,8 @@
<PHRASE Label="la_fld_StoreSecondaryCategoryId" Module="In-Auction" Type="1">U3RvcmUgU2Vjb25kYXJ5IENhdGVnb3J5IElE</PHRASE>
<PHRASE Label="la_fld_SubTitle" Module="In-Auction" Type="1">U3VidGl0bGU=</PHRASE>
<PHRASE Label="la_fld_TemplateBody" Module="In-Auction" Type="1">VGVtcGxhdGUgQm9keQ==</PHRASE>
- <PHRASE Label="la_fld_UseGallery" Module="In-Auction" Type="1">VXNlIEdhbGxlcnk=</PHRASE>
- <PHRASE Label="la_fld_UseGalleryPlus" Module="In-Auction" Type="1">VXNlIEdhbGxlcnkgUGx1cw==</PHRASE>
+ <PHRASE Label="la_fld_UseGallery" Module="In-Auction" Type="1" Column="VXNlIEdhbGxlcnk=">VXNlIEdhbGxlcnk=</PHRASE>
+ <PHRASE Label="la_fld_UseGalleryPlus" Module="In-Auction" Type="1" Column="VXNlIEdhbGxlcnkgUGx1cw==">VXNlIEdhbGxlcnkgUGx1cw==</PHRASE>
<PHRASE Label="la_fld_UseInsurance" Module="In-Auction" Type="1">VXNlIEluc3VyYW5jZQ==</PHRASE>
<PHRASE Label="la_fld_WeekDays" Module="In-Auction" Type="1">V2VlayBEYXlz</PHRASE>
<PHRASE Label="la_Friday" Module="In-Auction" Type="1">RnJpZGF5</PHRASE>
Index: in-auction/install/upgrades.sql
===================================================================
--- in-auction/install/upgrades.sql (revision 14516)
+++ in-auction/install/upgrades.sql (working copy)
@@ -79,4 +79,9 @@
# ===== v 5.1.3-B1 =====
-# ===== v 5.1.3-B2 =====
\ No newline at end of file
+# ===== v 5.1.3-B2 =====
+
+# ===== v 5.1.3-RC1 =====
+UPDATE Phrase
+SET `Module` = 'Core'
+WHERE PhraseKey = 'LA_FLD_ANSWER';
\ No newline at end of file
Index: in-auction/units/category_listing/category_listing_config.php
===================================================================
--- in-auction/units/category_listing/category_listing_config.php (revision 14516)
+++ in-auction/units/category_listing/category_listing_config.php (working copy)
@@ -126,13 +126,13 @@
),
// 'SubItems' => Array('confs-cf'),
- 'Fields' => Array (
+ 'Fields' => Array (
'CategoryListingId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
'CategoryId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
'SubTitle' => Array('type' => 'string', 'default' => null),
'DetailTemplateId' => Array(
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'formatter' => 'kOptionsFormatter',
'options_sql' => 'SELECT %1$s
FROM ' . TABLE_PREFIX . 'eBayListingDetailTemplates
ORDER BY TemplateName',
@@ -185,8 +185,8 @@
ORDER BY CategoryName',
'option_key_field' => 'CategoryId',
'option_title_field' => 'CategoryName',
- 'default' => null,
- ),
+ 'default' => null,
+ ),
'StoreSecondaryCategoryId' => Array(
'type' => 'int',
'formatter' => 'kOptionsFormatter',
@@ -202,7 +202,7 @@
'option_key_field' => 'CategoryId',
'option_title_field' => 'CategoryName',
'default' => null,
- ),
+ ),
'StoreListingDuration' => Array(
'type' => 'int',
'formatter' => 'kOptionsFormatter',
@@ -235,7 +235,7 @@
'unique' => '!lu_email_already_exist!'
),
'default' => null,
- ),
+ ),
'HasReturnPolicy' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter',
@@ -262,12 +262,12 @@
'option_key_field' => 'FieldOptionKey',
'option_title_field' => 'FieldOptionTitle',
'default' => null,
- ),
+ ),
'ReturnPolicyDetails' => Array(
'type' => 'string',
'formatter' => 'kFormatter', 'using_fck' => 1,
'default' => null,
- ),
+ ),
'AutoRelist' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter',
@@ -278,7 +278,7 @@
'type' => 'string',
'formatter' => 'kFormatter', 'using_fck' => 1,
'default' => null,
- ),
+ ),
'InsuranceType' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter',
@@ -286,7 +286,7 @@
'default' => null,
),
'InsuranceAmount' => Array(
- 'type' => 'float',
+ 'type' => 'float',
'formatter' => 'kFormatter',
'format' => '%0.2f',
'min_value_inc' => 0,
@@ -330,38 +330,4 @@
),
),
-/*
- 'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array('default' => 'icon16_item.png'),
- 'Fields' => Array(
- 'CustomFieldId' => Array( 'title' => 'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td' ),
- 'FieldName' => Array( 'title' => 'la_prompt_FieldName'),
- 'FieldLabel' => Array( 'title' => 'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
- 'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder'),
- ),
- ),
-
- 'SeparateTab' => Array(
- 'Icons' => Array('default' => 'icon16_item.png'),
- 'Fields' => Array(
- 'FieldName' => Array( 'title' => 'la_col_FieldName', 'data_block' => 'grid_icon_td'),
- 'Prompt' => Array( 'title' => 'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
- 'Value' => Array( 'title' => 'la_col_Value', 'data_block' => 'edit_custom_td'),
- 'Error' => Array( 'title' => 'la_col_Error', 'data_block' => 'custom_error_td'),
- ),
- ),
-
- 'SeparateTabOriginal' => Array(
- 'Icons' => Array('default' => 'icon16_item.png'),
- 'Fields' => Array(
- 'FieldName' => Array( 'title' => 'la_col_FieldName', 'data_block' => 'grid_icon_td'),
- 'Prompt' => Array( 'title' => 'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
- 'Value' => Array( 'title' => 'la_col_Value', 'data_block' => 'edit_custom_td'),
- 'OriginalValue' => Array( 'title' => 'la_col_OriginalValue', 'data_block' => 'grid_original_td'),
- ),
- ),
-
- ),
-*/
);
\ No newline at end of file
Index: in-auction/units/detail_template/detail_template_config.php
===================================================================
--- in-auction/units/detail_template/detail_template_config.php (revision 14516)
+++ in-auction/units/detail_template/detail_template_config.php (working copy)
@@ -102,7 +102,7 @@
'module' => 'core',
),
'Fields' => Array(
- 'DetailTemplateId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'DetailTemplateId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'TemplateName' => Array( 'title'=>'la_col_TemplateName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
),
),
Index: in-auction/units/error_log/error_log_config.php
===================================================================
--- in-auction/units/error_log/error_log_config.php (revision 14516)
+++ in-auction/units/error_log/error_log_config.php (working copy)
@@ -106,14 +106,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'LogId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 80,),
- 'ListingId' => Array ('title' => 'la_col_ListingId', 'data_block' => 'grid_listing_link', 'filter_block' => 'grid_range_filter', 'width' => 100,),
- 'RequestType' => Array ( 'title' => 'la_col_RequestType', 'filter_block' => 'grid_like_filter', 'width' => 168,),
- 'AnswerStatus' => Array ('title' => 'la_col_AnswerStatus', 'filter_block' => 'grid_like_filter', 'width' => 200,),
- 'RequestTime' => Array ( 'title' => 'la_col_RequestTime', 'filter_block' => 'grid_date_range_filter', 'width' => 146,),
- 'DurationSeconds' => Array ('title' => 'la_col_DurationSeconds', 'filter_block' => 'grid_range_filter', 'width' => 135, ),
-
-
+ 'LogId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 80,),
+ 'ListingId' => Array ('data_block' => 'grid_listing_link', 'filter_block' => 'grid_range_filter', 'width' => 100,),
+ 'RequestType' => Array ('filter_block' => 'grid_like_filter', 'width' => 168,),
+ 'AnswerStatus' => Array ('filter_block' => 'grid_like_filter', 'width' => 200,),
+ 'RequestTime' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 146,),
+ 'DurationSeconds' => Array ('filter_block' => 'grid_range_filter', 'width' => 135, ),
),
),
Index: in-auction/units/listing/listing_config.php
===================================================================
--- in-auction/units/listing/listing_config.php (revision 14516)
+++ in-auction/units/listing/listing_config.php (working copy)
@@ -288,22 +288,22 @@
'module' => 'core',
),
'Fields' => Array(
- 'ListingId' => Array ('title'=>'la_prompt_ListingId', 'data_block' => 'grid_checkbox_td'),
- 'ProductId' => Array ('title'=>'la_col_ProductId'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'Status' => Array('title'=>'la_col_Status', 'data_block' => 'grid_status_log_link'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'QuantitySold' => Array ('title'=>'la_col_Sold'),
- 'QuantityPaid' => Array ('title'=>'la_col_Paid'),
- 'BidCounter' => Array ('title'=>'la_col_BidCounter'),
- 'CurrentPrice' => Array ('title'=>'la_col_CurrentPrice'),
- 'UseGallery' => Array ('title'=>'la_col_UseGallery'),
- 'UseGalleryPlus' => Array ('title'=>'la_col_UseGalleryPlus'),
- 'CreatedOn' => Array ('title'=>'la_col_CreatedOn'),
- 'PayPalSellerEmail' => Array ('title'=>'la_col_PayPalSellerEmail'),
- 'AutoRelist' => Array ('title'=>'la_col_AutoRelist'),
- 'OriginalListingId' => Array ('title'=>'la_col_OriginalListingId'),
- 'Modified' => Array ('title'=>'la_col_Modified'),
+ 'ListingId' => Array ('title'=>'la_prompt_ListingId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'ProductId' => Array ('title'=>'la_col_ProductId', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('title'=>'la_col_ListingType', 'filter_block' => 'grid_like_filter'),
+ 'Status' => Array('data_block' => 'grid_status_log_link', 'filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'QuantitySold' => Array ('title'=>'la_col_Sold', 'filter_block' => 'grid_like_filter'),
+ 'QuantityPaid' => Array ('title'=>'la_col_Paid', 'filter_block' => 'grid_like_filter'),
+ 'BidCounter' => Array ('title'=>'la_col_BidCounter', 'filter_block' => 'grid_like_filter'),
+ 'CurrentPrice' => Array ('title'=>'la_col_CurrentPrice', 'filter_block' => 'grid_like_filter'),
+ 'UseGallery' => Array ('title'=>'la_col_UseGallery', 'filter_block' => 'grid_like_filter'),
+ 'UseGalleryPlus' => Array ('title'=>'la_col_UseGalleryPlus', 'filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('filter_block' => 'grid_like_filter'),
+ 'PayPalSellerEmail' => Array ('title'=>'la_col_PayPalSellerEmail', 'filter_block' => 'grid_like_filter'),
+ 'AutoRelist' => Array ('title'=>'la_col_AutoRelist', 'filter_block' => 'grid_like_filter'),
+ 'OriginalListingId' => Array ('title'=>'la_col_OriginalListingId', 'filter_block' => 'grid_like_filter'),
+ 'Modified' => Array ('title'=>'la_col_Modified', 'filter_block' => 'grid_like_filter', 'filter_block' => 'grid_like_filter'),
),
),
@@ -313,12 +313,12 @@
'module' => 'core',
),
'Fields' => Array(
- 'ListingTitle' => Array ('title'=>'la_col_Title', 'data_block' => 'grid_listing_td'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'data_block' => 'grid_product_td'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'CreatedOn' => Array ('title'=>'la_col_CreatedOn'),
- 'ListingDuration' => Array ('title'=>'la_col_ListingDuration'),
+ 'ListingTitle' => Array ('title'=>'column:la_fld_Title', 'data_block' => 'grid_listing_td', 'filter_block' => 'grid_like_filter'),
+ 'SKU' => Array ('data_block' => 'grid_product_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('filter_block' => 'grid_like_filter'),
+ 'ListingDuration' => Array ('title'=>'la_col_ListingDuration', 'filter_block' => 'grid_like_filter'),
),
),
@@ -328,15 +328,15 @@
'module' => 'core',
),
'Fields' => Array(
- 'ListingTitle' => Array ('title'=>'la_col_Title', 'data_block' => 'grid_listing_td'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'data_block' => 'grid_product_td'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'Hits' => Array ('title' => 'la_col_Hits'),
- 'BidCounter' => Array ('title' => 'la_col_Bids'),
- 'CurrentPrice' => Array ('title' => 'la_col_CurrentBid'),
- 'CreatedOn' => Array ('title'=>'la_col_ClosingTime', 'data_block' => 'grid_closing_td'),
- 'ListingFee' => Array ('title'=>'la_col_Cost'),
+ 'ListingTitle' => Array ('title'=>'column:la_fld_Title', 'data_block' => 'grid_listing_td', 'filter_block' => 'grid_like_filter'),
+ 'SKU' => Array ('data_block' => 'grid_product_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'Hits' => Array ('filter_block' => 'grid_like_filter'),
+ 'BidCounter' => Array ('title' => 'la_col_Bids', 'filter_block' => 'grid_like_filter'),
+ 'CurrentPrice' => Array ('title' => 'la_col_CurrentBid', 'filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('title'=>'la_col_ClosingTime', 'data_block' => 'grid_closing_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingFee' => Array ('title'=>'column:la_fld_Cost', 'filter_block' => 'grid_like_filter'),
),
),
@@ -347,30 +347,30 @@
'module' => 'core',
),
'Fields' => Array(
- 'ListingTitle' => Array ('title'=>'la_col_Title', 'data_block' => 'grid_listing_td'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'data_block' => 'grid_product_td'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'Status' => Array('title'=>'la_col_Status', 'data_block' => 'grid_status_log_link'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'Hits' => Array ('title' => 'la_col_Hits'),
- 'BidCounter' => Array ('title' => 'la_col_Bids'),
- 'CurrentPrice' => Array ('title' => 'la_col_WinningBid'),
- 'WinnerEmail' => Array('title'=>'la_col_Winner', 'data_block' => 'grid_winner_link'),
- 'ClosedOn' => Array ('title' => 'la_col_ClosedOn'),
+ 'ListingTitle' => Array ('title'=>'column:la_fld_Title', 'data_block' => 'grid_listing_td', 'filter_block' => 'grid_like_filter'),
+ 'SKU' => Array ('data_block' => 'grid_product_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('filter_block' => 'grid_like_filter'),
+ 'Status' => Array('data_block' => 'grid_status_log_link', 'filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'Hits' => Array ('filter_block' => 'grid_like_filter'),
+ 'BidCounter' => Array ('title' => 'la_col_Bids', 'filter_block' => 'grid_like_filter'),
+ 'CurrentPrice' => Array ('title' => 'la_col_WinningBid', 'filter_block' => 'grid_like_filter'),
+ 'WinnerEmail' => Array('title'=>'la_col_Winner', 'data_block' => 'grid_winner_link', 'filter_block' => 'grid_like_filter'),
+ 'ClosedOn' => Array ('title' => 'la_col_ClosedOn', 'filter_block' => 'grid_like_filter'),
),
),
'Unsold' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array(
- 'ListingTitle' => Array ('title'=>'la_col_Title', 'data_block' => 'grid_listing_td'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'data_block' => 'grid_product_td'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'Hits' => Array ('title' => 'la_col_Hits'),
- 'BidCounter' => Array ('title' => 'la_col_Bids'),
- 'AuctionReservePrice' => Array ('title' => 'la_col_ReservePrice'),
- 'ClosedOn' => Array ('title' => 'la_col_ClosedOn'),
+ 'ListingTitle' => Array ('title'=>'column:la_fld_Title', 'data_block' => 'grid_listing_td', 'filter_block' => 'grid_like_filter'),
+ 'SKU' => Array ('data_block' => 'grid_product_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'Hits' => Array ('filter_block' => 'grid_like_filter'),
+ 'BidCounter' => Array ('title' => 'la_col_Bids', 'filter_block' => 'grid_like_filter'),
+ 'AuctionReservePrice' => Array ('title' => 'la_col_ReservePrice', 'filter_block' => 'grid_like_filter'),
+ 'ClosedOn' => Array ('title' => 'la_col_ClosedOn', 'filter_block' => 'grid_like_filter'),
),
),
@@ -380,13 +380,13 @@
'module' => 'core',
),
'Fields' => Array(
- 'ListingTitle' => Array ('title'=>'la_col_Title', 'data_block' => 'grid_listing_td'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'data_block' => 'grid_product_td'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'CreatedOn' => Array ('title'=>'la_col_CreatedOn'),
- 'ListingDuration' => Array ('title'=>'la_col_ListingDuration'),
- 'Status' => Array('title'=>'la_col_Status', 'data_block' => 'grid_status_log_link'),
+ 'ListingTitle' => Array ('title'=>'column:la_fld_Title', 'data_block' => 'grid_listing_td', 'filter_block' => 'grid_like_filter'),
+ 'SKU' => Array ('data_block' => 'grid_product_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'CreatedOn' => Array ('filter_block' => 'grid_like_filter'),
+ 'ListingDuration' => Array ('title'=>'la_col_ListingDuration', 'filter_block' => 'grid_like_filter'),
+ 'Status' => Array('data_block' => 'grid_status_log_link', 'filter_block' => 'grid_like_filter'),
),
),
@@ -397,15 +397,15 @@
'module' => 'core',
),
'Fields' => Array(
- 'ListingTitle' => Array ('title'=>'la_col_Title', 'data_block' => 'grid_listing_td'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'data_block' => 'grid_product_td'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'Status' => Array('title'=>'la_col_Status', 'data_block' => 'grid_status_log_link'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'QuantityPaid' => Array ('title'=>'la_col_Paid'),
- 'BidCounter' => Array ('title' => 'la_col_Bids'),
- 'CurrentPrice' => Array ('title' => 'la_col_WinningBid'),
- 'WinnerEmail' => Array('title'=>'la_col_Winner', 'data_block' => 'grid_winner_link'),
+ 'ListingTitle' => Array ('title'=>'column:la_fld_Title', 'data_block' => 'grid_listing_td', 'filter_block' => 'grid_like_filter'),
+ 'SKU' => Array ('data_block' => 'grid_product_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('filter_block' => 'grid_like_filter'),
+ 'Status' => Array('data_block' => 'grid_status_log_link', 'filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'QuantityPaid' => Array ('title'=>'la_col_Paid', 'filter_block' => 'grid_like_filter'),
+ 'BidCounter' => Array ('title' => 'la_col_Bids', 'filter_block' => 'grid_like_filter'),
+ 'CurrentPrice' => Array ('title' => 'la_col_WinningBid', 'filter_block' => 'grid_like_filter'),
+ 'WinnerEmail' => Array('title'=>'la_col_Winner', 'data_block' => 'grid_winner_link', 'filter_block' => 'grid_like_filter'),
),
),
@@ -415,15 +415,15 @@
'module' => 'core',
),
'Fields' => Array(
- 'ListingTitle' => Array ('title'=>'la_col_Title', 'data_block' => 'grid_listing_td'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'data_block' => 'grid_product_td'),
- 'ListingType' => Array ('title'=>'la_col_ListingType'),
- 'Status' => Array('title'=>'la_col_Status', 'data_block' => 'grid_status_log_link'),
- 'ListingQuantity' => Array ('title'=>'la_col_Quantity'),
- 'QuantityPaid' => Array ('title'=>'la_col_Paid'),
- 'CurrentPrice' => Array ('title' => 'la_col_WinningBid'),
- 'WinnerEmail' => Array('title'=>'la_col_Winner', 'data_block' => 'grid_winner_link'),
- 'ClosedOn' => Array ('title' => 'la_col_ClosedOn'),
+ 'ListingTitle' => Array ('title'=>'column:la_fld_Title', 'data_block' => 'grid_listing_td', 'filter_block' => 'grid_like_filter'),
+ 'SKU' => Array ('data_block' => 'grid_product_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingType' => Array ('filter_block' => 'grid_like_filter'),
+ 'Status' => Array('data_block' => 'grid_status_log_link', 'filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array ('title'=>'la_col_Quantity', 'filter_block' => 'grid_like_filter'),
+ 'QuantityPaid' => Array ('title'=>'la_col_Paid', 'filter_block' => 'grid_like_filter'),
+ 'CurrentPrice' => Array ('title' => 'la_col_WinningBid', 'filter_block' => 'grid_like_filter'),
+ 'WinnerEmail' => Array('title'=>'la_col_Winner', 'data_block' => 'grid_winner_link', 'filter_block' => 'grid_like_filter'),
+ 'ClosedOn' => Array ('title' => 'la_col_ClosedOn', 'filter_block' => 'grid_like_filter'),
),
),
@@ -434,12 +434,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'ProductId' => Array('title'=>'la_col_ProductId', 'data_block' => 'grid_checkbox_td' ),
- 'SKU' => Array( 'title'=>'la_col_SKU'),
- 'ListingTitle' => Array( 'title'=>'la_col_Title'),
- 'StoreBuyItNowPrice' => Array('title'=>'la_col_Price', 'data_block' => 'grid_edit_td', 'size' => 2),
- 'StoreListingDuration' => Array('title'=>'la_col_Duration', 'data_block' => 'grid_listing_options_td'),
- 'ListingQuantity' => Array('title'=>'la_col_Quantity', 'data_block' => 'grid_edit_td', 'size' => 2),
+ 'ProductId' => Array('title'=>'la_col_ProductId', 'data_block' => 'grid_checkbox_td' , 'filter_block' => 'grid_range_filter'),
+ 'SKU' => Array('filter_block' => 'grid_like_filter'),
+ 'ListingTitle' => Array( 'title'=>'column:la_fld_Title', 'filter_block' => 'grid_like_filter'),
+ 'StoreBuyItNowPrice' => Array('title'=>'column:la_fld_Price', 'data_block' => 'grid_edit_td', 'size' => 2, 'filter_block' => 'grid_like_filter'),
+ 'StoreListingDuration' => Array('title'=>'column:la_fld_Duration', 'data_block' => 'grid_listing_options_td', 'filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array('title'=>'la_col_Quantity', 'data_block' => 'grid_edit_td', 'size' => 2, 'filter_block' => 'grid_like_filter'),
),
),
@@ -447,23 +447,23 @@
'eBayAuction' => Array (
'Icons' => Array ('default' => 'icon16_item.png'),
'Fields' => Array (
- 'ProductId' => Array('title'=>'la_col_ProductId', 'data_block' => 'grid_checkbox_td'),
- 'SKU' => Array('title'=>'la_col_SKU'),
- 'ListingTitle' => Array( 'title'=>'la_col_Title'),
- 'AuctionListingDuration' => Array('title'=>'la_col_Duration', 'data_block' => 'grid_listing_options_td'),
- 'AuctionStartPrice' => Array('title'=>'la_col_Start', 'data_block' => 'grid_edit_td', 'size' => 2),
- 'AuctionReservePrice' => Array('title'=>'la_col_Reserve', 'data_block' => 'grid_edit_td', 'size' => 2),
- 'AuctionBuyItNowPrice' => Array('title'=>'la_col_BuyItNow', 'data_block' => 'grid_edit_td', 'size' => 2),
- 'ListingQuantity' => Array('title'=>'la_col_Quantity', 'data_block' => 'grid_edit_td', 'size' => 2),
- 'AutoRelist' => Array('title'=>'la_col_Relist', 'data_block' => 'grid_edit_checkbox_td'),
- 'Fixed' => Array('title'=>'la_col_Fixed', 'data_block' => 'grid_edit_checkbox_td'),
- 'UseGallery' => Array('title'=>'la_col_G', 'data_block' => 'grid_edit_checkbox_td'),
- 'UseGalleryPlus' => Array('title'=>'la_col_GP', 'data_block' => 'grid_edit_checkbox_td'),
- 'EnhancementBoldTitle' => Array('title'=>'la_col_B', 'data_block' => 'grid_edit_checkbox_td'),
- 'EnhancementBorder' => Array('title'=>'la_col_F', 'data_block' => 'grid_edit_checkbox_td'),
- 'EnhancementHighlight' => Array('title'=>'la_col_H', 'data_block' => 'grid_edit_checkbox_td'),
- 'EnhancementFeatured' => Array('title'=>'la_col_FP', 'data_block' => 'grid_edit_checkbox_td'),
- 'EnhancementHomePageFeatured' => Array('title'=>'la_col_FH', 'data_block' => 'grid_edit_checkbox_td'),
+ 'ProductId' => Array('title'=>'la_col_ProductId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'SKU' => Array('filter_block' => 'grid_like_filter'),
+ 'ListingTitle' => Array( 'title'=>'column:la_fld_Title', 'filter_block' => 'grid_like_filter'),
+ 'AuctionListingDuration' => Array('title'=>'column:la_fld_Duration', 'data_block' => 'grid_listing_options_td', 'filter_block' => 'grid_like_filter'),
+ 'AuctionStartPrice' => Array('title'=>'column:la_fld_Start', 'data_block' => 'grid_edit_td', 'size' => 2, 'filter_block' => 'grid_like_filter'),
+ 'AuctionReservePrice' => Array('title'=>'la_col_Reserve', 'data_block' => 'grid_edit_td', 'size' => 2, 'filter_block' => 'grid_like_filter'),
+ 'AuctionBuyItNowPrice' => Array('title'=>'la_col_BuyItNow', 'data_block' => 'grid_edit_td', 'size' => 2, 'filter_block' => 'grid_like_filter'),
+ 'ListingQuantity' => Array('title'=>'la_col_Quantity', 'data_block' => 'grid_edit_td', 'size' => 2, 'filter_block' => 'grid_like_filter'),
+ 'AutoRelist' => Array('title'=>'la_col_Relist', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'Fixed' => Array('title'=>'column:la_fld_Fixed', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'UseGallery' => Array('title'=>'la_col_G', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'UseGalleryPlus' => Array('title'=>'la_col_GP', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'EnhancementBoldTitle' => Array('title'=>'la_col_B', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'EnhancementBorder' => Array('title'=>'la_col_F', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'EnhancementHighlight' => Array('title'=>'la_col_H', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'EnhancementFeatured' => Array('title'=>'la_col_FP', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
+ 'EnhancementHomePageFeatured' => Array('title'=>'la_col_FH', 'data_block' => 'grid_edit_checkbox_td', 'filter_block' => 'grid_like_filter'),
),
),
),
Index: in-auction/units/product_listing/product_listing_config.php
===================================================================
--- in-auction/units/product_listing/product_listing_config.php (revision 14516)
+++ in-auction/units/product_listing/product_listing_config.php (working copy)
@@ -232,7 +232,7 @@
'unique' => '!lu_email_already_exist!'
),
'default' => null,
- ),
+ ),
'HasReturnPolicy' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter',
@@ -275,7 +275,7 @@
'type' => 'string',
'formatter' => 'kFormatter', 'using_fck' => 1,
'default' => null,
- ),
+ ),
'Images' => Array ('type' => 'string', 'default' => null),
'ListingTitle' => Array ('type' => 'string', 'default' => null),
'ListingDescription' => Array (
@@ -284,22 +284,22 @@
'default' => null,
),
'AuctionStartPrice' => Array (
- 'type' => 'float',
+ 'type' => 'float',
'formatter' => 'kFormatter', 'format' => '%0.2f',
'min_value_inc' => 0, 'default' => null,
),
'AuctionBuyItNowPrice' => Array (
- 'type' => 'float',
+ 'type' => 'float',
'formatter' => 'kFormatter', 'format' => '%0.2f',
'min_value_inc' => 0, 'default' => null,
),
'AuctionReservePrice' => Array (
- 'type' => 'float',
+ 'type' => 'float',
'formatter' => 'kFormatter', 'format' => '%0.2f',
'min_value_inc' => 0, 'default' => null,
),
'StoreBuyItNowPrice' => Array (
- 'type' => 'float',
+ 'type' => 'float',
'formatter' => 'kFormatter', 'format' => '%0.2f',
'min_value_inc' => 0, 'default' => null,
),
@@ -310,7 +310,7 @@
'default' => null,
),
'InsuranceAmount' => Array (
- 'type' => 'float',
+ 'type' => 'float',
'formatter' => 'kFormatter', 'format' => '%0.2f',
'min_value_inc' => 0, 'default' => null,
),
@@ -344,40 +344,6 @@
'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
'not_null' => 0, 'default' => 0,
),
-
- ),
- /*
- 'Grids' => Array (
- 'Default' => Array (
- 'Icons' => Array ('default' => 'icon16_item.png'),
- 'Fields' => Array (
- 'CustomFieldId' => Array ( 'title' => 'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td' ),
- 'FieldName' => Array ( 'title' => 'la_prompt_FieldName'),
- 'FieldLabel' => Array ( 'title' => 'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
- 'DisplayOrder' => Array ('title' => 'la_prompt_DisplayOrder'),
- ),
- ),
- 'SeparateTab' => Array (
- 'Icons' => Array ('default' => 'icon16_item.png'),
- 'Fields' => Array (
- 'FieldName' => Array ( 'title' => 'la_col_FieldName', 'data_block' => 'grid_icon_td'),
- 'Prompt' => Array ( 'title' => 'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
- 'Value' => Array ( 'title' => 'la_col_Value', 'data_block' => 'edit_custom_td'),
- 'Error' => Array ( 'title' => 'la_col_Error', 'data_block' => 'custom_error_td'),
- ),
- ),
-
- 'SeparateTabOriginal' => Array (
- 'Icons' => Array ('default' => 'icon16_item.png'),
- 'Fields' => Array (
- 'FieldName' => Array ( 'title' => 'la_col_FieldName', 'data_block' => 'grid_icon_td'),
- 'Prompt' => Array ( 'title' => 'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
- 'Value' => Array ( 'title' => 'la_col_Value', 'data_block' => 'edit_custom_td'),
- 'OriginalValue' => Array ( 'title' => 'la_col_OriginalValue', 'data_block' => 'grid_original_td'),
- ),
- ),
-
),
- */
);
Index: in-auction/units/schedule/schedule_config.php
===================================================================
--- in-auction/units/schedule/schedule_config.php (revision 14516)
+++ in-auction/units/schedule/schedule_config.php (working copy)
@@ -131,16 +131,16 @@
'module' => 'core',
),
'Fields' => Array(
- 'ScheduleId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 45,),
+ 'ScheduleId' => Array('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 45,),
'ScheduleName' => Array( 'title'=>'la_col_ScheduleName', 'filter_block' => 'grid_like_filter', 'width' => 120,),
- 'ListingType' => Array( 'title'=>'la_col_ListingType', 'filter_block' => 'grid_options_filter', 'width' => 100,),
- 'StartDate' => Array( 'title'=>'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 110,),
- 'StartTime' => Array( 'title'=>'la_col_StartTime', 'filter_block' => 'grid_like_filter', 'width' => 90,),
- 'EndTime' => Array( 'title'=>'la_col_EndTime', 'filter_block' => 'grid_like_filter', 'width' => 90,),
- 'ListingQuantity' => Array( 'title'=>'la_col_ListingQuantity', 'filter_block' => 'grid_float_range_filter', 'width' => 95,),
- 'ContinueUntilQty' => Array( 'title'=>'la_col_ContinueUntilQuantity', 'filter_block' => 'grid_float_range_filter', 'width' => 87,),
- 'LastProcessed' => Array( 'title'=>'la_col_LastProcessed', 'filter_block' => 'grid_date_range_filter', 'width' => 143,),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100,),
+ 'ListingType' => Array('filter_block' => 'grid_options_filter', 'width' => 100,),
+ 'StartDate' => Array('filter_block' => 'grid_date_range_filter', 'width' => 110,),
+ 'StartTime' => Array('filter_block' => 'grid_like_filter', 'width' => 90,),
+ 'EndTime' => Array('filter_block' => 'grid_like_filter', 'width' => 90,),
+ 'ListingQuantity' => Array('filter_block' => 'grid_float_range_filter', 'width' => 95,),
+ 'ContinueUntilQty' => Array('title' => 'column:la_fld_ContinueUntilQuantity', 'filter_block' => 'grid_float_range_filter', 'width' => 87,),
+ 'LastProcessed' => Array('filter_block' => 'grid_date_range_filter', 'width' => 143,),
+ 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100,),
),
),
Index: in-auction/units/shipping/shipping_config.php
===================================================================
--- in-auction/units/shipping/shipping_config.php (revision 14516)
+++ in-auction/units/shipping/shipping_config.php (working copy)
@@ -203,39 +203,4 @@
'AddCost' => Array('type'=>'float', 'min_value_inc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => null),
),
-/*
- 'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array('default'=>'icon16_item.png'),
- 'Fields' => Array(
- 'CustomFieldId' => Array( 'title'=>'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td' ),
- 'FieldName' => Array( 'title'=>'la_prompt_FieldName'),
- 'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
- 'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder'),
- ),
- ),
-
- 'SeparateTab' => Array(
- 'Icons' => Array('default'=>'icon16_item.png'),
- 'Fields' => Array(
- 'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
- 'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
- 'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td'),
- 'Error' => Array( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td'),
- ),
- ),
-
- 'SeparateTabOriginal' => Array(
- 'Icons' => Array('default'=>'icon16_item.png'),
- 'Fields' => Array(
- 'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
- 'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
- 'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td'),
- 'OriginalValue' => Array( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td'),
- ),
- ),
-
- ),
-*/
-
);
\ No newline at end of file
Index: in-bulletin/install/english.lang
===================================================================
--- in-bulletin/install/english.lang (revision 14516)
+++ in-bulletin/install/english.lang (working copy)
@@ -1,37 +1,30 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
- <PHRASE Label="la_col_BadWord" Module="In-Bulletin" Type="1">Q2Vuc29yZWQgV29yZA==</PHRASE>
<PHRASE Label="la_col_CommentedByUser" Module="In-Bulletin" Type="1">VXNlcg==</PHRASE>
- <PHRASE Label="la_col_KeyStroke" Module="In-Bulletin" Type="1">S2V5IFN0cm9rZQ==</PHRASE>
<PHRASE Label="la_col_LastPostOn" Module="In-Bulletin" Type="1">TGFzdCBQb3N0IE9u</PHRASE>
<PHRASE Label="la_col_ModifiedDate" Module="In-Bulletin" Type="1">RGF0ZS9UaW1l</PHRASE>
<PHRASE Label="la_col_NumberOfDaysActive" Module="In-Bulletin" Type="1">RGF5cyBBY3RpdmU=</PHRASE>
- <PHRASE Label="la_col_PollComment" Module="In-Bulletin" Type="1">Q29tbWVudA==</PHRASE>
- <PHRASE Label="la_col_PostedBy" Module="In-Bulletin" Type="1">UG9zdGVy</PHRASE>
<PHRASE Label="la_col_Posts" Module="In-Bulletin" Type="1">UmVwbGllcw==</PHRASE>
- <PHRASE Label="la_col_Replacement" Module="In-Bulletin" Type="1">UmVwbGFjZW1lbnQ=</PHRASE>
<PHRASE Label="la_col_TopicText" Module="In-Bulletin" Type="1">VG9waWM=</PHRASE>
- <PHRASE Label="la_col_Views" Module="In-Bulletin" Type="1">Vmlld3M=</PHRASE>
<PHRASE Label="la_col_VoteCount" Module="In-Bulletin" Type="1">Vm90ZXM=</PHRASE>
<PHRASE Label="la_fld_AllowComments" Module="In-Bulletin" Type="1">QWxsb3cgQ29tbWVudHM=</PHRASE>
<PHRASE Label="la_fld_AllowMultipleVotings" Module="In-Bulletin" Type="1">QWxsb3cgTXVsdGlwbGUgVm90aW5ncw==</PHRASE>
- <PHRASE Label="la_fld_BadWord" Module="In-Bulletin" Type="1">Q2Vuc29yZWQgV29yZA==</PHRASE>
+ <PHRASE Label="la_fld_BadWord" Module="In-Bulletin" Type="1" Column="Q2Vuc29yZWQgV29yZA==">Q2Vuc29yZWQgV29yZA==</PHRASE>
<PHRASE Label="la_fld_cust_bb_ItemTemplate" Module="In-Bulletin" Type="1">VG9waWNzIEl0ZW0gVGVtcGxhdGU=</PHRASE>
- <PHRASE Label="la_fld_EndDate" Module="In-Bulletin" Type="1">RW5kIERhdGU=</PHRASE>
- <PHRASE Label="la_fld_KeyStroke" Module="In-Bulletin" Type="1">S2V5IFN0cm9rZQ==</PHRASE>
+ <PHRASE Label="la_fld_EndDate" Module="In-Bulletin" Type="1" Column="RW5kIERhdGU=">RW5kIERhdGU=</PHRASE>
+ <PHRASE Label="la_fld_KeyStroke" Module="In-Bulletin" Type="1" Column="S2V5IFN0cm9rZQ==">S2V5IFN0cm9rZQ==</PHRASE>
<PHRASE Label="la_fld_PollAnswer" Module="In-Bulletin" Type="1">QW5zd2Vy</PHRASE>
- <PHRASE Label="la_fld_PollComment" Module="In-Bulletin" Type="1">Q29tbWVudA==</PHRASE>
+ <PHRASE Label="la_fld_PollComment" Module="In-Bulletin" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
<PHRASE Label="la_fld_PollGuestEmail" Module="In-Bulletin" Type="1">R3Vlc3QgRW1haWw=</PHRASE>
<PHRASE Label="la_fld_PollGuestName" Module="In-Bulletin" Type="1">R3Vlc3QgTmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_PostedBy" Module="In-Bulletin" Type="1">UG9zdGVkIEJ5</PHRASE>
+ <PHRASE Label="la_fld_PostedBy" Module="In-Bulletin" Type="1" Column="UG9zdGVy">UG9zdGVkIEJ5</PHRASE>
<PHRASE Label="la_fld_Question" Module="In-Bulletin" Type="1">UXVlc3Rpb24=</PHRASE>
- <PHRASE Label="la_fld_RequireLogin" Module="In-Bulletin" Type="1">UmVxdWlyZSBMb2dpbg==</PHRASE>
<PHRASE Label="la_fld_TopicType" Module="In-Bulletin" Type="1">VG9waWMgTG9ja2Vk</PHRASE>
<PHRASE Label="la_fld_Topic_MaxHotNumber" Module="In-Bulletin" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIHRvcGljcw==</PHRASE>
<PHRASE Label="la_fld_Topic_MinPopRating" Module="In-Bulletin" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgdG9waWMgUE9Q</PHRASE>
<PHRASE Label="la_fld_Topic_MinPopVotes" Module="In-Bulletin" Type="1">TWluaW11bSBudW1iZXIgb2YgcG9zdHMgdG8gY29uc2lkZXIgdG9waWMgUE9Q</PHRASE>
- <PHRASE Label="la_fld_Views" Module="In-Bulletin" Type="1">Vmlld3M=</PHRASE>
+ <PHRASE Label="la_fld_Views" Module="In-Bulletin" Type="1" Column="Vmlld3M=">Vmlld3M=</PHRASE>
<PHRASE Label="la_In-bulletin" Module="In-Bulletin" Type="1">SW4tQnVsbGV0aW4=</PHRASE>
<PHRASE Label="la_ItemTab_Topics" Module="In-Bulletin" Type="1">VG9waWNz</PHRASE>
<PHRASE Label="la_opt_LastPoster" Module="In-Bulletin" Type="1">TGFzdCBQb3N0ZXI=</PHRASE>
Index: in-bulletin/install/upgrades.sql
===================================================================
--- in-bulletin/install/upgrades.sql (revision 14516)
+++ in-bulletin/install/upgrades.sql (working copy)
@@ -231,4 +231,9 @@
SET VariableValue = 'in-bulletin/topics/topic_detail'
WHERE VariableName = 'bb_ItemTemplate' AND VariableValue = 'in-bulletin/designs/detail';
+# ===== v 5.1.3-RC2 =====
+UPDATE Phrase
+SET `Module` = 'Core'
+WHERE PhraseKey = 'LA_FLD_REQUIRELOGIN';
+
# ===== v 5.1.3-RC2 =====
\ No newline at end of file
Index: in-bulletin/units/censorship/censorship_config.php
===================================================================
--- in-bulletin/units/censorship/censorship_config.php (revision 14516)
+++ in-bulletin/units/censorship/censorship_config.php (working copy)
@@ -87,9 +87,9 @@
'module' => 'core',
),
'Fields' => Array (
- 'CensorshipId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
- 'BadWord' => Array ('title' => 'la_col_BadWord', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Replacement' => Array ('title' => 'la_col_Replacement', 'filter_block' => 'grid_like_filter', 'width' => 250),
+ 'CensorshipId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+ 'BadWord' => Array ('filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Replacement' => Array ('filter_block' => 'grid_like_filter', 'width' => 250),
),
),
),
Index: in-bulletin/units/emoticons/emoticons_config.php
===================================================================
--- in-bulletin/units/emoticons/emoticons_config.php (revision 14516)
+++ in-bulletin/units/emoticons/emoticons_config.php (working copy)
@@ -98,10 +98,10 @@
'module' => 'core',
),
'Fields' => Array (
- 'EmoticonId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'KeyStroke' => Array ('title' => 'la_col_KeyStroke', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'EmotionImage' => Array ('title' => 'la_col_Image', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'EmoticonId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'KeyStroke' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'EmotionImage' => Array ('title' => 'column:la_fld_Image', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
),
),
),
Index: in-bulletin/units/poll_answers/poll_answers_config.php
===================================================================
--- in-bulletin/units/poll_answers/poll_answers_config.php (revision 14516)
+++ in-bulletin/units/poll_answers/poll_answers_config.php (working copy)
@@ -52,7 +52,7 @@
'ListSortings' => Array (
'' => Array(
'ForcedSorting' => Array('Priority' => 'desc'),
- 'Sorting' => Array('Answer' => 'ASC'),
+ 'Sorting' => Array('Answer' => 'asc'),
)
),
@@ -75,9 +75,9 @@
'module' => 'core',
),
'Fields' => Array (
- 'AnswerId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Answer' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'AnswerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Answer' => Array ('data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
'VotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
),
Index: in-bulletin/units/poll_comments/poll_comments_config.php
===================================================================
--- in-bulletin/units/poll_comments/poll_comments_config.php (revision 14516)
+++ in-bulletin/units/poll_comments/poll_comments_config.php (working copy)
@@ -95,13 +95,13 @@
'module' => 'core',
),
'Fields' => Array (
- 'CommentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'CommentBody' => Array ('title' => 'la_col_PollComment', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'CommentId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'CommentBody' => Array ('title' => 'column:la_fld_PollComment', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
'CommentedByUser' => Array( 'title'=>'la_col_CommentedByUser', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
),
Index: in-bulletin/units/polls/polls_config.php
===================================================================
--- in-bulletin/units/polls/polls_config.php (revision 14516)
+++ in-bulletin/units/polls/polls_config.php (working copy)
@@ -178,12 +178,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'PollId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'StartDate' => Array ('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'EndDate' => Array ('title' => 'la_col_EndDate', 'data_block' => 'poll_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'PollId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('data_block' => 'grid_priority_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'EndDate' => Array ('data_block' => 'poll_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
'CachedVotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
// 'DaysActive' => Array ('title' => 'la_col_NumberOfDaysActive', 'filter_block' => 'grid_range_filter',),
),
),
Index: in-bulletin/units/topics/topics_config.php
===================================================================
--- in-bulletin/units/topics/topics_config.php (revision 14516)
+++ in-bulletin/units/topics/topics_config.php (working copy)
@@ -515,15 +515,15 @@
'NEW' => 'icon16_topic_new.png',
),
'Fields' => Array (
- 'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'TopicId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'UserName' => Array ('title' => 'column:la_fld_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
'LastPostDate' => Array ('title' => 'la_col_LastPostOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
'Posts' => Array ('title' => 'la_col_Posts', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Views' => Array ('title' => 'la_col_Views', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Views' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
),
),
@@ -536,15 +536,15 @@
'NEW' => 'icon16_topic_new.png', ),
'Selector' => 'radio',
'Fields' => Array (
- 'TopicId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'TopicId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'TopicText' => Array ('title' => 'la_col_TopicText', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 300, 'first_chars' => 290, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'UserName' => Array ('title' => 'la_col_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'UserName' => Array ('title' => 'column:la_fld_PostedBy', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
'LastPostDate' => Array ('title' => 'la_col_LastPostOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
'Posts' => Array ('title' => 'la_col_Posts', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Views' => Array ('title' => 'la_col_Views', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Views' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
),
),
),
Index: in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
--- in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (revision 14516)
+++ in-commerce/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (working copy)
@@ -162,8 +162,8 @@
<inp2:apbrackets_SaveWarning name="grid_save_warning"/>
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
<tr nowrap="nowrap" class="grid-header-row-0">
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_FromAmount"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_ToAmount"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_FromAmount"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_ToAmount"/>
<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_Percent"/>
</tr>
<inp2:apbrackets_ShowPricingForm block="prbracket" IdField="AffiliateBracketId"/>
Index: in-commerce/admin_templates/orders/orders_edit_preview.tpl
===================================================================
--- in-commerce/admin_templates/orders/orders_edit_preview.tpl (revision 14516)
+++ in-commerce/admin_templates/orders/orders_edit_preview.tpl (working copy)
@@ -228,7 +228,7 @@
<tr class="subsectiontitle">
<td width="70%"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if> nowrap><inp2:m_Phrase label="la_col_Product"/></td>
<td width="10%" nowrap style="text-align: center"><inp2:m_Phrase label="la_col_Quantity"/></td>
- <td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="la_col_Price"/></td>
+ <td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="column:la_fld_Price"/></td>
<td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="la_col_ExtendedPrice"/></td>
</tr>
Index: in-commerce/admin_templates/products/products_pricing_grid.tpl
===================================================================
--- in-commerce/admin_templates/products/products_pricing_grid.tpl (revision 14516)
+++ in-commerce/admin_templates/products/products_pricing_grid.tpl (working copy)
@@ -89,17 +89,17 @@
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
<tr nowrap="nowrap" class="grid-header-row-0">
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_minqty" width="15%"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_maxqty" width="15%"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_cost" width="10%"/>
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_price" width="10%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MinQty" width="15%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MaxQty" width="15%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Cost" width="10%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Price" width="10%"/>
<!--##
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_points" width="10%"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Points" width="10%"/>
##-->
- <inp2:m_RenderElement name="pr_grid_th" phrase="la_col_negotiated"/>
+ <inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Negotiated"/>
</tr>
<inp2:pr.tang_ShowPricingForm block="prbracket" IdField="PriceId"/>
-
+
<script type="text/javascript">
<inp2:m_if check="m_Get" name="pr_tang">
a_toolbar.EnableButton('delete');
Index: in-commerce/admin_templates/shipping/shipping_brackets.tpl
===================================================================
--- in-commerce/admin_templates/shipping/shipping_brackets.tpl (revision 14516)
+++ in-commerce/admin_templates/shipping/shipping_brackets.tpl (working copy)
@@ -254,8 +254,8 @@
<div id="scroll_container">
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
<tr nowrap="nowrap" class="grid-header-row-0">
- <inp2:m_RenderElement name="br_grid_th" phrase="la_col_Start"/>
- <inp2:m_RenderElement name="br_grid_th" phrase="la_col_End"/>
+ <inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_Start"/>
+ <inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_End"/>
</tr>
<inp2:br_ShowBracketsForm block="bracket" IdField="BracketId"/>
</table>
Index: in-commerce/install/english.lang
===================================================================
--- in-commerce/install/english.lang (revision 14516)
+++ in-commerce/install/english.lang (working copy)
@@ -1,4 +1,4 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_AccountLogin" Module="In-Commerce" Type="1">QWNjb3VudA==</PHRASE>
@@ -82,77 +82,28 @@
<PHRASE Label="la_COD" Module="In-Commerce" Type="1">Q09E</PHRASE>
<PHRASE Label="la_COD_Flat_Surcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
<PHRASE Label="la_COD_Percent_Surcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
- <PHRASE Label="la_col_AccessDuration" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9u</PHRASE>
- <PHRASE Label="la_col_AccessDurationUnit" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
- <PHRASE Label="la_col_AddedOn" Module="In-Commerce" Type="1">QWRkZWQgT24=</PHRASE>
- <PHRASE Label="la_col_AffiliateUser" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFVzZXI=</PHRASE>
- <PHRASE Label="la_col_Amount" Module="In-Commerce" Type="1">QW1vdW50</PHRASE>
- <PHRASE Label="la_col_Availability" Module="In-Commerce" Type="1">QXZhaWwu</PHRASE>
- <PHRASE Label="la_col_BaseFee" Module="In-Commerce" Type="1">QmFzZSBGZWU=</PHRASE>
- <PHRASE Label="la_col_BillingCountry" Module="In-Commerce" Type="1">QmlsbGluZyBDb3VudHJ5</PHRASE>
<PHRASE Label="la_col_BuiltIn" Module="In-Commerce" Type="1">QnVpbHQtSW4=</PHRASE>
- <PHRASE Label="la_col_CODallowed" Module="In-Commerce" Type="1">Q09EIEFsbG93ZWQ=</PHRASE>
- <PHRASE Label="la_col_Code" Module="In-Commerce" Type="1">Q29kZQ==</PHRASE>
- <PHRASE Label="la_col_CODFlatSurcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyZWNoYXJnZQ==</PHRASE>
<PHRASE Label="la_col_CODFlatSurecharge" Module="In-Commerce" Type="1">Q09EIGZsYXQgc3VyZWNoYXJnZQ==</PHRASE>
- <PHRASE Label="la_col_CODPercentSurcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
<PHRASE Label="la_col_Combination" Module="In-Commerce" Type="1">Q29tYmluYXRpb24=</PHRASE>
- <PHRASE Label="la_col_Comment" Module="In-Commerce" Type="1">Q29tbWVudA==</PHRASE>
<PHRASE Label="la_col_Commission" Module="In-Commerce" Type="1">QWZmaWxsaWF0ZSBDb21taXNzaW9u</PHRASE>
- <PHRASE Label="la_col_Cost" Module="In-Commerce" Type="1">Q29zdA==</PHRASE>
- <PHRASE Label="la_col_CouponCode" Module="In-Commerce" Type="1">Q291cG9uIENvZGU=</PHRASE>
<PHRASE Label="la_col_CouponItemType" Module="In-Commerce" Type="1">Q291cG9uIEl0ZW0gVHlwZQ==</PHRASE>
- <PHRASE Label="la_col_CreditCardNumber" Module="In-Commerce" Type="1">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
- <PHRASE Label="la_col_Currency" Module="In-Commerce" Type="1">Q3VycmVuY3k=</PHRASE>
- <PHRASE Label="la_col_CurrencyName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_CurrencySymbol" Module="In-Commerce" Type="1">U3ltYm9s</PHRASE>
- <PHRASE Label="la_col_CurrencySymbolPosition" Module="In-Commerce" Type="1">U3ltYm9sIFBvc2l0aW9u</PHRASE>
<PHRASE Label="la_col_CustomerName" Module="In-Commerce" Type="1">Q3VzdG9tZXIgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_DisplayOnFront" Module="In-Commerce" Type="1">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
<PHRASE Label="la_col_DownloadedFileName" Module="In-Commerce" Type="1">RmlsZW5hbWU=</PHRASE>
<PHRASE Label="la_col_DownloadedProductName" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1l</PHRASE>
- <PHRASE Label="la_col_End" Module="In-Commerce" Type="1">RW5k</PHRASE>
<PHRASE Label="la_col_EndedOn" Module="In-Commerce" Type="1">RW5kZWQgT24=</PHRASE>
- <PHRASE Label="la_col_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
<PHRASE Label="la_col_ExtendedPrice" Module="In-Commerce" Type="1">RXh0LiBQcmljZQ==</PHRASE>
- <PHRASE Label="la_col_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
- <PHRASE Label="la_col_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
<PHRASE Label="la_col_FromUser" Module="In-Commerce" Type="1">RnJvbSBVc2Vy</PHRASE>
<PHRASE Label="la_col_GMV" Module="In-Commerce" Type="1">R01W</PHRASE>
- <PHRASE Label="la_col_Group" Module="In-Commerce" Type="1">R3JvdXA=</PHRASE>
- <PHRASE Label="la_col_IPAddress" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_col_IsFreePromoShipping" Module="In-Commerce" Type="1">UHJvbW8=</PHRASE>
<PHRASE Label="la_col_ItemName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_ItemType" Module="In-Commerce" Type="1">RGlzY291bnQgSXRlbSBUeXBl</PHRASE>
<PHRASE Label="la_col_LastUpdated" Module="In-Commerce" Type="1">TGFzdCBVcGRhdGVk</PHRASE>
- <PHRASE Label="la_col_LastUsedBy" Module="In-Commerce" Type="1">TGFzdCBVc2VkIEJ5</PHRASE>
- <PHRASE Label="la_col_LastUsedOn" Module="In-Commerce" Type="1">TGFzdCBVc2VkIE9u</PHRASE>
- <PHRASE Label="la_col_Listable" Module="In-Commerce" Type="1">TGlzdGFibGU=</PHRASE>
- <PHRASE Label="la_col_ListingQuantity" Module="In-Commerce" Type="1">TGlzdGluZyBRdHk=</PHRASE>
- <PHRASE Label="la_col_Manufacturer" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVy</PHRASE>
<PHRASE Label="la_col_ManufacturerName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_Marketplace" Module="In-Commerce" Type="1">TWFya2V0cGxhY2U=</PHRASE>
- <PHRASE Label="la_col_MaxQty" Module="In-Commerce" Type="1">TWF4IFF0eQ==</PHRASE>
- <PHRASE Label="la_col_MinQty" Module="In-Commerce" Type="1">TWluIFF0eQ==</PHRASE>
- <PHRASE Label="la_col_Negotiated" Module="In-Commerce" Type="1">TmVnb3RpYXRlZA==</PHRASE>
- <PHRASE Label="la_col_NumberOfUses" Module="In-Commerce" Type="1">TnVtYmVyIE9mIFVzZXM=</PHRASE>
- <PHRASE Label="la_col_OnHold" Module="In-Commerce" Type="1">T24gSG9sZA==</PHRASE>
- <PHRASE Label="la_col_OnSale" Module="In-Commerce" Type="1">T24gU2FsZQ==</PHRASE>
- <PHRASE Label="la_col_OptionType" Module="In-Commerce" Type="1">T3B0aW9uIFR5cGU=</PHRASE>
<PHRASE Label="la_col_OrderDate" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
- <PHRASE Label="la_col_OrderIP" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_col_OrderNumber" Module="In-Commerce" Type="1">TnVtYmVy</PHRASE>
<PHRASE Label="la_col_OrderTotal" Module="In-Commerce" Type="1">T3JkZXIgVG90YWw=</PHRASE>
- <PHRASE Label="la_col_PaymentDate" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRl</PHRASE>
- <PHRASE Label="la_col_PaymentReference" Module="In-Commerce" Type="1">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
- <PHRASE Label="la_col_PaymentType" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBl</PHRASE>
<PHRASE Label="la_col_PaymentTypeName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_Percent" Module="In-Commerce" Type="1">UGVyY2VudA==</PHRASE>
- <PHRASE Label="la_col_PercentSurcharge" Module="In-Commerce" Type="1">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
<PHRASE Label="la_col_PlanName" Module="In-Commerce" Type="1">UGxhbiBOYW1l</PHRASE>
- <PHRASE Label="la_col_PlanType" Module="In-Commerce" Type="1">UGxhbiBUeXBl</PHRASE>
- <PHRASE Label="la_col_Points" Module="In-Commerce" Type="1">UG9pbnRz</PHRASE>
- <PHRASE Label="la_col_Price" Module="In-Commerce" Type="1">UHJpY2U=</PHRASE>
<PHRASE Label="la_col_Processing" Module="In-Commerce" Type="1">UHJvY2Vzc2luZw==</PHRASE>
<PHRASE Label="la_col_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
<PHRASE Label="la_col_ProductBackOrderDate" Module="In-Commerce" Type="1">QmFja09yZGVyIERhdGU=</PHRASE>
@@ -160,49 +111,19 @@
<PHRASE Label="la_col_ProductName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
<PHRASE Label="la_col_ProductNameId" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1lIChJRCk=</PHRASE>
<PHRASE Label="la_col_ProductSKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
- <PHRASE Label="la_col_ProductType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_col_ProductWeight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
<PHRASE Label="la_col_Profit" Module="In-Commerce" Type="1">UHJvZml0</PHRASE>
- <PHRASE Label="la_col_Qty" Module="In-Commerce" Type="1">UXR5</PHRASE>
- <PHRASE Label="la_col_QtyBackordered" Module="In-Commerce" Type="1">QmFja29yZGVyZWQ=</PHRASE>
- <PHRASE Label="la_col_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
- <PHRASE Label="la_col_QtyInStockMin" Module="In-Commerce" Type="1">UXR5SW5TdG9ja01pbg==</PHRASE>
- <PHRASE Label="la_col_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
- <PHRASE Label="la_col_QtyReserved" Module="In-Commerce" Type="1">UXR5IFJlc2VydmVk</PHRASE>
<PHRASE Label="la_col_Quantity" Module="In-Commerce" Type="1">UXR5Lg==</PHRASE>
<PHRASE Label="la_col_QuantityAvailable" Module="In-Commerce" Type="1">QXZhaWwu</PHRASE>
<PHRASE Label="la_col_QuantityReserved" Module="In-Commerce" Type="1">UmVzZXJ2ZWQ=</PHRASE>
- <PHRASE Label="la_col_RateToPrimary" Module="In-Commerce" Type="1">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
- <PHRASE Label="la_col_RegisteredOn" Module="In-Commerce" Type="1">UmVnaXN0ZXJlZCBPbg==</PHRASE>
- <PHRASE Label="la_col_RemainingAmount" Module="In-Commerce" Type="1">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
- <PHRASE Label="la_col_Required" Module="In-Commerce" Type="1">UmVxdWlyZWQ=</PHRASE>
<PHRASE Label="la_col_ReturnAmount" Module="In-Commerce" Type="1">UmV0LiBBbW91bnQ=</PHRASE>
<PHRASE Label="la_col_ReturnedOn" Module="In-Commerce" Type="1">UmV0LiBEYXRl</PHRASE>
<PHRASE Label="la_col_ReturnType" Module="In-Commerce" Type="1">UmV0LiBUeXBl</PHRASE>
<PHRASE Label="la_col_Shipping" Module="In-Commerce" Type="1">U2hpcHBpbmc=</PHRASE>
- <PHRASE Label="la_col_ShippingCountry" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
<PHRASE Label="la_col_ShippingFromLocation" Module="In-Commerce" Type="1">RnJvbSBMb2NhdGlvbg==</PHRASE>
- <PHRASE Label="la_col_ShippingName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_ShippingQuoteEngineName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_col_ShippingType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
- <PHRASE Label="la_col_ShipZoneName" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
<PHRASE Label="la_col_Size" Module="In-Commerce" Type="1">U2l6ZQ==</PHRASE>
- <PHRASE Label="la_col_SKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
- <PHRASE Label="la_col_SpeedCode" Module="In-Commerce" Type="1">U2hpcHBpbmcgU3BlZWQ=</PHRASE>
- <PHRASE Label="la_col_Start" Module="In-Commerce" Type="1">U3RhcnQ=</PHRASE>
<PHRASE Label="la_col_StartedOn" Module="In-Commerce" Type="1">U3RhcnRlZCBPbg==</PHRASE>
<PHRASE Label="la_col_Tax" Module="In-Commerce" Type="1">VGF4</PHRASE>
- <PHRASE Label="la_col_TaxApplyToProcessing" Module="In-Commerce" Type="1">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
- <PHRASE Label="la_col_TaxApplyToShipping" Module="In-Commerce" Type="1">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
- <PHRASE Label="la_col_TaxValue" Module="In-Commerce" Type="1">VGF4IFZhbHVl</PHRASE>
- <PHRASE Label="la_col_TaxZoneName" Module="In-Commerce" Type="1">VGF4IFpvbmUgTmFtZQ==</PHRASE>
- <PHRASE Label="la_col_ToAmount" Module="In-Commerce" Type="1">VG8gQW1vdW50</PHRASE>
- <PHRASE Label="la_col_TotalAmount" Module="In-Commerce" Type="1">VG90YWwgQW1vdW50</PHRASE>
- <PHRASE Label="la_col_UnitsLimit" Module="In-Commerce" Type="1">TGltaXQ=</PHRASE>
- <PHRASE Label="la_col_URL" Module="In-Commerce" Type="1">VVJM</PHRASE>
- <PHRASE Label="la_col_Weight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
- <PHRASE Label="la_col_ZoneName" Module="In-Commerce" Type="1">Wm9uZSBOYW1l</PHRASE>
- <PHRASE Label="la_col_ZoneType" Module="In-Commerce" Type="1">Wm9uZSBUeXBl</PHRASE>
<PHRASE Label="la_Combined" Module="In-Commerce" Type="1">Q29tYmluZWQ=</PHRASE>
<PHRASE Label="la_comment_LeaveBlank" Module="In-Commerce" Type="1">KGxlYXZlIGJsYW5rIGZvciB1bmxpbWl0ZWQp</PHRASE>
<PHRASE Label="la_comm_Any" Module="In-Commerce" Type="1">QW55</PHRASE>
@@ -260,14 +181,14 @@
<PHRASE Label="la_FJD" Module="In-Commerce" Type="1">RmlqaSBEb2xsYXI=</PHRASE>
<PHRASE Label="la_FKP" Module="In-Commerce" Type="1">RmFsa2xhbmQgSXNsYW5kcyBQb3VuZA==</PHRASE>
<PHRASE Label="la_Flat" Module="In-Commerce" Type="1">RmxhdA==</PHRASE>
- <PHRASE Label="la_fld_AccessDuration" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9u</PHRASE>
+ <PHRASE Label="la_fld_AccessDuration" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9u">QWNjZXNzIER1cmF0aW9u</PHRASE>
<PHRASE Label="la_fld_AccessDurationType" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFR5cGU=</PHRASE>
- <PHRASE Label="la_fld_AccessDurationUnit" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
+ <PHRASE Label="la_fld_AccessDurationUnit" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9uIFVuaXQ=">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
<PHRASE Label="la_fld_AccessEnd" Module="In-Commerce" Type="1">QWNjZXNzIEVuZA==</PHRASE>
<PHRASE Label="la_fld_AccessGroup" Module="In-Commerce" Type="1">QWNjZXNzIEdyb3Vw</PHRASE>
<PHRASE Label="la_fld_AccessStart" Module="In-Commerce" Type="1">QWNjZXNzIFN0YXJ0</PHRASE>
<PHRASE Label="la_fld_AccumulatedAmount" Module="In-Commerce" Type="1">QWNjdW11bGF0ZWQgQW1vdW50</PHRASE>
- <PHRASE Label="la_fld_AddedOn" Module="In-Commerce" Type="1">QWRkZWQgT24=</PHRASE>
+ <PHRASE Label="la_fld_AddedOn" Module="In-Commerce" Type="1" Column="QWRkZWQgT24=">QWRkZWQgT24=</PHRASE>
<PHRASE Label="la_fld_Address1" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>
<PHRASE Label="la_fld_Address2" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>
<PHRASE Label="la_fld_AdminComment" Module="In-Commerce" Type="1">QWRtaW4gQ29tbWVudA==</PHRASE>
@@ -277,23 +198,23 @@
<PHRASE Label="la_fld_AffiliateLink" Module="In-Commerce" Type="1">QWZmaWxpYXRlIExpbms=</PHRASE>
<PHRASE Label="la_fld_AffiliatePlan" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW4=</PHRASE>
<PHRASE Label="la_fld_AffiliatePlanPayment" Module="In-Commerce" Type="1">UGF5bWVudA==</PHRASE>
- <PHRASE Label="la_fld_AffiliateUser" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFVzZXI=</PHRASE>
+ <PHRASE Label="la_fld_AffiliateUser" Module="In-Commerce" Type="1" Column="QWZmaWxpYXRlIFVzZXI=">QWZmaWxpYXRlIFVzZXI=</PHRASE>
<PHRASE Label="la_fld_AllowedShippingTypes" Module="In-Commerce" Type="1">U2VsZWN0ZWQ=</PHRASE>
- <PHRASE Label="la_fld_Amount" Module="In-Commerce" Type="1">QW1vdW50</PHRASE>
+ <PHRASE Label="la_fld_Amount" Module="In-Commerce" Type="1" Column="QW1vdW50">QW1vdW50</PHRASE>
<PHRASE Label="la_fld_AmountToPay" Module="In-Commerce" Type="1">QW1vdW50IFRvIFBheQ==</PHRASE>
<PHRASE Label="la_fld_AssignedCoupon" Module="In-Commerce" Type="1">QXNzaWduZWQgQ291cG9u</PHRASE>
<PHRASE Label="la_fld_AuthorizationResult" Module="In-Commerce" Type="1">QXV0aG9yaXphdGlvbiBSZXN1bHQ=</PHRASE>
- <PHRASE Label="la_fld_Availability" Module="In-Commerce" Type="1">QXZhaWxhYmxl</PHRASE>
+ <PHRASE Label="la_fld_Availability" Module="In-Commerce" Type="1" Column="QXZhaWwu">QXZhaWxhYmxl</PHRASE>
<PHRASE Label="la_fld_AvailableGroups" Module="In-Commerce" Type="1">QXZhaWxhYmxlIFVzZXIgR3JvdXBz</PHRASE>
<PHRASE Label="la_fld_AvailableShippingTypes" Module="In-Commerce" Type="1">QXZhaWxhYmxl</PHRASE>
<PHRASE Label="la_fld_BackOrder" Module="In-Commerce" Type="1">QmFja09yZGVy</PHRASE>
<PHRASE Label="la_fld_BackOrderDate" Module="In-Commerce" Type="1">QmFja29yZGVyIGF2YWlsYWJpbGl0eSBkYXRl</PHRASE>
- <PHRASE Label="la_fld_BaseFee" Module="In-Commerce" Type="1">QmFzZSBGZWU=</PHRASE>
+ <PHRASE Label="la_fld_BaseFee" Module="In-Commerce" Type="1" Column="QmFzZSBGZWU=">QmFzZSBGZWU=</PHRASE>
<PHRASE Label="la_fld_BillingAddress1" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMQ==</PHRASE>
<PHRASE Label="la_fld_BillingAddress2" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMg==</PHRASE>
<PHRASE Label="la_fld_BillingCity" Module="In-Commerce" Type="1">QmlsbGluZyBDaXR5</PHRASE>
<PHRASE Label="la_fld_BillingCompany" Module="In-Commerce" Type="1">QmlsbGluZyBDb21wYW55</PHRASE>
- <PHRASE Label="la_fld_BillingCountry" Module="In-Commerce" Type="1">QmlsbGluZyBDb3VudHJ5</PHRASE>
+ <PHRASE Label="la_fld_BillingCountry" Module="In-Commerce" Type="1" Column="QmlsbGluZyBDb3VudHJ5">QmlsbGluZyBDb3VudHJ5</PHRASE>
<PHRASE Label="la_fld_BillingEmail" Module="In-Commerce" Type="1">QmlsbGluZyBFbWFpbA==</PHRASE>
<PHRASE Label="la_fld_BillingFax" Module="In-Commerce" Type="1">QmlsbGluZyBGYXg=</PHRASE>
<PHRASE Label="la_fld_BillingPhone" Module="In-Commerce" Type="1">QmlsbGluZyBQaG9uZQ==</PHRASE>
@@ -303,35 +224,35 @@
<PHRASE Label="la_fld_BlockShippingAddress" Module="In-Commerce" Type="1">QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n</PHRASE>
<PHRASE Label="la_fld_CaptureResult" Module="In-Commerce" Type="1">Q2FwdHVyZSBSZXN1bHQ=</PHRASE>
<PHRASE Label="la_fld_ChargeOnNextApprove" Module="In-Commerce" Type="1">Q2hhcmdlIG9uIE5leHQgQXBwcm92ZQ==</PHRASE>
- <PHRASE Label="la_fld_CODallowed" Module="In-Commerce" Type="1">Q09EIEFsbG93ZWQ=</PHRASE>
- <PHRASE Label="la_fld_Code" Module="In-Commerce" Type="1">Q29kZQ==</PHRASE>
- <PHRASE Label="la_fld_CODFlatSurcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
- <PHRASE Label="la_fld_CODPercentSurcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
- <PHRASE Label="la_fld_Comment" Module="In-Commerce" Type="1">Q29tbWVudA==</PHRASE>
- <PHRASE Label="la_fld_Cost" Module="In-Commerce" Type="1">Q29zdA==</PHRASE>
+ <PHRASE Label="la_fld_CODallowed" Module="In-Commerce" Type="1" Column="Q09EIEFsbG93ZWQ=">Q09EIEFsbG93ZWQ=</PHRASE>
+ <PHRASE Label="la_fld_Code" Module="In-Commerce" Type="1" Column="Q29kZQ==">Q29kZQ==</PHRASE>
+ <PHRASE Label="la_fld_CODFlatSurcharge" Module="In-Commerce" Type="1" Column="Q09EIEZsYXQgU3VyZWNoYXJnZQ==">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
+ <PHRASE Label="la_fld_CODPercentSurcharge" Module="In-Commerce" Type="1" Column="Q09EIFBlcmNlbnQgU3VyY2hhcmdl">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
+ <PHRASE Label="la_fld_Comment" Module="In-Commerce" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
+ <PHRASE Label="la_fld_Cost" Module="In-Commerce" Type="1" Column="Q29zdA==">Q29zdA==</PHRASE>
<PHRASE Label="la_fld_CostType" Module="In-Commerce" Type="1">Q29zdCBUeXBl</PHRASE>
- <PHRASE Label="la_fld_CouponCode" Module="In-Commerce" Type="1">Q291cG9uIENvZGU=</PHRASE>
- <PHRASE Label="la_fld_CreditCardNumber" Module="In-Commerce" Type="1">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
+ <PHRASE Label="la_fld_CouponCode" Module="In-Commerce" Type="1" Column="Q291cG9uIENvZGU=">Q291cG9uIENvZGU=</PHRASE>
+ <PHRASE Label="la_fld_CreditCardNumber" Module="In-Commerce" Type="1" Column="Q3JlZGl0IENhcmQgTnVtYmVy">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
<PHRASE Label="la_fld_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE>
- <PHRASE Label="la_fld_Currency" Module="In-Commerce" Type="1">Q3VycmVuY3k=</PHRASE>
- <PHRASE Label="la_fld_CurrencyName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_CurrencySymbol" Module="In-Commerce" Type="1">U3ltYm9s</PHRASE>
- <PHRASE Label="la_fld_CurrencySymbolPosition" Module="In-Commerce" Type="1">U3ltYm9sIFBvc2l0aW9u</PHRASE>
+ <PHRASE Label="la_fld_Currency" Module="In-Commerce" Type="1" Column="Q3VycmVuY3k=">Q3VycmVuY3k=</PHRASE>
+ <PHRASE Label="la_fld_CurrencyName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_CurrencySymbol" Module="In-Commerce" Type="1" Column="U3ltYm9s">U3ltYm9s</PHRASE>
+ <PHRASE Label="la_fld_CurrencySymbolPosition" Module="In-Commerce" Type="1" Column="U3ltYm9sIFBvc2l0aW9u">U3ltYm9sIFBvc2l0aW9u</PHRASE>
<PHRASE Label="la_fld_cust_p_ItemTemplate" Module="In-Commerce" Type="1">UHJvZHVjdCBJdGVtIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_Date" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_DeliveryMethod" Module="In-Commerce" Type="1">RGVsaXZlcnkgTWV0aG9k</PHRASE>
<PHRASE Label="la_fld_DescriptionExcerpt" Module="In-Commerce" Type="1">RXhjZXJwdA==</PHRASE>
<PHRASE Label="la_fld_Discount" Module="In-Commerce" Type="1">RGlzY291bnQ=</PHRASE>
- <PHRASE Label="la_fld_DisplayOnFront" Module="In-Commerce" Type="1">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
+ <PHRASE Label="la_fld_DisplayOnFront" Module="In-Commerce" Type="1" Column="RGlzcGxheSBvbiBGcm9udC1FbmQ=">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
<PHRASE Label="la_fld_EmptyCellsAre" Module="In-Commerce" Type="1">RW1wdHkgQ2VsbHMgQXJl</PHRASE>
- <PHRASE Label="la_fld_End" Module="In-Commerce" Type="1">RW5kIERhdGU=</PHRASE>
- <PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
+ <PHRASE Label="la_fld_End" Module="In-Commerce" Type="1" Column="RW5k">RW5kIERhdGU=</PHRASE>
+ <PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1" Column="RXhwaXJhdGlvbg==">RXhwaXJhdGlvbg==</PHRASE>
<PHRASE Label="la_fld_Featured" Module="In-Commerce" Type="1">RmVhdHVyZWQ=</PHRASE>
<PHRASE Label="la_fld_FirstDayDelivery" Module="In-Commerce" Type="1">Rmlyc3QgRGF5</PHRASE>
- <PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
+ <PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1" Column="RmxhdCBTdXJjaGFyZ2U=">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
<PHRASE Label="la_fld_FreeShippingMinAmount" Module="In-Commerce" Type="1">TWluaW11bSBPcmRlciBUb3RhbCBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
<PHRASE Label="la_fld_From" Module="In-Commerce" Type="1">RnJvbQ==</PHRASE>
- <PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
+ <PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1" Column="RnJvbSBBbW91bnQ=">RnJvbSBBbW91bnQ=</PHRASE>
<PHRASE Label="la_fld_FromDateTime" Module="In-Commerce" Type="1">RnJvbSBkYXRlL3RpbWU=</PHRASE>
<PHRASE Label="la_fld_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
<PHRASE Label="la_fld_GiftCertificateAmountApplied" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZSBhbW91bnQ=</PHRASE>
@@ -343,70 +264,70 @@
<PHRASE Label="la_fld_Insurance_Fee" Module="In-Commerce" Type="1">SW5zdXJhbmNlIENvc3Q=</PHRASE>
<PHRASE Label="la_fld_Insurance_Type" Module="In-Commerce" Type="1">SW5zdXJhbmNlIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_InventoryStatus" Module="In-Commerce" Type="1">RW5hYmxlZA==</PHRASE>
- <PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE>
+ <PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1" Column="UHJvbW8=">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE>
<PHRASE Label="la_fld_IsRecurringBilling" Module="In-Commerce" Type="1">UmVjdXJyaW5nIEJpbGxpbmc=</PHRASE>
<PHRASE Label="la_fld_ItemsSold" Module="In-Commerce" Type="1">SXRlbXMgU29sZA==</PHRASE>
<PHRASE Label="la_fld_LastPaymentDate" Module="In-Commerce" Type="1">TGFzdCBQYXltZW50IERhdGU=</PHRASE>
- <PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1">TGFzdCBVc2VkIEJ5</PHRASE>
- <PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1">TGFzdCBVc2VkIE9u</PHRASE>
- <PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1">TGlzdGFibGU=</PHRASE>
+ <PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIEJ5">TGFzdCBVc2VkIEJ5</PHRASE>
+ <PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIE9u">TGFzdCBVc2VkIE9u</PHRASE>
+ <PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1" Column="TGlzdGFibGU=">TGlzdGFibGU=</PHRASE>
<PHRASE Label="la_fld_ManageCombinations" Module="In-Commerce" Type="1">TWFuYWdlIE9wdGlvbnMgQ29tYmluYXRpb25z</PHRASE>
<PHRASE Label="la_fld_ManageShipping" Module="In-Commerce" Type="1">TWFuYWdlIFNoaXBwaW5nIFR5cGVz</PHRASE>
- <PHRASE Label="la_fld_Manufacturer" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVy</PHRASE>
- <PHRASE Label="la_fld_MaxQty" Module="In-Commerce" Type="1">TWF4IFF0eQ==</PHRASE>
+ <PHRASE Label="la_fld_Manufacturer" Module="In-Commerce" Type="1" Column="TWFudWZhY3R1cmVy">TWFudWZhY3R1cmVy</PHRASE>
+ <PHRASE Label="la_fld_MaxQty" Module="In-Commerce" Type="1" Column="TWF4IFF0eQ==">TWF4IFF0eQ==</PHRASE>
<PHRASE Label="la_fld_MinimumPaymentAmount" Module="In-Commerce" Type="1">TWluaW1hbCBQYXltZW50IEFtb3VudA==</PHRASE>
- <PHRASE Label="la_fld_MinQty" Module="In-Commerce" Type="1">TWluIFF0eQ==</PHRASE>
+ <PHRASE Label="la_fld_MinQty" Module="In-Commerce" Type="1" Column="TWluIFF0eQ==">TWluIFF0eQ==</PHRASE>
<PHRASE Label="la_fld_MSRP" Module="In-Commerce" Type="1">TVNSUA==</PHRASE>
- <PHRASE Label="la_fld_Negotiated" Module="In-Commerce" Type="1">TmVnb3RpYXRlZA==</PHRASE>
+ <PHRASE Label="la_fld_Negotiated" Module="In-Commerce" Type="1" Column="TmVnb3RpYXRlZA==">TmVnb3RpYXRlZA==</PHRASE>
<PHRASE Label="la_fld_NextCharge" Module="In-Commerce" Type="1">TmV4dCBDaGFyZ2UgRGF0ZQ==</PHRASE>
- <PHRASE Label="la_fld_NumberOfUses" Module="In-Commerce" Type="1">TnVtYmVyIE9mIFVzZXM=</PHRASE>
- <PHRASE Label="la_fld_OnHold" Module="In-Commerce" Type="1">T24gSG9sZA==</PHRASE>
- <PHRASE Label="la_fld_OnSale" Module="In-Commerce" Type="1">UHJvZHVjdCBvbiBTYWxl</PHRASE>
+ <PHRASE Label="la_fld_NumberOfUses" Module="In-Commerce" Type="1" Column="TnVtYmVyIE9mIFVzZXM=">TnVtYmVyIE9mIFVzZXM=</PHRASE>
+ <PHRASE Label="la_fld_OnHold" Module="In-Commerce" Type="1" Column="T24gSG9sZA==">T24gSG9sZA==</PHRASE>
+ <PHRASE Label="la_fld_OnSale" Module="In-Commerce" Type="1" Column="T24gU2FsZQ==">UHJvZHVjdCBvbiBTYWxl</PHRASE>
<PHRASE Label="la_fld_OptionPrice" Module="In-Commerce" Type="1">T3B0aW9uIFByaWNl</PHRASE>
<PHRASE Label="la_fld_OptionsSelectionMode" Module="In-Commerce" Type="1">T3B0aW9ucyBTZWxlY3Rpb24gTW9kZQ==</PHRASE>
- <PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1">T3B0aW9uIFR5cGU=</PHRASE>
+ <PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1" Column="T3B0aW9uIFR5cGU=">T3B0aW9uIFR5cGU=</PHRASE>
<PHRASE Label="la_fld_OptionValue" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVl</PHRASE>
<PHRASE Label="la_fld_OptionValues" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVlcw==</PHRASE>
<PHRASE Label="la_fld_OrderId" Module="In-Commerce" Type="1">T3JkZXIgSUQ=</PHRASE>
- <PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
- <PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1">TnVtYmVy</PHRASE>
+ <PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1" Column="SVAgQWRkcmVzcw==">SVAgQWRkcmVzcw==</PHRASE>
+ <PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1" Column="TnVtYmVy">TnVtYmVy</PHRASE>
<PHRASE Label="la_fld_Original" Module="In-Commerce" Type="1">T3JpZ2luYWw=</PHRASE>
<PHRASE Label="la_fld_OriginalAmount" Module="In-Commerce" Type="1">T3JpZ2luYWwgQW1vdW50</PHRASE>
<PHRASE Label="la_fld_PaymentAccount" Module="In-Commerce" Type="1">UGF5bWVudCBBY2NvdW50</PHRASE>
<PHRASE Label="la_fld_PaymentCardType" Module="In-Commerce" Type="1">Q2FyZCBUeXBl</PHRASE>
<PHRASE Label="la_fld_PaymentCCExpDate" Module="In-Commerce" Type="1">Q2FyZCBFeHBpcmF0aW9u</PHRASE>
<PHRASE Label="la_fld_PaymentCVV2" Module="In-Commerce" Type="1">Q1ZWMg==</PHRASE>
- <PHRASE Label="la_fld_PaymentDate" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRl</PHRASE>
+ <PHRASE Label="la_fld_PaymentDate" Module="In-Commerce" Type="1" Column="UGF5bWVudCBEYXRl">UGF5bWVudCBEYXRl</PHRASE>
<PHRASE Label="la_fld_PaymentExpires" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRlL0V4cGlyYXRpb24=</PHRASE>
<PHRASE Label="la_fld_PaymentInterval" Module="In-Commerce" Type="1">UGF5bWVudCBJbnRlcnZhbA==</PHRASE>
<PHRASE Label="la_fld_PaymentNameOnCard" Module="In-Commerce" Type="1">TmFtZSBvbiB0aGUgQ2FyZA==</PHRASE>
- <PHRASE Label="la_fld_PaymentReference" Module="In-Commerce" Type="1">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
- <PHRASE Label="la_fld_PaymentType" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_PaymentReference" Module="In-Commerce" Type="1" Column="UGF5bWVudCBSZWZlcmVuY2U=">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
+ <PHRASE Label="la_fld_PaymentType" Module="In-Commerce" Type="1" Column="UGF5bWVudCBUeXBl">UGF5bWVudCBUeXBl</PHRASE>
<PHRASE Label="la_fld_PaymentTypeCurrencies" Module="In-Commerce" Type="1">QXZhaWxhYmxlIEN1cnJlbmNpZXM=</PHRASE>
<PHRASE Label="la_fld_PaymentTypeId" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlIElk</PHRASE>
<PHRASE Label="la_fld_PaymentTypes" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlcw==</PHRASE>
- <PHRASE Label="la_fld_PercentSurcharge" Module="In-Commerce" Type="1">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
+ <PHRASE Label="la_fld_PercentSurcharge" Module="In-Commerce" Type="1" Column="UGVyY2VudCBTdXJjaGFyZ2U=">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
<PHRASE Label="la_fld_Period" Module="In-Commerce" Type="1">UGVyaW9k</PHRASE>
<PHRASE Label="la_fld_PlacedOrdersEdit" Module="In-Commerce" Type="1">QWxsb3cgUGxhY2VkIE9yZGVycyBFZGl0aW5n</PHRASE>
- <PHRASE Label="la_fld_PlanType" Module="In-Commerce" Type="1">UGxhbiBUeXBl</PHRASE>
- <PHRASE Label="la_fld_Points" Module="In-Commerce" Type="1">UG9pbnRz</PHRASE>
- <PHRASE Label="la_fld_Price" Module="In-Commerce" Type="1">UHJpY2U=</PHRASE>
+ <PHRASE Label="la_fld_PlanType" Module="In-Commerce" Type="1" Column="UGxhbiBUeXBl">UGxhbiBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_Points" Module="In-Commerce" Type="1" Column="UG9pbnRz">UG9pbnRz</PHRASE>
+ <PHRASE Label="la_fld_Price" Module="In-Commerce" Type="1" Column="UHJpY2U=">UHJpY2U=</PHRASE>
<PHRASE Label="la_fld_PriceType" Module="In-Commerce" Type="1">UHJpY2UgTW9kaWZpZXIgVHlwZQ==</PHRASE>
<PHRASE Label="la_fld_ProcessingFee" Module="In-Commerce" Type="1">UHJvY2Vzc2luZyBGZWU=</PHRASE>
<PHRASE Label="la_fld_ProductFreeShipping" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
- <PHRASE Label="la_fld_ProductType" Module="In-Commerce" Type="1">UHJvZHVjdCBUeXBl</PHRASE>
+ <PHRASE Label="la_fld_ProductType" Module="In-Commerce" Type="1" Column="VHlwZQ==">UHJvZHVjdCBUeXBl</PHRASE>
<PHRASE Label="la_fld_Product_MaxHotNumber" Module="In-Commerce" Type="1">TWF4aW11bSBudW1iZXIgb2YgVG9wIFNlbGxlciBpdGVtcw==</PHRASE>
<PHRASE Label="la_fld_Product_MinPopRating" Module="In-Commerce" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgaXRlbSBQT1A=</PHRASE>
<PHRASE Label="la_fld_Product_MinPopVotes" Module="In-Commerce" Type="1">TWluaW11bSBudW1iZXIgb2Ygc29sZCBpdGVtcyB0byBjb25zaWRlciBpdGVtIFBPUA==</PHRASE>
- <PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1">UXR5IEJhY2tPcmRlcmVk</PHRASE>
- <PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
- <PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
- <PHRASE Label="la_fld_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
- <PHRASE Label="la_fld_QtyReserved" Module="In-Commerce" Type="1">UXR5IFJlc2VydmVk</PHRASE>
+ <PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1" Column="QmFja29yZGVyZWQ=">UXR5IEJhY2tPcmRlcmVk</PHRASE>
+ <PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1" Column="UXR5IEluIFN0b2Nr">UXR5IEluIFN0b2Nr</PHRASE>
+ <PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1" Column="UXR5SW5TdG9ja01pbg==">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
+ <PHRASE Label="la_fld_QtyOnOrder" Module="In-Commerce" Type="1" Column="UXR5IE9uIE9yZGVy">UXR5IE9uIE9yZGVy</PHRASE>
+ <PHRASE Label="la_fld_QtyReserved" Module="In-Commerce" Type="1" Column="UXR5IFJlc2VydmVk">UXR5IFJlc2VydmVk</PHRASE>
<PHRASE Label="la_fld_QtySold" Module="In-Commerce" Type="1">UXR5IFNvbGQ=</PHRASE>
- <PHRASE Label="la_fld_RateToPrimary" Module="In-Commerce" Type="1">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
- <PHRASE Label="la_fld_RegisteredOn" Module="In-Commerce" Type="1">UmVnaXN0ZXJlZCBPbg==</PHRASE>
- <PHRASE Label="la_fld_RemainingAmount" Module="In-Commerce" Type="1">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
+ <PHRASE Label="la_fld_RateToPrimary" Module="In-Commerce" Type="1" Column="UmF0ZSBUbyBQcmltYXJ5">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
+ <PHRASE Label="la_fld_RegisteredOn" Module="In-Commerce" Type="1" Column="UmVnaXN0ZXJlZCBPbg==">UmVnaXN0ZXJlZCBPbg==</PHRASE>
+ <PHRASE Label="la_fld_RemainingAmount" Module="In-Commerce" Type="1" Column="UmVtYWluaW5nIEFtb3VudA==">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
<PHRASE Label="la_fld_ReportType" Module="In-Commerce" Type="1">UmVwb3J0IFR5cGU=</PHRASE>
<PHRASE Label="la_fld_SecondDayDelivery" Module="In-Commerce" Type="1">U2Vjb25kIERheQ==</PHRASE>
<PHRASE Label="la_fld_SelectedGroups" Module="In-Commerce" Type="1">U2VsZWN0ZWQgVXNlciBHcm91cHM=</PHRASE>
@@ -418,50 +339,50 @@
<PHRASE Label="la_fld_ShippingCompany" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29tcGFueQ==</PHRASE>
<PHRASE Label="la_fld_ShippingControl" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29udHJvbA==</PHRASE>
<PHRASE Label="la_fld_ShippingCost" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29zdA==</PHRASE>
- <PHRASE Label="la_fld_ShippingCountry" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingCountry" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgQ291bnRyeQ==">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
<PHRASE Label="la_fld_ShippingCustomerAccount" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ3VzdG9tZXIgQWNjb3VudA==</PHRASE>
<PHRASE Label="la_fld_ShippingDate" Module="In-Commerce" Type="1">U2hpcHBpbmcgRGF0ZS9UaW1l</PHRASE>
<PHRASE Label="la_fld_ShippingEmail" Module="In-Commerce" Type="1">U2hpcHBpbmcgRW1haWw=</PHRASE>
<PHRASE Label="la_fld_ShippingFax" Module="In-Commerce" Type="1">U2hpcHBpbmcgRmF4</PHRASE>
<PHRASE Label="la_fld_ShippingMode" Module="In-Commerce" Type="1">QWxsb3dlZCBTaGlwcGluZyBUeXBlcw==</PHRASE>
- <PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_ShippingOption" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9u</PHRASE>
<PHRASE Label="la_fld_ShippingOptions" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9ucw==</PHRASE>
<PHRASE Label="la_fld_ShippingPhone" Module="In-Commerce" Type="1">U2hpcHBpbmcgUGhvbmU=</PHRASE>
- <PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_ShippingState" Module="In-Commerce" Type="1">U2hpcHBpbmcgU3RhdGU=</PHRASE>
<PHRASE Label="la_fld_ShippingTo" Module="In-Commerce" Type="1">U2hpcHBpbmcgVG8=</PHRASE>
<PHRASE Label="la_fld_ShippingTracking" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHJhY2tpbmcvUmVmZXJlbmNl</PHRASE>
- <PHRASE Label="la_fld_ShippingType" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShippingType" Module="In-Commerce" Type="1" Column="VHlwZQ==">U2hpcHBpbmcgVHlwZQ==</PHRASE>
<PHRASE Label="la_fld_ShippingTypeId" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZSBJRA==</PHRASE>
<PHRASE Label="la_fld_ShippingTypes" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZXM=</PHRASE>
<PHRASE Label="la_fld_ShippingZip" Module="In-Commerce" Type="1">U2hpcHBpbmcgWmlwY29kZQ==</PHRASE>
- <PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
- <PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
- <PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1">U3BlZWQgQ29kZQ==</PHRASE>
+ <PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgWm9uZSBOYW1l">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1" Column="U0tV">U0tV</PHRASE>
+ <PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgU3BlZWQ=">U3BlZWQgQ29kZQ==</PHRASE>
<PHRASE Label="la_fld_SSN" Module="In-Commerce" Type="1">U1NOL1RheCBJZC9WQVQgTnVtYmVy</PHRASE>
- <PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
+ <PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1" Column="U3RhcnQ=">U3RhcnQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_SubTotal" Module="In-Commerce" Type="1">U3VidG90YWw=</PHRASE>
- <PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
- <PHRASE Label="la_fld_TaxApplyToShipping" Module="In-Commerce" Type="1">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
- <PHRASE Label="la_fld_TaxValue" Module="In-Commerce" Type="1">VGF4IFZhbHVl</PHRASE>
- <PHRASE Label="la_fld_TaxZoneName" Module="In-Commerce" Type="1">TmFtZSBvZiBUYXggWm9uZQ==</PHRASE>
+ <PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gUHJvY2Vzc2luZw==">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
+ <PHRASE Label="la_fld_TaxApplyToShipping" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gU2hpcHBpbmc=">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
+ <PHRASE Label="la_fld_TaxValue" Module="In-Commerce" Type="1" Column="VGF4IFZhbHVl">VGF4IFZhbHVl</PHRASE>
+ <PHRASE Label="la_fld_TaxZoneName" Module="In-Commerce" Type="1" Column="VGF4IFpvbmUgTmFtZQ==">TmFtZSBvZiBUYXggWm9uZQ==</PHRASE>
<PHRASE Label="la_fld_ThirdDayDelivery" Module="In-Commerce" Type="1">VGhpcmQgRGF5</PHRASE>
<PHRASE Label="la_fld_Time" Module="In-Commerce" Type="1">VGltZQ==</PHRASE>
- <PHRASE Label="la_fld_ToAmount" Module="In-Commerce" Type="1">VG8gQW1vdW50</PHRASE>
+ <PHRASE Label="la_fld_ToAmount" Module="In-Commerce" Type="1" Column="VG8gQW1vdW50">VG8gQW1vdW50</PHRASE>
<PHRASE Label="la_fld_ToDateTime" Module="In-Commerce" Type="1">VG8gZGF0ZS90aW1l</PHRASE>
<PHRASE Label="la_fld_TopSeller" Module="In-Commerce" Type="1">VG9wIFNlbGxlcg==</PHRASE>
- <PHRASE Label="la_fld_TotalAmount" Module="In-Commerce" Type="1">VG90YWwgQW1vdW50</PHRASE>
+ <PHRASE Label="la_fld_TotalAmount" Module="In-Commerce" Type="1" Column="VG90YWwgQW1vdW50">VG90YWwgQW1vdW50</PHRASE>
<PHRASE Label="la_fld_TotalReturns" Module="In-Commerce" Type="1">VG90YWwgUmV0dXJucw==</PHRASE>
<PHRASE Label="la_fld_TotalSavings" Module="In-Commerce" Type="1">VG90YWwgU2F2aW5ncw==</PHRASE>
- <PHRASE Label="la_fld_UnitsLimit" Module="In-Commerce" Type="1">TGluaXQ=</PHRASE>
+ <PHRASE Label="la_fld_UnitsLimit" Module="In-Commerce" Type="1" Column="TGltaXQ=">TGluaXQ=</PHRASE>
<PHRASE Label="la_fld_UserComment" Module="In-Commerce" Type="1">VXNlciBDb21tZW50</PHRASE>
<PHRASE Label="la_fld_VAT" Module="In-Commerce" Type="1">U2FsZXMgVGF4L1ZBVA==</PHRASE>
<PHRASE Label="la_fld_VerificationResult" Module="In-Commerce" Type="1">VmVyaWZpY2F0aW9uIFJlc3VsdA==</PHRASE>
- <PHRASE Label="la_fld_Weight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
+ <PHRASE Label="la_fld_Weight" Module="In-Commerce" Type="1" Column="V2VpZ2h0">V2VpZ2h0</PHRASE>
<PHRASE Label="la_fld_WeightType" Module="In-Commerce" Type="1">V2VpZ2h0IE1vZGlmaWVyIFR5cGU=</PHRASE>
- <PHRASE Label="la_fld_ZoneName" Module="In-Commerce" Type="1">Wm9uZSBOYW1l</PHRASE>
- <PHRASE Label="la_fld_ZoneType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
+ <PHRASE Label="la_fld_ZoneName" Module="In-Commerce" Type="1" Column="Wm9uZSBOYW1l">Wm9uZSBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_ZoneType" Module="In-Commerce" Type="1" Column="Wm9uZSBUeXBl">VHlwZQ==</PHRASE>
<PHRASE Label="la_fld_Zone_Type" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
<PHRASE Label="la_FontColor" Module="In-Commerce" Type="1">Rm9udCBDb2xvcg==</PHRASE>
<PHRASE Label="la_FreeShipping" Module="In-Commerce" Type="1">RnJlZSBTaGlwcGluZw==</PHRASE>
Index: in-commerce/units/addresses/addresses_config.php
===================================================================
--- in-commerce/units/addresses/addresses_config.php (revision 14516)
+++ in-commerce/units/addresses/addresses_config.php (working copy)
@@ -113,6 +113,4 @@
'ShortAddress' => Array('type'=>'string', 'default' => ''),
),
- 'Grids' => Array(),
-
);
\ No newline at end of file
Index: in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php
===================================================================
--- in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php (revision 14516)
+++ in-commerce/units/affiliate_payment_types/affiliate_payment_types_config.php (working copy)
@@ -86,14 +86,14 @@
'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
'Status' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
- 'not_null' => 1, 'default' => 0,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+ 'not_null' => 1, 'default' => 0,
),
'IsPrimary' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'not_null' => 1, 'default' => 0,
),
'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -110,9 +110,9 @@
'module' => 'core',
),
'Fields' => Array (
- 'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ( 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Description' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
),
),
Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php
===================================================================
--- in-commerce/units/affiliate_payments/affiliate_payments_config.php (revision 14516)
+++ in-commerce/units/affiliate_payments/affiliate_payments_config.php (working copy)
@@ -126,12 +126,12 @@
'module' => 'core',
),
'Fields' => Array(
- 'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'PaymentDate' => Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'),
- 'Comment' => Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
- 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'),
- 'PaymentReference' => Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'Amount' => Array( 'filter_block' => 'grid_float_range_filter'),
+ 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+ 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
),
),
'Log' => Array(
@@ -140,13 +140,13 @@
'module' => 'core',
),
'Fields' => Array(
- 'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Username' => Array( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
- 'PaymentDate' => Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'Amount' => Array( 'title' => 'la_col_Amount', 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),
- 'Comment' => Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
- 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'),
- 'PaymentReference' => Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Username' => Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+ 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'Amount' => Array( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),
+ 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+ 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+ 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
),
),
Index: in-commerce/units/affiliate_plans/affiliate_plans_config.php
===================================================================
--- in-commerce/units/affiliate_plans/affiliate_plans_config.php (revision 14516)
+++ in-commerce/units/affiliate_plans/affiliate_plans_config.php (working copy)
@@ -91,14 +91,14 @@
'MinPaymentAmount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
'Enabled' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
- 'not_null' => 1, 'default' => 0,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+ 'not_null' => 1, 'default' => 0,
),
'IsPrimary' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'not_null' => 1, 'default' => 0,
),
),
@@ -114,10 +114,10 @@
'module' => 'core',
),
'Fields' => Array (
- 'AffiliatePlanId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ( 'title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'PlanType' => Array ( 'title' => 'la_col_PlanType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'Enabled' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'AffiliatePlanId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'PlanType' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'Enabled' => Array ( 'title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
),
),
Index: in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php
===================================================================
--- in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (revision 14516)
+++ in-commerce/units/affiliate_plans_items/affiliate_plans_items_config.php (working copy)
@@ -116,7 +116,7 @@
2 => 'icon16_product_pending.png',
),
'Fields' => Array(
- 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_checkbox_td' ),
+ 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_checkbox_td' ),
'ItemName' => Array( 'title'=>'la_col_ItemName' ),
'ItemType' => Array( 'title'=>'la_col_ItemType' ),
),
Index: in-commerce/units/affiliates/affiliates_config.php
===================================================================
--- in-commerce/units/affiliates/affiliates_config.php (revision 14516)
+++ in-commerce/units/affiliates/affiliates_config.php (working copy)
@@ -195,13 +195,13 @@
'module' => 'core',
),
'Fields' => Array(
- 'AffiliateId' => Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'UserName' => Array( 'title' => 'la_col_UserName', 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+ 'AffiliateId' => Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'UserName' => Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
'PlanName' => Array( 'title'=>'la_col_PlanName', 'filter_block' => 'grid_like_filter'),
- 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
- 'CreatedOn' => Array( 'title' => 'la_col_RegisteredOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'Status' => Array( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+ 'CreatedOn' => Array( 'title' => 'column:la_fld_RegisteredOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'Status' => Array( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
Index: in-commerce/units/coupon_items/coupon_items_config.php
===================================================================
--- in-commerce/units/coupon_items/coupon_items_config.php (revision 14516)
+++ in-commerce/units/coupon_items/coupon_items_config.php (working copy)
@@ -32,7 +32,7 @@
'DoEvent' => 'OnDeleteCouponItem',
),
),
-
+
'QueryString' => Array(
1 => 'id',
2 => 'Page',
@@ -41,7 +41,7 @@
),
'IDField' => 'CouponItemId',
- 'StatusField' => Array('Status'),
+ 'StatusField' => Array('Status'),
'TableName' => TABLE_PREFIX . 'ProductsCouponItems',
'ForeignKey' => 'CouponId',
@@ -49,14 +49,14 @@
'ParentPrefix' => 'coup',
'AutoDelete' => true,
'AutoClone' => true,
-
+
'ListSQLs' => Array(
'' => ' SELECT %1$s.* %2$s
FROM %1$s
LEFT JOIN ' . TABLE_PREFIX . 'Products p ON %1$s.ItemResourceId = p.ResourceId
LEFT JOIN ' . TABLE_PREFIX . 'Category c ON %1$s.ItemResourceId = c.ResourceId',
), // key - special, value - list select sql
-
+
'ItemSQLs' => Array(
'' => 'SELECT * FROM %s',
),
@@ -65,13 +65,13 @@
Array(
'prefix' => 'd', 'key' => 'DiscountId', 'ForeignKey' => 'DiscountId'),
),*/
-
+
'ListSortings' => Array(
'' => Array(
'Sorting' => Array('ItemName' => 'asc'),
),
),
-
+
'CalculatedFields' => Array(
'' => Array(
'ProductId' => 'p.ProductId',
@@ -120,7 +120,7 @@
'type' => 'int',
'formatter' => 'kOptionsFormatter',
'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
- 'default' => 2,
+ 'default' => 2,
),
'CategoryId' => Array ('type' => 'int', 'default' => 0),
),
@@ -140,11 +140,11 @@
2 => 'icon16_product_pending.png',
),
'Fields' => Array(
- 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
'ItemType' => Array( 'title'=>'la_col_CouponItemType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
),
-
+
);
\ No newline at end of file
Index: in-commerce/units/coupons/coupons_config.php
===================================================================
--- in-commerce/units/coupons/coupons_config.php (revision 14516)
+++ in-commerce/units/coupons/coupons_config.php (working copy)
@@ -149,16 +149,16 @@
'module' => 'core',
),
'Fields' => Array(
- 'CouponId' => Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ),
+ 'CouponId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ),
+ 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ),
),
),
'Radio' => Array(
@@ -169,17 +169,18 @@
2 => 'icon16_pending.png',
'module' => 'core',
),
+ 'Selector' => 'radio',
'Fields' => Array(
- 'CouponId' => Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ),
+ 'CouponId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ),
+ 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ),
),
),
),
Index: in-commerce/units/currencies/currencies_config.php
===================================================================
--- in-commerce/units/currencies/currencies_config.php (revision 14516)
+++ in-commerce/units/currencies/currencies_config.php (working copy)
@@ -111,14 +111,14 @@
'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
'Status' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1,
- 'not_null' => 1, 'default' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1,
+ 'not_null' => 1, 'default' => 1,
),
'IsPrimary' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
- 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter',
+ 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'not_null' => 1, 'default' => 0,
),
'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -139,12 +139,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'CurrencyId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'ISO' => Array ( 'title' => 'la_col_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ),
- 'Translation' => Array ( 'title' => 'la_col_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'RateToPrimary' => Array ( 'title' => 'la_col_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),
+ 'CurrencyId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'ISO' => Array ( 'title' => 'column:la_fld_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ),
+ 'Translation' => Array ( 'title' => 'column:la_fld_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),
'Modified' => Array ( 'title' => 'la_col_LastUpdated', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
Index: in-commerce/units/destinations/destinations_config.php
===================================================================
--- in-commerce/units/destinations/destinations_config.php (revision 14516)
+++ in-commerce/units/destinations/destinations_config.php (working copy)
@@ -57,22 +57,4 @@
'StdDestId' => Array('type' => 'int', 'default' => 0, ),
'DestValue' => Array('type' => 'string', 'max_len' => 255, 'default' => null, ),
),
- /*'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array(
- 'default' => 'icon16_item.gif',
- 1 => 'icon16_item.gif',
- 0 => 'icon16_disabled.gif'
- 'module' => 'core',
- ),
- 'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'grid_checkbox_td'),
- 'AltName' => Array( 'title'=>'la_col_AltName' ),
- 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td' ),
- 'Enabled' => Array( 'title'=>'la_col_ImageEnabled' ),
- 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'preview' ),
- ),
-
- ),
- ),*/
);
\ No newline at end of file
Index: in-commerce/units/discount_items/discount_items_config.php
===================================================================
--- in-commerce/units/discount_items/discount_items_config.php (revision 14516)
+++ in-commerce/units/discount_items/discount_items_config.php (working copy)
@@ -119,7 +119,7 @@
2 => 'icon16_product_pending.png',
),
'Fields' => Array(
- 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
+ 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter'),
'ItemType' => Array( 'title'=>'la_col_ItemType', 'filter_block' => 'grid_options_filter'),
),
Index: in-commerce/units/discounts/discounts_config.php
===================================================================
--- in-commerce/units/discounts/discounts_config.php (revision 14516)
+++ in-commerce/units/discounts/discounts_config.php (working copy)
@@ -127,14 +127,14 @@
'module' => 'core',
),
'Fields' => Array (
- 'DiscountId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
- 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
- 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
- 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'DiscountId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Start' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'End' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'GroupId' => Array( 'title'=>'column:la_fld_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'Type' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'Status' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'Amount' => Array( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
),
),
),
Index: in-commerce/units/downloads/downloads_config.php
===================================================================
--- in-commerce/units/downloads/downloads_config.php (revision 14516)
+++ in-commerce/units/downloads/downloads_config.php (working copy)
@@ -101,11 +101,11 @@
'module' => 'core',
),
'Fields' => Array(
- 'DownloadId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Username' => Array( 'title'=>'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'DownloadId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Username' => Array( 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'ProductName' => Array( 'title'=>'la_col_DownloadedProductName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'Filename' => Array( 'title'=>'la_col_DownloadedFileName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'IPAddress' => Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+ 'IPAddress' => Array( 'filter_block' => 'grid_like_filter', 'width' => 150, ),
'StartedOn' => Array( 'title'=>'la_col_StartedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
),
),
Index: in-commerce/units/files/files_config.php
===================================================================
--- in-commerce/units/files/files_config.php (revision 14516)
+++ in-commerce/units/files/files_config.php (working copy)
@@ -130,13 +130,13 @@
'module' => 'core',
),
'Fields' => Array (
- 'FileId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
- 'Name' => Array ( 'title' => 'la_col_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'),
- 'FilePath' => Array ( 'title' => 'la_col_FilePath', 'filter_block' => 'grid_like_filter'),
- 'Version' => Array ( 'title' => 'la_col_Version', 'filter_block' => 'grid_like_filter'),
+ 'FileId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
+ 'Name' => Array ( 'title' => 'column:la_fld_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'),
+ 'FilePath' => Array ( 'filter_block' => 'grid_like_filter'),
+ 'Version' => Array ( 'filter_block' => 'grid_like_filter'),
'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_float_range_filter'),
- 'AddedOn' => Array ( 'title' => 'la_col_AddedOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
+ 'AddedOn' => Array ( 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'),
+ 'Status' => Array ( 'filter_block' => 'grid_options_filter'),
),
),
),
Index: in-commerce/units/gift_certificates/gift_certificates_config.php
===================================================================
--- in-commerce/units/gift_certificates/gift_certificates_config.php (revision 14516)
+++ in-commerce/units/gift_certificates/gift_certificates_config.php (working copy)
@@ -70,7 +70,7 @@
'priority' => 3.3, // <parent_priority>.<own_priority>, because this section replaces parent in tree
'type' => stTAB,
),
- ),
+ ),
'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %1$s',),
'ItemSQLs' => Array ('' => 'SELECT * FROM %1$s',),
@@ -126,12 +126,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'GiftCertificateId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Code' => Array ('title' => 'la_col_Code', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'Debit' => Array ('title' => 'la_col_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),
- 'Amount' => Array ('title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'Expiration' => Array ('title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'GiftCertificateId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Code' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),
+ 'Amount' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
),
),
),
Index: in-commerce/units/manufacturers/manufacturers_config.php
===================================================================
--- in-commerce/units/manufacturers/manufacturers_config.php (revision 14516)
+++ in-commerce/units/manufacturers/manufacturers_config.php (working copy)
@@ -35,7 +35,7 @@
'TitlePresets' => Array (
'default' => Array (
'new_status_labels' => Array ('manuf' => '!la_title_AddingManufacturer!'),
- 'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),
+ 'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),
),
'manuf_list' => Array (
'prefixes' => Array ('manuf_List'), 'format' => "!la_title_Manufacturers!",
@@ -120,10 +120,10 @@
'module' => 'core',
),
'Fields' => Array (
- 'ManufacturerId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ManufacturerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'Name' => Array ('title' => 'la_col_ManufacturerName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'IsPopular' => Array ('title' => 'la_col_IsPopular', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'URL' => Array ('title' => 'la_col_URL', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'URL' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
),
),
),
Index: in-commerce/units/order_items/order_items_config.php
===================================================================
--- in-commerce/units/order_items/order_items_config.php (revision 14516)
+++ in-commerce/units/order_items/order_items_config.php (working copy)
@@ -142,7 +142,7 @@
'Quantity' => Array ('title' => 'la_col_Quantity', 'data_block' => 'grid_quantity_td', 'filter_block' => 'grid_range_filter'),
'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
- 'Price' => Array ('title' => 'la_col_Price', 'data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),
+ 'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),
'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_float_range_filter'),
'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
@@ -163,7 +163,7 @@
'Quantity' => Array ('title' => 'la_col_Quantity', 'filter_block' => 'grid_range_filter'),
'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
- 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_float_range_filter'),
+ 'Price' => Array ('filter_block' => 'grid_float_range_filter'),
'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_float_range_filter'),
'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
Index: in-commerce/units/orders/orders_config.php
===================================================================
--- in-commerce/units/orders/orders_config.php (revision 14516)
+++ in-commerce/units/orders/orders_config.php (working copy)
@@ -510,13 +510,14 @@
),
'Fields' => Array (
- 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'OrderNumber' => Array ( 'title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'OrderNumber' => Array ( 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'OrderDate' => Array ( 'title' => 'la_col_OrderDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
'CustomerName' => Array ( 'title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'PaymentType' => Array ( 'title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
- 'TotalAmount' => Array ( 'title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ),
- 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
- 'OnHold' => Array ('title' => 'la_col_OnHold', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'PaymentType' => Array ( 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+ 'TotalAmount' => Array ( 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ),
+ 'AffiliateUser' => Array ( 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
+ 'OnHold' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
@@ -528,17 +529,17 @@
'module' => 'core',
),
'Fields' => Array (
- 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'OrderNumber' => Array ('title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'OrderNumber' => Array ('data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
'OrderDate' => Array ('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
'CustomerName' => Array ('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
- 'PaymentType' => Array ('title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'),
- 'TotalAmount' => Array ('title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),
- 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'),
- 'OrderIP' => Array ('title' => 'la_col_OrderIP', 'filter_block' => 'grid_like_filter'),
- 'Username' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_user_like_filter'),
- 'PaymentAccount' => Array ('title' => 'la_col_CreditCardNumber', 'filter_block' => 'grid_like_filter'),
+ 'PaymentType' => Array ('data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'),
+ 'TotalAmount' => Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),
+ 'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'),
+ 'OrderIP' => Array ('filter_block' => 'grid_like_filter'),
+ 'Username' => Array ('filter_block' => 'grid_user_like_filter'),
+ 'PaymentAccount' => Array ('title' => 'column:la_fld_CreditCardNumber', 'filter_block' => 'grid_like_filter'),
),
),
),
Index: in-commerce/units/payment_type/payment_type_config.php
===================================================================
--- in-commerce/units/payment_type/payment_type_config.php (revision 14516)
+++ in-commerce/units/payment_type/payment_type_config.php (working copy)
@@ -151,11 +151,11 @@
'module' => 'core',
),
'Fields' => Array (
- 'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+ 'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
'Name' => Array ( 'title' => 'la_col_PaymentTypeName', 'data_block' => 'payment_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200),
- 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200),
+ 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
'BuiltIn' => Array ( 'title' => 'la_col_BuiltIn', 'filter_block' => 'grid_options_filter', 'width' => 100),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
),
),
),
Index: in-commerce/units/payment_type_currencies/payment_type_currencies_config.php
===================================================================
--- in-commerce/units/payment_type_currencies/payment_type_currencies_config.php (revision 14516)
+++ in-commerce/units/payment_type_currencies/payment_type_currencies_config.php (working copy)
@@ -61,6 +61,4 @@
'PaymentTypeId' => Array('type' => 'int','not_null' => 1, 'default' => 0),
'CurrencyId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
),
-
- 'Grids' => Array(),
);
\ No newline at end of file
Index: in-commerce/units/pricing/pricing_config.php
===================================================================
--- in-commerce/units/pricing/pricing_config.php (revision 14516)
+++ in-commerce/units/pricing/pricing_config.php (working copy)
@@ -102,7 +102,7 @@
'not_null' => 1, 'default' => 0,
),
'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1),
-
+
/* TODO implement these fields in business logic
'AccessRebillDate' => Array (
'type'=> 'int', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default' => 0,
@@ -123,30 +123,13 @@
),
'Grids' => Array (
- /*
- 'Default' => Array (
- 'Icons' => Array (
- 'default' => 'icon16_item.png',
- 'module' => 'core',
- ),
- 'Fields' => Array (
- 'MinQty' => Array ( 'title'=> 'la_col_MinQty', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'MaxQty' => Array ( 'title'=> 'la_col_MaxQty', 'filter_block' => 'grid_range_filter'),
- 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_range_filter'),
- 'Points' => Array ( 'title'=> 'la_col_Points', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ( 'title'=> 'la_col_Cost', 'filter_block' => 'grid_range_filter'),
- 'Negotiated' => Array ( 'title'=> 'la_col_Negotiated', 'data_block' => 'negotiated_td', 'filter_block' => 'grid_options_filter'),
- ),
-
- ),
- */
'Access' => Array (
'Icons' => Array ('default'=> 'icon16_pricing.gif', '0'=> 'icon16_pricing.gif', '1'=> 'icon16_pricing_primary.gif'),
'Fields' => Array (
- 'AccessDuration' => Array ( 'title'=> 'la_col_AccessDuration', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'AccessUnit' => Array ( 'title'=> 'la_col_AccessDurationUnit', 'filter_block' => 'grid_options_filter'),
- 'Description' => Array ( 'title'=> 'la_col_Description', 'filter_block' => 'grid_like_filter'),
- 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_float_range_filter'),
+ 'AccessDuration' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'AccessUnit' => Array ( 'title'=> 'column:la_fld_AccessDurationUnit', 'filter_block' => 'grid_options_filter'),
+ 'Description' => Array ('filter_block' => 'grid_like_filter'),
+ 'Price' => Array ( 'filter_block' => 'grid_float_range_filter'),
),
),
Index: in-commerce/units/product_option_combinations/product_option_combinations_config.php
===================================================================
--- in-commerce/units/product_option_combinations/product_option_combinations_config.php (revision 14516)
+++ in-commerce/units/product_option_combinations/product_option_combinations_config.php (working copy)
@@ -102,10 +102,10 @@
),
'Fields' => Array (
'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
- 'SKU' => Array ( 'title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'),
- 'Availability' => Array ( 'title' => 'la_col_Availability', 'filter_block' => 'grid_options_filter'),
- 'Price' => Array ( 'title' => 'la_col_Price', 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'),
- /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/
+ 'SKU' => Array ( 'filter_block' => 'grid_like_filter'),
+ 'Availability' => Array ( 'filter_block' => 'grid_options_filter'),
+ 'Price' => Array ( 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'),
+// 'Weight' => Array ( 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),
),
),
@@ -117,11 +117,11 @@
'Selector' => 'radio',
'Fields' => Array (
'Combination' => Array ('title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
- 'SKU' => Array ('title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'),
- 'QtyInStock' => Array ('title' => 'la_col_QtyInStock', 'filter_block' => 'grid_range_filter'),
- 'QtyReserved' => Array ('title' => 'la_col_QtyReserved', 'filter_block' => 'grid_range_filter'),
- 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter'),
- 'QtyOnOrder' => Array ('title' => 'la_col_QtyOnOrder', 'filter_block' => 'grid_range_filter'),
+ 'SKU' => Array ('filter_block' => 'grid_like_filter'),
+ 'QtyInStock' => Array ('filter_block' => 'grid_range_filter'),
+ 'QtyReserved' => Array ('filter_block' => 'grid_range_filter'),
+ 'QtyBackOrdered' => Array ('filter_block' => 'grid_range_filter'),
+ 'QtyOnOrder' => Array ('filter_block' => 'grid_range_filter'),
),
),
@@ -133,8 +133,8 @@
),
'Fields' => Array (
'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
- 'FinalPrice' => Array ( 'title' => 'la_col_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'),
- /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/
+ 'FinalPrice' => Array ( 'title' => 'column:la_fld_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'),
+// 'Weight' => Array ('data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),
),
),
),
Index: in-commerce/units/product_options/product_options_config.php
===================================================================
--- in-commerce/units/product_options/product_options_config.php (revision 14516)
+++ in-commerce/units/product_options/product_options_config.php (working copy)
@@ -93,11 +93,11 @@
'module' => 'core',
), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
'Fields' => Array (
- 'ProductOptionId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'),
- 'OptionType' => Array ( 'title' => 'la_col_OptionType', 'filter_block' => 'grid_options_filter'),
- 'Required' => Array ( 'title' => 'la_col_Required', 'filter_block' => 'grid_options_filter'),
- /*'Listable' => Array ( 'title' => 'la_col_Listable', 'filter_block' => 'grid_options_filter'),*/
+ 'ProductOptionId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'Name' => Array ( 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'),
+ 'OptionType' => Array ( 'filter_block' => 'grid_options_filter'),
+ 'Required' => Array ( 'filter_block' => 'grid_options_filter'),
+// 'Listable' => Array ('filter_block' => 'grid_options_filter'),
),
),
Index: in-commerce/units/products/products_config.php
===================================================================
--- in-commerce/units/products/products_config.php (revision 14516)
+++ in-commerce/units/products/products_config.php (working copy)
@@ -492,12 +492,12 @@
'Expire' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null),
'Type' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+ 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
'options' => Array (
PRODUCT_TYPE_TANGIBLE => 'la_product_tangible',
PRODUCT_TYPE_SUBSCRIPTION => 'la_product_subscription',
PRODUCT_TYPE_SERVICE => 'la_product_service',
- PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable',
+ PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable',
/* PRODUCT_TYPE_PACKAGE => 'la_product_package', */
),
'not_null' => 1, 'default' => 1,
@@ -506,9 +506,9 @@
'ModifiedById' => Array ('type' => 'int', 'default' => NULL),
'CreatedById' => Array (
'type' => 'int',
- 'formatter' => 'kLEFTFormatter',
+ 'formatter' => 'kLEFTFormatter',
'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
- 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
+ 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\'',
'left_key_field' => 'PortalUserId',
'left_title_field' => 'Login',
@@ -640,21 +640,20 @@
'NEW' => 'icon16_product_new.png',
),
'Fields' => Array (
- 'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'Type' => Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Manufacturer' => Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'QtyInStock' => Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'OnSale' => Array ('title' => 'la_col_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ), /*
- 'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'Type' => Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Manufacturer' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Price' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'OnSale' => Array ('title' => 'column:la_fld_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ /*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- 'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
- */
+ 'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),*/
),
),
@@ -668,16 +667,16 @@
),
'Selector' => 'radio',
'Fields' => Array (
- 'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'Type' => Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'Manufacturer' => Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'QtyInStock' => Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
- 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'Type' => Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'Manufacturer' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'Price' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+ 'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
),
),
Index: in-commerce/units/reports/reports_config.php
===================================================================
--- in-commerce/units/reports/reports_config.php (revision 14516)
+++ in-commerce/units/reports/reports_config.php (working copy)
@@ -74,7 +74,7 @@
'ItemSQLs' => Array( '' => 'SELECT * FROM %1$s',
),
'ListSortings' => Array (
- '' => Array (
+ '' => Array (
'Sorting' => Array ('Name' => 'asc'),
)
),
@@ -100,14 +100,14 @@
'FromDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ),
'ToDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ),
'Recursive' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
),
'SkipEmpty' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
),
@@ -120,12 +120,12 @@
'module' => 'core',
),
'Fields' => Array(
- 'Name' => Array( 'title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
- 'Start' => Array( 'title' => 'la_col_Start', 'filter_block' => 'grid_date_range_filter'),
- 'End' => Array( 'title' => 'la_col_End', 'filter_block' => 'grid_date_range_filter'),
- 'GroupId' => Array( 'title' => 'la_col_Group', 'filter_block' => 'grid_options_filter'),
- 'Type' => Array( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'),
- 'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'),
+ 'Name' => Array('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+ 'Start' => Array('filter_block' => 'grid_date_range_filter'),
+ 'End' => Array('filter_block' => 'grid_date_range_filter'),
+ 'GroupId' => Array( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter'),
+ 'Type' => Array('filter_block' => 'grid_options_filter'),
+ 'Amount' => Array('filter_block' => 'grid_float_range_filter'),
),
),
Index: in-commerce/units/reports/reports_event_handler.php
===================================================================
--- in-commerce/units/reports/reports_event_handler.php (revision 14516)
+++ in-commerce/units/reports/reports_event_handler.php (working copy)
@@ -372,10 +372,10 @@
),
'Fields' => Array (
'CategoryName' => Array ('title' => 'la_col_CategoryName', 'filter_block' => 'grid_like_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -436,11 +436,11 @@
'module' => 'core',
),
'Fields' => Array (
- 'Login' => Array ('title' => 'la_col_Login', 'filter_block' => 'grid_like_filter'),
- 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
- 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
+ 'Login' => Array ('filter_block' => 'grid_like_filter'),
+ 'FirstName' => Array ('filter_block' => 'grid_like_filter'),
+ 'LastName' => Array ('filter_block' => 'grid_like_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -475,10 +475,10 @@
),
'Fields' => Array (
'ProductName' => Array ('title' => 'la_col_ProductName', 'filter_block' => 'grid_like_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -543,8 +543,8 @@
),
'Fields' => Array(
'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'),
- 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
- 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
+ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+ 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
Index: in-commerce/units/sections/section_eh.php
===================================================================
--- in-commerce/units/sections/section_eh.php (revision 14516)
+++ in-commerce/units/sections/section_eh.php (working copy)
@@ -82,10 +82,10 @@
$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Fields', array_merge_recursive2($fields, $new_fields));
$new_columns = Array (
- 'BillingCountry' => Array ('title' => 'la_col_BillingCountry', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'ShippingCountry' => Array ('title' => 'la_col_ShippingCountry', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryCurrencyId' => Array ('title' => 'la_col_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
- 'PrimaryPaymentTypeId' => Array ('title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'BillingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'ShippingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryCurrencyId' => Array ('title' => 'column:la_fld_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+ 'PrimaryPaymentTypeId' => Array ('title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
);
$grids = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Grids');
Index: in-commerce/units/shipping/shipping_config.php
===================================================================
--- in-commerce/units/shipping/shipping_config.php (revision 14516)
+++ in-commerce/units/shipping/shipping_config.php (working copy)
@@ -127,7 +127,7 @@
'Sorting' => Array ('Name' => 'asc'),
)
),
-
+
'Fields' => Array (
'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')),
@@ -166,7 +166,7 @@
'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0),
'IsFreePromoShipping' => Array (
'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'formatter' => 'kOptionsFormatter',
'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
'default' => 0, 'not_null' => 1,
),
@@ -174,7 +174,7 @@
'InsuranceType' => Array (
'type' => 'int',
'formatter' => 'kOptionsFormatter',
- 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1,
+ 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1,
'not_null' => 1, 'default' => 2
),
),
@@ -188,14 +188,14 @@
'module' => 'core',
),
'Fields' => Array (
- 'ShippingID' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ),
- 'Type' => Array ( 'title' => 'la_col_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'SpeedCode' => Array ( 'title' => 'la_col_SpeedCode', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
- 'BaseFee' => Array ( 'title' => 'la_col_BaseFee', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
- 'IsFreePromoShipping' => Array ( 'title' => 'la_col_IsFreePromoShipping', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 170, ),
- /*'CODFlatSurcharge' => Array ( 'title' => 'la_col_CODFlatSurcharge', 'filter_block' => 'grid_float_range_filter'),*/
+ 'ShippingID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ),
+ 'Type' => Array ( 'title' => 'column:la_fld_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'SpeedCode' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 130, ),
+ 'BaseFee' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+ 'IsFreePromoShipping' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 170, ),
+// 'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter'),
),
),
Index: in-commerce/units/shipping_costs/shipping_costs_config.php
===================================================================
--- in-commerce/units/shipping_costs/shipping_costs_config.php (revision 14516)
+++ in-commerce/units/shipping_costs/shipping_costs_config.php (working copy)
@@ -57,20 +57,4 @@
'Flat' => Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
'PerUnit' => Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
),
-
- /*
- 'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array(
- 'default' => 'icon16_item.png',
- 'module' => 'core',
- ),
- 'Fields' => Array(
- 'Name' => Array( 'width'=>150, 'title'=>'la_col_Title', 'data_block'=>'grid_checkbox_td' ),
- 'CODallowed' => Array( 'width'=>100, 'title'=>'la_col_CODallowed' )
- ),
-
- ),
- ),
- */
);
\ No newline at end of file
Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
--- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (revision 14516)
+++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (working copy)
@@ -207,11 +207,11 @@
'module' => 'core',
),
'Fields' => Array (
- 'EngineId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'FlatSurcharge' => Array ( 'title' => 'la_col_FlatSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
- 'PercentSurcharge' => Array ( 'title' => 'la_col_PercentSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
- 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'FlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+ 'PercentSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
),
Index: in-commerce/units/taxes/taxes_config.php
===================================================================
--- in-commerce/units/taxes/taxes_config.php (revision 14516)
+++ in-commerce/units/taxes/taxes_config.php (working copy)
@@ -43,9 +43,9 @@
),*/
'IDField' => 'TaxZoneId',
'TitleField' => 'Name',
-
+
'TitlePresets' => Array (
- 'default' => Array (
+ 'default' => Array (
'new_status_labels' => Array ('tax' => '!la_title_AddingTaxZone!'),
'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'),
),
@@ -58,7 +58,7 @@
'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!",
),
),
-
+
'PermSection' => Array ('main' => 'in-commerce:taxes'),
'Sections' => Array (
@@ -94,17 +94,17 @@
'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => 1, 'default' => 1),
'TaxValue' => Array ('type' => 'double', 'not_null' => 1, 'default' => 0),
'ApplyToShipping' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
- 'default' => 0, 'not_null' => 1,
+ 'default' => 0, 'not_null' => 1,
),
'ApplyToProcessing' => Array (
- 'type' => 'int',
- 'formatter' => 'kOptionsFormatter',
+ 'type' => 'int',
+ 'formatter' => 'kOptionsFormatter',
'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
- 'default' => 0, 'not_null' => 1,
- ),
+ 'default' => 0, 'not_null' => 1,
+ ),
),
'Grids' => Array (
@@ -117,12 +117,12 @@
'module' => 'core',
),
'Fields' => Array (
- 'TaxZoneId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'TaxValue' => Array ( 'title' => 'la_col_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),
- 'Type' => Array ( 'title' => 'la_col_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
- 'ApplyToShipping' => Array ( 'title' => 'la_col_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
- 'ApplyToProcessing' => Array ( 'title' => 'la_col_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+ 'TaxZoneId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),
+ 'Type' => Array ( 'title' => 'column:la_fld_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+ 'ApplyToShipping' => Array ( 'title' => 'column:la_fld_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+ 'ApplyToProcessing' => Array ( 'title' => 'column:la_fld_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
),
),
),
Index: in-commerce/units/taxesdestinations/taxesdestinations_config.php
===================================================================
--- in-commerce/units/taxesdestinations/taxesdestinations_config.php (revision 14516)
+++ in-commerce/units/taxesdestinations/taxesdestinations_config.php (working copy)
@@ -72,23 +72,4 @@
'StdDestId' => Array ('type' => 'int', 'default' => 0),
'DestValue' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
),
-
- /*'Grids' => Array(
- 'Default' => Array(
- 'Icons' => Array(
- 'default' => 'icon16_item.gif',
- 1 => 'icon16_item.gif',
- 0 => 'icon16_disabled.gif'
- 'module' => 'core',
- ),
- 'Fields' => Array(
- 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'grid_checkbox_td'),
- 'AltName' => Array( 'title'=>'la_col_AltName' ),
- 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td' ),
- 'Enabled' => Array( 'title'=>'la_col_ImageEnabled' ),
- 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'preview' ),
- ),
-
- ),
- ),*/
);
\ No newline at end of file
Index: in-commerce/units/zones/zones_config.php
===================================================================
--- in-commerce/units/zones/zones_config.php (revision 14516)
+++ in-commerce/units/zones/zones_config.php (working copy)
@@ -32,8 +32,8 @@
'TitlePresets' => Array (
'default' => Array (
'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'),
- 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),
- ),
+ 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),
+ ),
'zones_edit' => Array ( 'prefixes' => Array ('z'), 'format' => "#z_status# - '#z_titlefield#'"),
),
'TableName' => TABLE_PREFIX . 'ShippingZones',
@@ -59,7 +59,7 @@
'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
'Name' => Array (
'type' => 'string', 'max_len' => 100,
- 'required' => 1, 'default' => '', 'not_null' => 1,
+ 'required' => 1, 'default' => '', 'not_null' => 1,
'error_msgs' => Array ('required' => 'Please fill in'),
),
'Type' => Array (
@@ -69,7 +69,7 @@
1 => 'la_ByCountry',
2 => 'la_ByState',
3 => 'la_ByZIP'
- ),
+ ),
'not_null' => 1, 'default' => 1,
),
'CODallowed' => Array (
@@ -89,10 +89,10 @@
'module' => 'core',
),
'Fields' => Array (
- 'ZoneID' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
- 'Name' => Array ( 'title' => 'la_col_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
- 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
- 'CODallowed' => Array ( 'title' => 'la_col_CODallowed', 'filter_block' => 'grid_options_filter', 'width' => 120, )
+ 'ZoneID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+ 'Name' => Array ( 'title' => 'column:la_fld_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Type' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+ 'CODallowed' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 120, )
),
),
),
Index: in-link/install/english.lang
===================================================================
--- in-link/install/english.lang (revision 14516)
+++ in-link/install/english.lang (working copy)
@@ -1,15 +1,9 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_ActionsUponExpire" Module="In-Link" Type="1">QWN0aW9ucyBVcG9uIEV4cGlyYXRpb24=</PHRASE>
<PHRASE Label="la_ActionsUponPurchase" Module="In-Link" Type="1">QWN0aW9ucyBVcG9uIFB1cmNoYXNl</PHRASE>
<PHRASE Label="la_col_DupeCount" Module="In-Link" Type="1">RHVwbGljYXRlcw==</PHRASE>
- <PHRASE Label="la_col_ExpiresOn" Module="In-Link" Type="1">RXhwaXJlcyBPbg==</PHRASE>
- <PHRASE Label="la_col_LinkName" Module="In-Link" Type="1">TGluaw==</PHRASE>
- <PHRASE Label="la_col_LinkOwner" Module="In-Link" Type="1">T3duZXI=</PHRASE>
- <PHRASE Label="la_col_ListingTypeName" Module="In-Link" Type="1">TGlzdGluZyBUeXBl</PHRASE>
- <PHRASE Label="la_col_PendingRenewal" Module="In-Link" Type="1">UGVuZGluZyBSZW5ld2Fs</PHRASE>
- <PHRASE Label="la_col_PurchasedOn" Module="In-Link" Type="1">RW5hYmxlZCBPbg==</PHRASE>
<PHRASE Label="la_col_ValidatedOn" Module="In-Link" Type="1">VmFsaWRhdGVkIE9u</PHRASE>
<PHRASE Label="la_col_ValidationCode" Module="In-Link" Type="1">VmFsaWRhdGlvbiBDb2Rl</PHRASE>
<PHRASE Label="la_config_EnableLinkContactForm" Module="In-Link" Type="1">RW5hYmxlIExpbmsgQ29udGFjdCBGb3Jtcw==</PHRASE>
@@ -19,14 +13,14 @@
<PHRASE Label="la_fld_AdditionalSection" Module="In-Link" Type="1">QWRkaXRpb25hbCBTZWN0aW9u</PHRASE>
<PHRASE Label="la_fld_cust_l_ItemTemplate" Module="In-Link" Type="1">TGluayBJdGVtIFRlbXBsYXRl</PHRASE>
<PHRASE Label="la_fld_EnableBuying" Module="In-Link" Type="1">RW5hYmxlIFB1cmNoYXNpbmc=</PHRASE>
- <PHRASE Label="la_fld_ExpiresOn" Module="In-Link" Type="1">RXhwaXJhdGlvbiBEYXRl</PHRASE>
+ <PHRASE Label="la_fld_ExpiresOn" Module="In-Link" Type="1" Column="RXhwaXJlcyBPbg==">RXhwaXJhdGlvbiBEYXRl</PHRASE>
<PHRASE Label="la_fld_LinkAddress" Module="In-Link" Type="1">QWRkcmVzcw==</PHRASE>
<PHRASE Label="la_fld_LinkCity" Module="In-Link" Type="1">Q2l0eQ==</PHRASE>
<PHRASE Label="la_fld_LinkCountry" Module="In-Link" Type="1">Q291bnRyeQ==</PHRASE>
<PHRASE Label="la_fld_LinkEnableGoogleMaps" Module="In-Link" Type="1">RW5hYmxlIEdvb2dsZSBNYXBz</PHRASE>
<PHRASE Label="la_fld_LinkGoogleMapsAPIKey" Module="In-Link" Type="1">R29vZ2xlIE1hcHMgQVBJIEtleQ==</PHRASE>
- <PHRASE Label="la_fld_LinkName" Module="In-Link" Type="1">TGluayBOYW1l</PHRASE>
- <PHRASE Label="la_fld_LinkOwner" Module="In-Link" Type="1">TGluayBPd25lcg==</PHRASE>
+ <PHRASE Label="la_fld_LinkName" Module="In-Link" Type="1" Column="TGluaw==">TGluayBOYW1l</PHRASE>
+ <PHRASE Label="la_fld_LinkOwner" Module="In-Link" Type="1" Column="T3duZXI=">TGluayBPd25lcg==</PHRASE>
<PHRASE Label="la_fld_LinkPhone" Module="In-Link" Type="1">UGhvbmU=</PHRASE>
<PHRASE Label="la_fld_LinkState" Module="In-Link" Type="1">U3RhdGU=</PHRASE>
<PHRASE Label="la_fld_LinkStatus" Module="In-Link" Type="1">TGluayBTdGF0dXM=</PHRASE>
@@ -34,13 +28,11 @@
<PHRASE Label="la_fld_Link_MaxHotNumber" Module="In-Link" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIGxpbmtz</PHRASE>
<PHRASE Label="la_fld_Link_MinPopRating" Module="In-Link" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgbGluayBQT1A=</PHRASE>
<PHRASE Label="la_fld_Link_MinPopVotes" Module="In-Link" Type="1">TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgbGluayBQT1A=</PHRASE>
- <PHRASE Label="la_fld_ListingId" Module="In-Link" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_fld_ListingType" Module="In-Link" Type="1">TGlzdGluZyBUeXBl</PHRASE>
<PHRASE Label="la_fld_ListingTypeDescription" Module="In-Link" Type="1">RGVzY3JpcHRpb24=</PHRASE>
<PHRASE Label="la_fld_ListingTypeId" Module="In-Link" Type="1">SUQ=</PHRASE>
- <PHRASE Label="la_fld_ListingTypeName" Module="In-Link" Type="1">TmFtZQ==</PHRASE>
- <PHRASE Label="la_fld_PendingRenewal" Module="In-Link" Type="1">UGVuZGluZyBSZW5ld2Fs</PHRASE>
- <PHRASE Label="la_fld_PurchasedOn" Module="In-Link" Type="1">UHVyY2hhc2UgRGF0ZQ==</PHRASE>
+ <PHRASE Label="la_fld_ListingTypeName" Module="In-Link" Type="1" Column="TGlzdGluZyBUeXBl">TmFtZQ==</PHRASE>
+ <PHRASE Label="la_fld_PendingRenewal" Module="In-Link" Type="1" Column="UGVuZGluZyBSZW5ld2Fs">UGVuZGluZyBSZW5ld2Fs</PHRASE>
+ <PHRASE Label="la_fld_PurchasedOn" Module="In-Link" Type="1" Column="RW5hYmxlZCBPbg==">UHVyY2hhc2UgRGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_ReciprocalLinkFound" Module="In-Link" Type="1">UmVjaXByb2NhbCBMaW5rIFN0YXR1cw==</PHRASE>
<PHRASE Label="la_fld_Recurring" Module="In-Link" Type="1">UmVjdXJyaW5n</PHRASE>
<PHRASE Label="la_fld_RenewalReminder" Module="In-Link" Type="1">UmVuZXdhbCBSZW1pbmRlcg==</PHRASE>
Index: in-link/install/upgrades.sql
===================================================================
--- in-link/install/upgrades.sql (revision 14516)
+++ in-link/install/upgrades.sql (working copy)
@@ -130,4 +130,9 @@
SET VariableValue = 'in-link/links/link_detail'
WHERE VariableName = 'l_ItemTemplate' AND VariableValue = 'in-link/designs/detail';
+# ===== v 5.1.3-RC2 =====
+UPDATE Phrase
+SET `Module` = 'Core'
+WHERE PhraseKey IN ('LA_FLD_LISTINGID', 'LA_FLD_LISTINGTYPE');
+
# ===== v 5.1.3-RC2 =====
\ No newline at end of file
Index: in-link/units/link_validation/link_validation_config.php
===================================================================
--- in-link/units/link_validation/link_validation_config.php (revision 14516)
+++ in-link/units/link_validation/link_validation_config.php (working copy)
@@ -158,13 +158,13 @@
),
'Fields' => Array (
- 'ForeignLinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'module' => 'In-Link', 'width' => 60, ),
- 'LinkName' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_link_name_td', 'filter_block' => 'grid_like_filter', 'first_chars' => 30, 'width' => 180, ),
+ 'ForeignLinkId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'module' => 'In-Link', 'width' => 60, ),
+ 'LinkName' => Array ('data_block' => 'grid_link_name_td', 'filter_block' => 'grid_like_filter', 'first_chars' => 30, 'width' => 180, ),
'LinkUrl' => Array ('title' => 'la_col_LinkUrl', 'data_block' => 'grid_url_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'LinkValidationStatus' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 87, ),
+ 'LinkValidationStatus' => Array ('title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 87, ),
'ValidationCode' => Array ('title' => 'la_col_ValidationCode', 'filter_block' => 'grid_options_filter', 'width' => 155, ),
'ValidationTime' => Array ('title' => 'la_col_ValidatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'LinkCreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'LinkCreatedOn' => Array ('title' => 'column:la_fld_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
),
),
),
Index: in-link/units/links/links_config.php
===================================================================
--- in-link/units/links/links_config.php (revision 14516)
+++ in-link/units/links/links_config.php (working copy)
@@ -578,16 +578,16 @@
'NEW' => 'icon16_link_new.png',
),
'Fields' => Array (
- 'LinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Name' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
+ 'LinkId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Name' => Array ('title' => 'column:la_fld_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
'Url' => Array ('title' => 'la_col_LinkUrl', 'width' => 200, ),
- 'Description' => Array ('title' => 'la_col_Description', 'first_chars' => 100, 'width' => 100, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Modified' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'Hits' => Array ('title' => 'la_col_Hits', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'CachedRating' => Array ('title' => 'la_col_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Description' => Array ('first_chars' => 100, 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Hits' => Array ('filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'CachedRating' => Array ('title' => 'column:la_fld_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'CachedVotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'CachedReviewsQty' => Array ('title' => 'la_col_ReviewCount', 'filter_block' => 'grid_range_filter', 'width' => 85, ),
),
@@ -602,16 +602,16 @@
),
'Selector' => 'radio',
'Fields' => Array (
- 'LinkId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
- 'Name' => Array ('title' => 'la_col_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
+ 'LinkId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Name' => Array ('title' => 'column:la_fld_LinkName', 'data_block' => 'grid_catitem_td', 'width' => 200, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
'Url' => Array ('title' => 'la_col_LinkUrl', 'width' => 200, ),
- 'Description' => Array ('title' => 'la_col_Description', 'first_chars' => 100, 'width' => 100, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Modified' => Array ('title' => 'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'Hits' => Array ('title' => 'la_col_Hits', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'CachedRating' => Array ('title' => 'la_col_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+ 'Description' => Array ('first_chars' => 100, 'width' => 100, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'Hits' => Array ('filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'CachedRating' => Array ('title' => 'column:la_fld_Rating', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'CachedVotesQty' => Array ('title' => 'la_col_VoteCount', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
'CachedReviewsQty' => Array ('title' => 'la_col_ReviewCount', 'filter_block' => 'grid_range_filter', 'width' => 85, ),
),
@@ -626,7 +626,7 @@
),
'Fields' => Array (
- 'Name' => Array ('title' => 'la_col_LinkName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+ 'Name' => Array ('title' => 'column:la_fld_LinkName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
'Url' => Array ('title' => 'la_col_LinkUrl', 'filter_block' => 'grid_like_filter', 'width' => 300, ),
'DupeCount' => Array ('title' => 'la_col_DupeCount', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
),
Index: in-link/units/listing_types/listing_types_config.php
===================================================================
--- in-link/units/listing_types/listing_types_config.php (revision 14516)
+++ in-link/units/listing_types/listing_types_config.php (working copy)
@@ -152,9 +152,9 @@
'module' => 'core',
),
'Fields' => Array (
- 'ListingTypeId' => Array ( 'title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
- 'Name' => Array ( 'title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 250),
- 'Duration' => Array ( 'title' => 'la_col_Duration' , 'data_block' => 'duration_td', 'filter_block' => 'grid_like_filter', 'width' => 100),
+ 'ListingTypeId' => Array ( 'title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
+ 'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 250),
+ 'Duration' => Array ('data_block' => 'duration_td', 'filter_block' => 'grid_like_filter', 'width' => 100),
),
),
Index: in-link/units/listings/listings_config.php
===================================================================
--- in-link/units/listings/listings_config.php (revision 14516)
+++ in-link/units/listings/listings_config.php (working copy)
@@ -160,14 +160,14 @@
'module' => 'core',
'Fields' => Array (
- 'ListingId' => Array ( 'title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'LinkName' => Array ( 'title' => 'la_col_LinkName' , 'data_block' => 'link_td', 'filter_block' => 'grid_like_filter', 'width' => 170, ),
- 'ListingTypeId' => Array ( 'title' => 'la_col_ListingTypeName' , 'data_block' => 'listing_type_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'LinkOwner' => Array ( 'title' => 'la_col_LinkOwner', 'filter_block' => 'grid_like_filter', 'width' => 115, ),
- 'PendingRenewal' => Array ( 'title' => 'la_col_PendingRenewal', 'filter_block' => 'grid_options_filter', 'width' => 143, ),
- 'PurchasedOn' => Array ( 'title' => 'la_col_PurchasedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'ExpiresOn' => Array ( 'title' => 'la_col_ExpiresOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'Status' => Array ( 'title' => 'la_col_Status' , 'filter_block' => 'grid_options_filter'),
+ 'ListingId' => Array ( 'title' => 'column:la_fld_Id' , 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'LinkName' => Array ('data_block' => 'link_td', 'filter_block' => 'grid_like_filter', 'width' => 170, ),
+ 'ListingTypeId' => Array ( 'title' => 'column:la_fld_ListingTypeName' , 'data_block' => 'listing_type_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'LinkOwner' => Array ('filter_block' => 'grid_like_filter', 'width' => 115, ),
+ 'PendingRenewal' => Array ('filter_block' => 'grid_options_filter', 'width' => 143, ),
+ 'PurchasedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'ExpiresOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter'),
),
),
),
Index: in-news/install/english.lang
===================================================================
--- in-news/install/english.lang (revision 14516)
+++ in-news/install/english.lang (working copy)
@@ -1,4 +1,4 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
<PHRASES>
<PHRASE Label="la_Article_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
@@ -7,18 +7,13 @@
<PHRASE Label="la_Article_Hits" Module="In-News" Type="1">SGl0cw==</PHRASE>
<PHRASE Label="la_Article_Rating" Module="In-News" Type="1">UmF0aW5n</PHRASE>
<PHRASE Label="la_Article_Title" Module="In-News" Type="1">QXJ0aWNsZSBUaXRsZQ==</PHRASE>
- <PHRASE Label="la_col_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
- <PHRASE Label="la_col_EndOn" Module="In-News" Type="1">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
- <PHRASE Label="la_col_LeadCatStory" Module="In-News" Type="1">U2VjdGlvbiBMZWFk</PHRASE>
- <PHRASE Label="la_col_LeadStory" Module="In-News" Type="1">U2l0ZSBMZWFk</PHRASE>
- <PHRASE Label="la_col_StartDate" Module="In-News" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
- <PHRASE Label="la_fld_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
+ <PHRASE Label="la_fld_Author" Module="In-News" Type="1" Column="QXV0aG9y">QXV0aG9y</PHRASE>
<PHRASE Label="la_fld_Body" Module="In-News" Type="1">QXJ0aWNsZSBCb2R5</PHRASE>
<PHRASE Label="la_fld_cust_n_ItemTemplate" Module="In-News" Type="1">TmV3cyBJdGVtIFRlbXBsYXRl</PHRASE>
- <PHRASE Label="la_fld_EndOn" Module="In-News" Type="1">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
+ <PHRASE Label="la_fld_EndOn" Module="In-News" Type="1" Column="QXJjaGl2YXRpb24gRGF0ZQ==">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
<PHRASE Label="la_fld_Excerpt" Module="In-News" Type="1">QXJ0aWNsZSBFeGNlcnB0</PHRASE>
- <PHRASE Label="la_fld_LeadCatStory" Module="In-News" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5</PHRASE>
- <PHRASE Label="la_fld_LeadStory" Module="In-News" Type="1">U2l0ZSBMZWFkIFN0b3J5</PHRASE>
+ <PHRASE Label="la_fld_LeadCatStory" Module="In-News" Type="1" Column="U2VjdGlvbiBMZWFk">U2VjdGlvbiBMZWFkIFN0b3J5</PHRASE>
+ <PHRASE Label="la_fld_LeadStory" Module="In-News" Type="1" Column="U2l0ZSBMZWFk">U2l0ZSBMZWFkIFN0b3J5</PHRASE>
<PHRASE Label="la_fld_News_MaxHotNumber" Module="In-News" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIGFydGljbGVz</PHRASE>
<PHRASE Label="la_fld_News_MinPopRating" Module="In-News" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
<PHRASE Label="la_fld_News_MinPopVotes" Module="In-News" Type="1">TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
@@ -34,7 +29,6 @@
<PHRASE Label="la_fld_RssSource" Module="In-News" Type="1">U291cmNlIFVSTA==</PHRASE>
<PHRASE Label="la_fld_RssUpdateInterval" Module="In-News" Type="1">VXBkYXRlIEludGVydmFs</PHRASE>
<PHRASE Label="la_fld_RssUpdateIntervalType" Module="In-News" Type="1">VXBkYXRlIEludGVydmFsIFR5cGU=</PHRASE>
- <PHRASE Label="la_fld_StartDate" Module="In-News" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
<PHRASE Label="la_In-news" Module="In-News" Type="1">SW4tTmV3cw==</PHRASE>
<PHRASE Label="la_ItemTab_News" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
<PHRASE Label="la_news_daysarchive_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGRheXMgdG8gYXJjaGl2ZSBhcnRpY2xlcyBhdXRvbWF0aWNhbGx5</PHRASE>
Index: in-news/install/upgrades.sql
===================================================================
--- in-news/install/upgrades.sql (revision 14516)
+++ in-news/install/upgrades.sql (working copy)
@@ -114,4 +114,9 @@
SET VariableValue = 'in-news/articles/article_detail'
WHERE VariableName = 'n_ItemTemplate' AND VariableValue = 'in-news/designs/detail';
+# ===== v 5.1.3-RC2 =====
+UPDATE Phrase
+SET `Module` = 'Core'
+WHERE PhraseKey = 'LA_FLD_STARTDATE';
+
# ===== v 5.1.3-RC2 =====
\ No newline at end of file
Index: in-news/units/articles/articles_config.php
===================================================================
--- in-news/units/articles/articles_config.php (revision 14516)
+++ in-news/units/articles/articles_config.php (working copy)
@@ -397,9 +397,9 @@
'CachedVotesQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
'CreatedById' => Array (
'type' => 'int',
- 'formatter' => 'kLEFTFormatter',
+ 'formatter' => 'kLEFTFormatter',
'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
- 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
+ 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
WHERE `%s` = \'%s\'',
'left_key_field' => 'PortalUserId',
'left_title_field' => 'Login',
@@ -517,16 +517,16 @@
),
'Fields' => Array (
- 'NewsId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'LeadStory' => Array ('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'LeadCatStory' => Array ('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'StartDate' => Array ('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'EndOn' => Array ('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'NewsId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Title' => Array ('data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'UserName' => Array ('title' => 'column:la_fld_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'LeadStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
),
),
@@ -542,16 +542,16 @@
'Selector' => 'radio',
'Fields' => Array (
- 'NewsId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
- 'Title' => Array ('title' => 'la_col_Title', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
- 'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
- 'UserName' => Array ('title' => 'la_col_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
- 'LeadStory' => Array ('title' => 'la_col_LeadStory', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
- 'LeadCatStory' => Array ('title' => 'la_col_LeadCatStory', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
- 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
- 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'StartDate' => Array ('title' => 'la_col_StartDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
- 'EndOn' => Array ('title' => 'la_col_EndOn', 'data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'NewsId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+ 'Title' => Array ('data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+ 'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+ 'UserName' => Array ('title' => 'column:la_fld_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+ 'LeadStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
+ 'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
+ 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+ 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+ 'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
),
),
),
phrase_storage_automation_themes_v2.patch [^] (2,881 bytes) 2011-09-17 06:15
[Show Content]
Index: _install/english.lang
===================================================================
--- _install/english.lang (revision 14516)
+++ _install/english.lang (working copy)
@@ -154,6 +154,7 @@
<PHRASE Label="lu_fld_body" Module="Core" Type="0">Qm9keQ==</PHRASE>
<PHRASE Label="lu_fld_Captcha" Module="Core" Type="0">Q2FwdGNoYSBJbWFnZQ==</PHRASE>
<PHRASE Label="lu_fld_City" Module="Core" Type="0">Q2l0eQ==</PHRASE>
+ <PHRASE Label="lu_fld_ColumnTranslation" Module="Core" Type="0">Q29sdW1uIFRyYW5zbGF0aW9u</PHRASE>
<PHRASE Label="lu_fld_Comment" Module="Core" Type="0">Q29tbWVudA==</PHRASE>
<PHRASE Label="lu_fld_Company" Module="Core" Type="0">Q29tcGFueQ==</PHRASE>
<PHRASE Label="lu_fld_Country" Module="Core" Type="0">Q291bnRyeQ==</PHRASE>
@@ -167,6 +168,7 @@
<PHRASE Label="lu_fld_FileName" Module="Core" Type="0">RmlsZW5hbWU=</PHRASE>
<PHRASE Label="lu_fld_FirstName" Module="Core" Type="0">Rmlyc3QgbmFtZQ==</PHRASE>
<PHRASE Label="lu_fld_FullName" Module="Core" Type="0">RnVsbCBuYW1l</PHRASE>
+ <PHRASE Label="lu_fld_HintTranslation" Module="Core" Type="0">SGludCBUcmFuc2xhdGlvbg==</PHRASE>
<PHRASE Label="lu_fld_Image1" Module="Core" Type="0">Mm5kIEltYWdl</PHRASE>
<PHRASE Label="lu_fld_Image2" Module="Core" Type="0">M3JkIEltYWdl</PHRASE>
<PHRASE Label="lu_fld_LastName" Module="Core" Type="0">TGFzdCBuYW1l</PHRASE>
Index: phrases_edit.tpl
===================================================================
--- phrases_edit.tpl (revision 14516)
+++ phrases_edit.tpl (working copy)
@@ -54,8 +54,11 @@
<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="lu_fld_primary_translation"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="lu_fld_phrase" style="width: 300px;"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="lu_fld_translation" cols="52" rows="6" format="no_default" style="width: 300px; height: 100px;"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="HintTranslation" title="lu_fld_HintTranslation" cols="52" rows="3" format="no_default" style="width: 300px; height: 50px;"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="ColumnTranslation" title="lu_fld_ColumnTranslation" cols="52" rows="3" format="no_default" style="width: 300px; height: 50px;"/>
+
<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="lu_fld_module" is_last="1"/>
-
+
<inp2:m_RenderElement design="inp_edit_buttons" width="150">
<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get var="phrases_label"/>" />
<input type="hidden" id="next_template" name="next_template" value="<inp2:m_get var="next_template"/>" />
phrase_storage_automation_core_v3.patch [^] (187,204 bytes) 2011-09-18 08:50
[Show Content]
Index: admin/system_presets/simple/phrases_phrases.php
===================================================================
--- admin/system_presets/simple/phrases_phrases.php (revision 14516)
+++ admin/system_presets/simple/phrases_phrases.php (working copy)
@@ -1,13 +1,12 @@
<?php
-
defined('FULL_PATH') or die('restricted access!');
- // remove section
+ // section removal
$remove_sections = Array (
// 'in-portal:phrases',
);
- // section in debug mode
+ // sections shown with debug on
$debug_only_sections = Array (
'in-portal:phrases',
);
@@ -22,15 +21,39 @@
// edit phrase
// 'phrase_edit_single' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+ );
+ // fields to hide
+ $hidden_fields = Array (
+ /*'PhraseId', 'Phrase', 'PhraseKey', 'Translation', 'HintTranslation', 'ColumnTranslation',
+ 'PhraseType', 'LastChanged', 'LastChangeIP', 'Module',*/
);
+ // virtual fields to hide
+ $virtual_hidden_fields = Array (
+ /*'PrimaryTranslation', 'CurrentTranslation', 'CurrentHintTranslation', 'CurrentColumnTranslation',
+ 'LangFile', 'ImportOverwrite', 'DoNotEncode', 'ExportPhrases', 'ExportEmailEvents'*/
+ );
+
+ $debug_only_fields = Array (
+// 'HintTranslation', 'ColumnTranslation'
+ );
+
+ // fields to make required
+ $required_fields = Array (
+ 'Phrase', 'Translation', 'PhraseType', 'Module'
+ );
+
+ // virtual fields to make required
+ $virtual_required_fields = Array (
+
+ );
+
// hide columns in grids
$hide_columns = Array (
// default grid
-// 'Default' => Array ('Phrase', 'Translation', 'PrimaryTranslation', 'PhraseType', 'LastChanged', 'Module'),
+// 'Default' => Array ('PhraseId', 'Phrase', 'CurrentTranslation', 'PrimaryTranslation', 'PhraseType', 'LastChanged', 'Module', 'CurrentHintTranslation', 'CurrentColumnTranslation'),
// single list of phrases
-// 'Phrases' => Array ('PhraseId', 'Phrase', 'Translation', 'PackName', 'PhraseType', 'LastChanged', 'Module'),
- );
-
+// 'Phrases' => Array ('PhraseId', 'Phrase', 'CurrentTranslation', 'PhraseType', 'LastChanged', 'Module', 'CurrentHintTranslation', 'CurrentColumnTranslation'),
+ );
\ No newline at end of file
Index: core/admin_templates/categories/permissions_tab.tpl
===================================================================
--- core/admin_templates/categories/permissions_tab.tpl (revision 14516)
+++ core/admin_templates/categories/permissions_tab.tpl (working copy)
@@ -67,7 +67,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder_full">
<inp2:m_set odd_even="table-color1"/>
<thead class="subsectiontitle">
- <td><inp2:m_phrase name="la_col_Description"/></td>
+ <td><inp2:m_phrase name="column:la_fld_Description"/></td>
<td><inp2:m_phrase name="la_col_Inherited"/></td>
<td><inp2:m_phrase name="la_col_InheritedFrom"/></td>
<td><inp2:m_phrase name="la_col_Access"/></td>
Index: core/admin_templates/incs/custom_blocks.tpl
===================================================================
--- core/admin_templates/incs/custom_blocks.tpl (revision 14516)
< |