Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_sections.png =================================================================== diff -u -N -r12512 -r12542 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_select_user_f3.gif =================================================================== diff -u -N -r12495 -r12542 Binary files differ Index: branches/5.0.x/core/units/related_searches/related_searches_config.php =================================================================== diff -u -N -r12299 -r12542 --- branches/5.0.x/core/units/related_searches/related_searches_config.php (.../related_searches_config.php) (revision 12299) +++ branches/5.0.x/core/units/related_searches/related_searches_config.php (.../related_searches_config.php) (revision 12542) @@ -1,6 +1,6 @@ Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used + 'Icons' => Array( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png' + ), 'Fields' => Array( 'RelatedSearchId' => Array( 'title'=>'la_col_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'), Index: branches/5.0.x/core/units/email_messages/email_messages_config.php =================================================================== diff -u -N -r12495 -r12542 --- branches/5.0.x/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 12495) +++ branches/5.0.x/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 12542) @@ -1,6 +1,6 @@ Array( 'Default' => Array( -// 'Icons' => Array('default'=>'icon16_custom.gif'), +// 'Icons' => Array('default'=>'icon16_item.png'), 'Fields' => Array( 'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 60, ), 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 60, ), Index: branches/5.0.x/core/units/relationship/relationship_config.php =================================================================== diff -u -N -r12299 -r12542 --- branches/5.0.x/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 12299) +++ branches/5.0.x/core/units/relationship/relationship_config.php (.../relationship_config.php) (revision 12542) @@ -1,6 +1,6 @@ Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif','1_0'=>'icon16_relation_one-way.gif','0_0'=>'icon16_relation_one-way_disabled.gif','1_1'=>'icon16_relation_reciprocal.gif','0_1'=>'icon16_relation_reciprocal_disabled.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used + 'Icons' => Array( + 'default' => 'icon16_item.png', + '1_0' => 'icon16_relation_one-way.gif', + '0_0' => 'icon16_relation_one-way_disabled.gif', + '1_1' => 'icon16_relation_reciprocal.gif', + '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'), 'ItemName' => Array( 'title'=>'la_col_TargetId', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), Index: branches/5.0.x/core/units/categories/categories_config.php =================================================================== diff -u -N -r12518 -r12542 --- branches/5.0.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 12518) +++ branches/5.0.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 12542) @@ -1,6 +1,6 @@ TABLE_PREFIX.'Category', 'ViewMenuPhrase' => 'la_text_Categories', - 'CatalogTabIcon' => 'icon16_section.png', + 'CatalogTabIcon' => 'icon16_sections.png', 'TitlePresets' => Array ( 'default' => Array ( Index: branches/5.0.x/core/units/statistics/statistics_config.php =================================================================== diff -u -N -r12299 -r12542 --- branches/5.0.x/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 12299) +++ branches/5.0.x/core/units/statistics/statistics_config.php (.../statistics_config.php) (revision 12542) @@ -1,6 +1,6 @@ Array( 'Default' => Array( - 'Icons' => Array('default' => 'icon16_custom.gif'), + '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'), Index: branches/5.0.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r12481 -r12542 --- branches/5.0.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 12481) +++ branches/5.0.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 12542) @@ -1,6 +1,6 @@ Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array ('default' => 'icon16_item.png'), 'Fields' => Array (), ) ); Index: branches/5.0.x/core/admin_templates/popups/translator.tpl =================================================================== diff -u -N -r12117 -r12542 --- branches/5.0.x/core/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/popups/translator.tpl (.../translator.tpl) (revision 12542) @@ -34,7 +34,7 @@ - + Index: branches/5.0.x/core/units/languages/languages_config.php =================================================================== diff -u -N -r12535 -r12542 --- branches/5.0.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 12535) +++ branches/5.0.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 12542) @@ -1,6 +1,6 @@ Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif', '0_0' => 'icon16_language_disabled.gif', '1_0' => 'icon16_language.gif', '0_1' => 'icon16_language_disabled.gif', '1_1' => 'icon16_language_primary.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + '0_0' => 'icon16_disabled.png', + '0_1' => 'icon16_disabled.png', + '1_0' => 'icon16_item.png', + '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), Index: branches/5.0.x/core/admin_templates/login.tpl =================================================================== diff -u -N -r12520 -r12542 --- branches/5.0.x/core/admin_templates/login.tpl (.../login.tpl) (revision 12520) +++ branches/5.0.x/core/admin_templates/login.tpl (.../login.tpl) (revision 12542) @@ -153,7 +153,7 @@ - 401 Authentication Required +

401 Authentication Required

Index: branches/5.0.x/core/admin_templates/img/icons/icon24_translate.png =================================================================== diff -u -N Binary files differ Index: branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -N -r12497 -r12542 --- branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 12497) +++ branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 12542) @@ -256,14 +256,14 @@ - ,-cdata', '-cdata:cust_', 'popups/translator', , 1);" title=""> + ,-cdata', '-cdata:cust_', 'popups/translator', , 1);" title=""> ');"> - ,-cdata', '-cdata:cust_', 'popups/translator', );" title=""> + ,-cdata', '-cdata:cust_', 'popups/translator', );" title=""> Index: branches/5.0.x/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r12509 -r12542 --- branches/5.0.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 12509) +++ branches/5.0.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 12542) @@ -240,7 +240,7 @@  *:
- + @@ -535,7 +535,7 @@  *:
');"> - ', '', 'popups/translator', 1);" title=""> + ', '', 'popups/translator', 1);" title="">   Index: branches/5.0.x/core/units/config_search/config_search_config.php =================================================================== diff -u -N -r12299 -r12542 --- branches/5.0.x/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 12299) +++ branches/5.0.x/core/units/config_search/config_search_config.php (.../config_search_config.php) (revision 12542) @@ -1,6 +1,6 @@ Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used + 'Icons' => Array('default' => 'icon16_item.png'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used 'Fields' => Array( 'TableName' => Array( 'title'=>'la_col_TableName', 'data_block' => 'grid_data_td'), 'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_data_td' ), Index: branches/5.0.x/core/units/stylesheets/stylesheets_config.php =================================================================== diff -u -N -r12299 -r12542 --- branches/5.0.x/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 12299) +++ branches/5.0.x/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 12542) @@ -1,6 +1,6 @@ Array( 'Default' => Array( - 'Icons' => Array('default' => 'icon16_custom.gif', 0 =>'icon16_style_disabled.gif', 1 =>'icon16_style.gif'), + 'Icons' => Array( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 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'),