Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -r14570 -r14583 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14570) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14583) @@ -121,4 +121,18 @@ # ===== v 5.1.2-RC1 ===== -# ===== v 5.1.2 ===== \ No newline at end of file +# ===== v 5.1.2 ===== + +# ===== v 5.1.3-B1 ===== + +# ===== v 5.1.3-RC1 ===== +UPDATE ConfigurationValues +SET VariableValue = 'in-link/links/link_detail' +WHERE VariableName = 'l_ItemTemplate' AND VariableValue = 'in-link/designs/detail'; + +# ===== v 5.1.3-RC2 ===== + +# ===== v 5.1.3 ===== +UPDATE Phrase +SET `Module` = 'Core' +WHERE PhraseKey IN ('LA_FLD_LISTINGID', 'LA_FLD_LISTINGTYPE'); \ No newline at end of file Index: branches/5.2.x/units/listings/listings_config.php =================================================================== diff -u -r14254 -r14583 --- branches/5.2.x/units/listings/listings_config.php (.../listings_config.php) (revision 14254) +++ branches/5.2.x/units/listings/listings_config.php (.../listings_config.php) (revision 14583) @@ -1,6 +1,6 @@ '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: branches/5.2.x/admin_templates/catalog_tab.tpl =================================================================== diff -u -r14254 -r14583 --- branches/5.2.x/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 14254) +++ branches/5.2.x/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 14583) @@ -38,7 +38,8 @@ Grids[''].AddAlternativeGrid('', true); Grids[''].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6')); - $Catalog.reflectPasteButton(); + + $Catalog.setViewMenu(''); Grids[''].DblClick = function() {return false}; Index: branches/5.2.x/units/link_validation/link_validation_config.php =================================================================== diff -u -r14254 -r14583 --- branches/5.2.x/units/link_validation/link_validation_config.php (.../link_validation_config.php) (revision 14254) +++ branches/5.2.x/units/link_validation/link_validation_config.php (.../link_validation_config.php) (revision 14583) @@ -1,6 +1,6 @@ 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: branches/5.2.x/units/listing_types/listing_types_config.php =================================================================== diff -u -r14254 -r14583 --- branches/5.2.x/units/listing_types/listing_types_config.php (.../listing_types_config.php) (revision 14254) +++ branches/5.2.x/units/listing_types/listing_types_config.php (.../listing_types_config.php) (revision 14583) @@ -1,6 +1,6 @@ '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: branches/5.2.x/install/english.lang =================================================================== diff -u -r14254 -r14583 --- branches/5.2.x/install/english.lang (.../english.lang) (revision 14254) +++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14583) @@ -1,15 +1,9 @@ - + QWN0aW9ucyBVcG9uIEV4cGlyYXRpb24= QWN0aW9ucyBVcG9uIFB1cmNoYXNl RHVwbGljYXRlcw== - RXhwaXJlcyBPbg== - TGluaw== - T3duZXI= - TGlzdGluZyBUeXBl - UGVuZGluZyBSZW5ld2Fs - RW5hYmxlZCBPbg== VmFsaWRhdGVkIE9u VmFsaWRhdGlvbiBDb2Rl RW5hYmxlIExpbmsgQ29udGFjdCBGb3Jtcw== @@ -19,28 +13,26 @@ QWRkaXRpb25hbCBTZWN0aW9u TGluayBJdGVtIFRlbXBsYXRl RW5hYmxlIFB1cmNoYXNpbmc= - RXhwaXJhdGlvbiBEYXRl + RXhwaXJhdGlvbiBEYXRl QWRkcmVzcw== Q2l0eQ== Q291bnRyeQ== RW5hYmxlIEdvb2dsZSBNYXBz R29vZ2xlIE1hcHMgQVBJIEtleQ== - TGluayBOYW1l - TGluayBPd25lcg== + TGluayBOYW1l + TGluayBPd25lcg== UGhvbmU= U3RhdGU= TGluayBTdGF0dXM= WmlwIGNvZGU= TWF4aW11bSBudW1iZXIgb2YgSE9UIGxpbmtz TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgbGluayBQT1A= TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgbGluayBQT1A= - SUQ= - TGlzdGluZyBUeXBl RGVzY3JpcHRpb24= SUQ= - TmFtZQ== - UGVuZGluZyBSZW5ld2Fs - UHVyY2hhc2UgRGF0ZQ== + TmFtZQ== + UGVuZGluZyBSZW5ld2Fs + UHVyY2hhc2UgRGF0ZQ== UmVjaXByb2NhbCBMaW5rIFN0YXR1cw== UmVjdXJyaW5n UmVuZXdhbCBSZW1pbmRlcg== Index: branches/5.2.x/install/install_data.sql =================================================================== diff -u -r14570 -r14583 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14570) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14583) @@ -32,7 +32,7 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_LinkReviews', '10', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 20.03, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_LinkReviews_Short', '3', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_review_perpage_short_prompt', 'text', NULL, NULL, 20.04, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_CategoryTemplate', '/in-link/designs/section', 'In-Link', 'in-link:configuration_output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 30.01, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_ItemTemplate', 'in-link/designs/detail', 'In-Link', 'in-link:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 30.02, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_ItemTemplate', 'in-link/links/link_detail', 'In-Link', 'in-link:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 30.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_MaxImageCount', '5', 'In-Link', 'in-link:configuration_output', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 40.01, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_ThumbnailImageWidth', '120', 'In-Link', 'in-link:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 40.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_ThumbnailImageHeight', '120', 'In-Link', 'in-link:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 40.03, 0, 0, NULL); @@ -244,4 +244,4 @@ INSERT INTO Counters VALUES (DEFAULT, 'linkhits_count', 'SELECT ROUND(SUM(Hits)) FROM <%PREFIX%>Link', NULL, NULL, '300', '0', '|Link|'); -INSERT INTO Modules VALUES ('In-Link', 'modules/in-link/', 'l', DEFAULT, 1, 1, 'in-link/', 2, NULL); +INSERT INTO Modules VALUES ('In-Link', 'modules/in-link/', 'l', DEFAULT, 1, 1, 'in-link/', 2, NULL, NULL); Index: branches/5.2.x/admin_templates/links/links_custom.tpl =================================================================== diff -u -r14254 -r14583 --- branches/5.2.x/admin_templates/links/links_custom.tpl (.../links_custom.tpl) (revision 14254) +++ branches/5.2.x/admin_templates/links/links_custom.tpl (.../links_custom.tpl) (revision 14583) @@ -2,7 +2,7 @@ - + @@ -50,22 +50,24 @@ - - - - - +
+ + + - - - - - +
+ + + + +
+
+ \ No newline at end of file Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -r14570 -r14583 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14570) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14583) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.2-B1'), '5.1.2-RC1' => Array ('Core' => '5.1.2-RC1'), '5.1.2' => Array ('Core' => '5.1.2'), + '5.1.3-B1' => Array ('Core' => '5.1.3-B2'), + '5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'), + '5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'), + '5.1.3' => Array ('Core' => '5.1.3'), ); } Index: branches/5.2.x/units/links/links_config.php =================================================================== diff -u -r14570 -r14583 --- branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 14570) +++ branches/5.2.x/units/links/links_config.php (.../links_config.php) (revision 14583) @@ -1,6 +1,6 @@ '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, ), ),