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 @@
Index: custom/install/english.lang
===================================================================
--- custom/install/english.lang (revision 14516)
+++ custom/install/english.lang (working copy)
@@ -1,10 +1,8 @@
-
- m/d/Yg:i Am/d/Yg:i:s A.,utf-82
+
+
- R29vZA==
- UGhvbmU=
RGF0YSBmaWxl
- R29vZA==
+ R29vZA==
Q3VzdG9t
RGVmYXVsdA==
V2lkZ2V0cw==
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 @@
-
- m/d/Yg:i Am/d/Yg:i:s A.,utf-8http://docs.in-portal.org/eng/index.php2
+
+
QWRkIGEgY3VzdG9tIGRldGFpbA==
QVNQ
@@ -7,55 +7,36 @@
Q2FuY2VsbGVk
Y2hvb3Nlbg==
Q2xvc2luZyBSYXRl
- QW5zd2VyIFN0YXR1cw==
- QXV0byBSZWxpc3Q=
Qg==
- QmlkIENvdW50ZXI=
Qmlkcw==
QnV5SXROb3c=
Q2xvc2VkIE9u
Q2xvc2luZyBUaW1l
- TWluLiBRdHk=
Q3VycmVudCBCaWQ=
- Q3VycmVudCBQcmljZQ==
- RHVyYXRpb24gU2Vjb25kcw==
ZUJheSBBbW91bnQ=
ZUJheSBHTVY=
ZUJheSBMaXN0aW5n
ZUJheSBQcm9maXQ=
ZUJheSBRdHk=
- RW5kIFRpbWU=
Rg==
Rkg=
- Rml4ZWQ=
RlA=
Rw==
R1A=
SA==
- TGFzdCBQcm9jZXNzZWQ=
RHVyYXRpb24=
- TGlzdGluZyBJZA==
- TGlzdGluZyBUeXBl
- TG9nIElk
- T3JpZ2luYWwgTGlzdGluZyBJZA==
UGFpZA==
- UGF5UGFsIFNlbGxlciBFbWFpbA==
UHJvZHVjdCBJZA==
UmVsaXN0
- UmVxdWVzdCBUaW1l
- UmVxdWVzdCBUeXBl
UmVzZXJ2ZQ==
UmVzZXJ2ZSBQcmljZQ==
U2NoZWR1bGU=
U29sZA==
- U3RhcnQgVGltZQ==
U3RvcmUgQW1vdW50
U3RvcmUgR01W
U3RvcmUgUHJvZml0
U3RvcmUgUXR5
VGVtcGxhdGUgTmFtZQ==
- VXNlIEdhbGxlcnk=
- VXNlIEdhbGxlcnkgUGx1cw==
V2lubmVy
V2lubmluZyBCaWQ=
Q29tcGxldGVk
@@ -89,32 +70,31 @@
ZUJheSBTdG9yZSAvIEZpeGVk
RW5kZWQ=
RmVlcw==
- QW5zd2Vy
- QW5zd2VyIFN0YXR1cw==
+ QW5zd2VyIFN0YXR1cw==
QXVjdGlvbiBCdXkgSXQgTm93IFByaWNl
QXVjdGlvbiBMaXN0aW5nIER1cmF0aW9u
QXVjdGlvbiBQcmltYXJ5IENhdGVnb3J5IElE
QXVjdGlvbiBSZXNlcnZlIFByaWNl
QXVjdGlvbiBTZWNvbmRhcnkgQ2F0ZWdvcnkgSUQ=
QXVjdGlvbiBTdGFydCBQcmljZQ==
- QXV0byBSZWxpc3Q=
- QmlkIENvdW50ZXI=
+ QXV0byBSZWxpc3Q=
+ QmlkIENvdW50ZXI=
QmxvY2sgRnJvbSBTY2hlZHVsaW5n
- TWluLiBRdHk=
- Q3VycmVudCBQcmljZQ==
+ TWluLiBRdHk=
+ Q3VycmVudCBQcmljZQ==
RGV0YWlsIFRlbXBsYXRl
RGV0YWlsIFRlbXBsYXRlIEJvZHk=
RGV0YWlsIFRlbXBsYXRlIElk
- RHVyYXRpb24gU2Vjb25kcw==
+ RHVyYXRpb24gU2Vjb25kcw==
ZUJheSBMaXN0aW5nIElk
- RW5kIFRpbWU=
+ RW5kIFRpbWU=
RW5oYW5jZW1lbnQgQm9sZCBUaXRsZQ==
RW5oYW5jZW1lbnQgQm9yZGVy
RW5oYW5jZW1lbnQgRmVhdHVyZWQ=
RW5oYW5jZW1lbnQgSGlnaGxpZ2h0
RW5oYW5jZW1lbnQgSG9tZSBQYWdlIEZlYXR1cmVk
RXJyb3Jz
- Rml4ZWQ=
+ Rml4ZWQ=
R2V0IEl0IEZhc3Q=
SGFzIFJldHVybiBQb2xpY3k=
SGl0IENvdW50ZXI=
@@ -122,26 +102,26 @@
SW1hZ2UgVVJMcw==
SW5zdXJhbmNlIEFtb3VudA==
SW5zdXJhbmNlIFR5cGU=
- TGFzdCBQcm9jZXNzZWQ=
+ TGFzdCBQcm9jZXNzZWQ=
TGlzdGluZyBEZXNjcmlwdGlvbg==
- TGlzdGluZyBRdWFudGl0eQ==
+ TGlzdGluZyBRdWFudGl0eQ==
TGlzdGluZyBUaXRsZQ==
TGlzdGluZyBJZA==
- TG9nIElk
- T3JpZ2luYWwgTGlzdGluZyBJZA==
+ TG9nIElk
+ T3JpZ2luYWwgTGlzdGluZyBJZA==
UGF5bWVudCBJbnN0cnVjdGlvbnM=
UGF5bWVudCBNZXRob2Q=
- UGF5UGFsIFNlbGxlciBFLW1haWw=
+ UGF5UGFsIFNlbGxlciBFLW1haWw=
UmVmdW5kIFR5cGU=
UmVxdWVzdA==
- UmVxdWVzdCBUaW1l
- UmVxdWVzdCBUeXBl
+ UmVxdWVzdCBUaW1l
+ UmVxdWVzdCBUeXBl
UmV0dXJuIFBvbGljeSBEZXRhaWxz
UmV0dXJuIFJlcXVlc3QgRGF5cw==
U2NoZWR1bGU=
U2NoZWR1bGUgSWQ=
U2hpcHBpbmcgQXMgUGFyZW50
- U3RhcnQgVGltZQ==
+ U3RhcnQgVGltZQ==
U3RvcmUgQnV5IEl0IE5vdyBQcmljZQ==
U3RvcmUgTGlzdGluZyBEdXJhdGlvbg==
U3RvcmUgUHJpbWFyeSBDYXRlZ29yeQ==
@@ -150,8 +130,8 @@
U3RvcmUgU2Vjb25kYXJ5IENhdGVnb3J5IElE
U3VidGl0bGU=
VGVtcGxhdGUgQm9keQ==
- VXNlIEdhbGxlcnk=
- VXNlIEdhbGxlcnkgUGx1cw==
+ VXNlIEdhbGxlcnk=
+ VXNlIEdhbGxlcnkgUGx1cw==
VXNlIEluc3VyYW5jZQ==
V2VlayBEYXlz
RnJpZGF5
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 =====
+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 @@
-
+
- Q2Vuc29yZWQgV29yZA==
VXNlcg==
- S2V5IFN0cm9rZQ==
TGFzdCBQb3N0IE9u
RGF0ZS9UaW1l
RGF5cyBBY3RpdmU=
- Q29tbWVudA==
- UG9zdGVy
UmVwbGllcw==
- UmVwbGFjZW1lbnQ=
VG9waWM=
- Vmlld3M=
Vm90ZXM=
QWxsb3cgQ29tbWVudHM=
QWxsb3cgTXVsdGlwbGUgVm90aW5ncw==
- Q2Vuc29yZWQgV29yZA==
+ Q2Vuc29yZWQgV29yZA==
VG9waWNzIEl0ZW0gVGVtcGxhdGU=
- RW5kIERhdGU=
- S2V5IFN0cm9rZQ==
+ RW5kIERhdGU=
+ S2V5IFN0cm9rZQ==
QW5zd2Vy
- Q29tbWVudA==
+ Q29tbWVudA==
R3Vlc3QgRW1haWw=
R3Vlc3QgTmFtZQ==
- UG9zdGVkIEJ5
+ UG9zdGVkIEJ5
UXVlc3Rpb24=
- UmVxdWlyZSBMb2dpbg==
VG9waWMgTG9ja2Vk
TWF4aW11bSBudW1iZXIgb2YgSE9UIHRvcGljcw==
TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgdG9waWMgUE9Q
TWluaW11bSBudW1iZXIgb2YgcG9zdHMgdG8gY29uc2lkZXIgdG9waWMgUE9Q
- Vmlld3M=
+ Vmlld3M=
SW4tQnVsbGV0aW4=
VG9waWNz
TGFzdCBQb3N0ZXI=
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 =====
\ No newline at end of file
+# ===== v 5.1.3-RC2 =====
+
+# ===== v 5.1.3 =====
+UPDATE Phrase
+SET `Module` = 'Core'
+WHERE PhraseKey = 'LA_FLD_REQUIRELOGIN';
\ 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 @@
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 @@
colspan="2" nowrap> |
|
- |
+ |
|
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 @@