Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_review_pending.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_primary.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat_top.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_view_item_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/email_messages/email_messages_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 12382) +++ branches/5.0.x/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'in-portal:configemail' => Array( 'parent' => 'in-portal:site', - 'icon' => 'core:e-mail', + 'icon' => 'email_templates', 'label' => 'la_tab_E-mails', 'url' => Array('t' => 'languages/email_message_list', 'pass' => 'm'), 'permissions' => Array('view', 'edit'), @@ -126,24 +126,28 @@ 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), +// 'Icons' => Array('default'=>'icon16_custom.gif'), 'Fields' => Array( - 'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'), + '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, ), + 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ), ), ), 'Emails' => Array( - 'Icons' => Array (1 => 'icon16_language.gif', 0 => 'icon16_language_disabled.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + ), 'Fields' => Array( - 'EventId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter'), - 'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'), - 'LanguageId' => Array( 'title'=>'la_col_Language', 'filter_block' => 'grid_options_filter'), - 'Enabled' => Array( 'title'=>'la_col_Enabled', 'filter_block' => 'grid_options_filter'), + 'EventId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Subject' => Array( 'title'=>'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 300, ), + 'Description' => Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ), + 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ), + 'LanguageId' => Array( 'title'=>'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'Enabled' => Array( 'title'=>'la_col_Enabled', 'filter_block' => 'grid_options_filter', 'width' => 70, ), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_sessions_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/users/admins_edit_groups.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/users/admins_edit_groups.tpl (.../admins_edit_groups.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/users/admins_edit_groups.tpl (.../admins_edit_groups.tpl) (revision 12495) @@ -39,7 +39,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - a_toolbar.AddButton( new ToolBarButton('usertogroup', '::', + a_toolbar.AddButton( new ToolBarButton('select_user', '::', function() { openSelector('u-ug', '', 'GroupId', '800x600'); } ) ); @@ -50,7 +50,7 @@ std_delete_items('u-ug'); } ) ); - a_toolbar.AddButton( new ToolBarButton('primary_group', '', + a_toolbar.AddButton( new ToolBarButton('setprimary', '', function() { submit_event('u-ug','OnSetPrimary'); } ) ); @@ -95,7 +95,7 @@ " /> Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_language_var_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_form_submission_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_setprimary_f3.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/themes/themes_edit.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/themes/themes_edit.tpl (.../themes_edit.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/themes/themes_edit.tpl (.../themes_edit.tpl) (revision 12495) @@ -1,4 +1,4 @@ - + @@ -58,14 +58,14 @@ - + - + Index: branches/5.0.x/core/admin_templates/img/icons/icon24_community.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_server_info.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/catalog/catalog.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/catalog/catalog.tpl (.../catalog.tpl) (revision 12495) @@ -191,7 +191,7 @@ a_toolbar.AddButton( new ToolBarButton( - 'rebuild_cache', + 'tools', '', function() { var $menu = menuMgr.createMenu(rs('tools_menu')); @@ -210,7 +210,7 @@ renderMenus(); - nls_showMenu(rs('tools_menu'), a_toolbar.GetButtonImage('rebuild_cache')); + nls_showMenu(rs('tools_menu'), a_toolbar.GetButtonImage('tools')); } ) ); Index: branches/5.0.x/core/admin_templates/img/icons/icon24_summary_logs.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_agents.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_agents.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/groups/groups_edit_permissions.tpl =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 12382) +++ branches/5.0.x/core/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 12495) @@ -69,7 +69,7 @@ " alt="" border="0"/> - img/icons/icon24_.gif" border="0" alt="" title="" align="absmiddle"/> + img/icons/icon24_.png" border="0" alt="" title="" align="absmiddle"/> Index: branches/5.0.x/core/admin_templates/img/icons/icon46_style.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_custom.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_users.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_image_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_struct.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_query_database_f3.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_image.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/languages/language_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/languages/language_list.tpl (.../language_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/languages/language_list.tpl (.../language_list.tpl) (revision 12495) @@ -14,7 +14,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_language', '::', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_precreate_item('lang', 'regional/languages_edit') } ) ); Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_admin_disabled.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/mailing_lists/mailing_lists_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 12382) +++ branches/5.0.x/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'in-portal:mailing_folder' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'custom', + 'icon' => 'mailing_list', 'label' => 'la_title_MailingLists', 'use_parent_header' => 1, 'permissions' => Array (), @@ -71,7 +71,7 @@ 'in-portal:mailing_lists' => Array ( 'parent' => 'in-portal:mailing_folder', - 'icon' => 'custom', + 'icon' => 'mailing_list', 'label' => 'la_title_MailingLists', 'url' => Array('t' => 'mailing_lists/mailing_list_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), @@ -128,16 +128,16 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array ('default' => 'icon16_item.png'), 'Fields' => Array ( - 'MailingId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ), - 'MessageText' => Array ('title' => 'la_col_MessageText', 'filter_block' => 'grid_like_filter', 'cut_first' => 100), - 'MessageHtml' => Array ('title' => 'la_col_MessageHtml', 'filter_block' => 'grid_like_filter', 'cut_first' => 100), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter',), - 'EmailsQueued' => Array ('title' => 'la_col_EmailsQueued', 'filter_block' => 'grid_range_filter',), - 'EmailsSent' => Array ('title' => 'la_col_EmailsSent', 'filter_block' => 'grid_range_filter',), - 'EmailsTotal' => Array ('title' => 'la_col_EmailsTotal', 'filter_block' => 'grid_range_filter',), + '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, ), + '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, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_related_search.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_relation.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/regional/languages_edit_phrases.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/regional/languages_edit_phrases.tpl (.../languages_edit_phrases.tpl) (revision 12495) @@ -1,4 +1,4 @@ - + @@ -38,7 +38,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - a_toolbar.AddButton( new ToolBarButton('new_language_var', '::', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_new_item('phrases', 'regional/phrases_edit') } ) ); Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_help.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/visits/visits_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/visits/visits_config.php (.../visits_config.php) (revision 12299) +++ branches/5.0.x/core/units/visits/visits_config.php (.../visits_config.php) (revision 12495) @@ -1,6 +1,6 @@ 'visits', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'VisitsList','file'=>'visits_list.php','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'VisitsEventHandler','file'=>'visits_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'VisitsTagProcessor','file'=>'visits_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'kDBItem','file' => '','build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'VisitsList','file' => 'visits_list.php','build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'VisitsEventHandler','file' => 'visits_event_handler.php','build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'VisitsTagProcessor','file' => 'visits_tag_processor.php','build_event' => 'OnBuild'), 'AutoLoad' => true, - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'event', 4 => 'mode', ), - 'Hooks' => Array( - Array( + 'Hooks' => Array ( + Array ( 'Mode' => hBEFORE, 'Conditional' => false, 'HookToPrefix' => 'adm', 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnStartup' ), + 'HookToEvent' => Array ( 'OnStartup' ), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnRegisterVisit', ), - Array( + Array ( 'Mode' => hAFTER, 'Conditional' => false, 'HookToPrefix' => 'u', 'HookToSpecial' => '*', - 'HookToEvent' => Array( 'OnLogin' ), + 'HookToEvent' => Array ( 'OnLogin' ), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnUserLogin', @@ -56,33 +56,33 @@ 'IDField' => 'VisitId', 'TableName' => TABLE_PREFIX.'Visits', - 'PermSection' => Array('main' => 'in-portal:visits'), + 'PermSection' => Array ('main' => 'in-portal:visits'), 'Sections' => Array ( 'in-portal:visits' => Array ( 'parent' => 'in-portal:reports', 'icon' => 'visits', - 'label' => 'la_tab_Visits', + 'label' => 'la_tab_VisitorLog', 'url' => Array ('t' => 'logs/visits/visits_list', 'pass' => 'm'), 'permissions' => Array ('view', 'delete'), 'priority' => 6, 'type' => stTREE, ), ), - 'TitlePresets' => Array( - 'visits_list' => Array( - 'prefixes' => Array('visits_List'), 'format' => "!la_title_Visits!", - 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + 'TitlePresets' => Array ( + 'visits_list' => Array ( + 'prefixes' => Array ('visits_List'), 'format' => "!la_title_Visits!", + 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'), ), - 'visits.incommerce_list' => Array( - 'prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits!", - 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + 'visits.incommerce_list' => Array ( + 'prefixes' => Array ('visits.incommerce_List'), 'format' => "!la_title_Visits!", + 'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'), ), ), - 'CalculatedFields' => Array( + 'CalculatedFields' => Array ( '' => Array ( 'UserName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)', ), @@ -97,10 +97,10 @@ ), ), - 'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s + 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId', - 'incommerce'=>' + 'incommerce' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId @@ -110,65 +110,67 @@ ), - 'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s + 'ItemSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId', - 'incommerce'=>' SELECT %1$s.* %2$s + 'incommerce' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId', ), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('VisitDate' => 'desc'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('VisitDate' => 'desc'), ) ), - 'Fields' => Array( - 'VisitId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => 1, 'default' => 0), - 'Referer' => Array('type' => 'string','not_null' => '1','default' => ''), - 'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''), - 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), - 'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => -2), + 'Fields' => Array ( + 'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => 1, 'default' => 0), + 'Referer' => Array ('type' => 'string','not_null' => '1','default' => ''), + 'IPAddress' => Array ('type' => 'string','not_null' => '1','default' => ''), + 'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Login','not_null'=>1,'default'=>0), + 'PortalUserId' => Array ('type' => 'int','not_null' => '1','default' => -2), ), - 'VirtualFields' => Array( - 'UserName' => Array('type'=>'string'), - 'AffiliateUser' => Array('type'=>'string'), - 'AffiliatePortalUserId' => Array('type'=>'int'), - 'OrderTotalAmount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00', 'totals' => 'SUM'), - 'OrderTotalAmountSum' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'OrderAffiliateCommission' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'), - 'OrderAffiliateCommissionSum' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'), - 'OrderId' => Array('type' => 'int', 'default' => '0'), + 'VirtualFields' => Array ( + 'UserName' => Array ('type' => 'string'), + 'AffiliateUser' => Array ('type' => 'string'), + 'AffiliatePortalUserId' => Array ('type' => 'int'), + 'OrderTotalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1','default' => '0.00', 'totals' => 'SUM'), + 'OrderTotalAmountSum' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1','default' => '0.00'), + 'OrderAffiliateCommission' => Array ('type' => 'double', 'formatter' => 'kFormatter','format' => '%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'), + 'OrderAffiliateCommissionSum' => Array ('type' => 'double', 'formatter' => 'kFormatter','format' => '%.02f', 'not_null' => '1','default' => '0.0000'), + 'OrderId' => Array ('type' => 'int', 'default' => '0'), ), - 'Grids' => 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 - 'Fields' => Array( - 'VisitDate' => Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter'), - 'IPAddress' => Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ), - 'Referer' => Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ), - 'UserName' => Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), - ), - ), - 'visitsincommerce' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used - 'Fields' => Array( - 'VisitDate' => Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter' ), - 'IPAddress' => Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ), - 'Referer' => Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ), - 'UserName' => Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), - 'AffiliateUser' => Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter'), - 'OrderTotalAmountSum' => Array( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter'), - 'OrderAffiliateCommissionSum' => Array( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter'), - ), - ), - ), + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array ('default' => 'icon16_item.png'), + 'Fields' => Array ( + '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, ), + ), + ), + + 'visitsincommerce' => Array ( + 'Icons' => Array ('default' => 'icon16_item.png'), + 'Fields' => Array ( + '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, ), + '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, ), + ), + ), + ), + ); \ No newline at end of file Index: branches/5.0.x/core/units/images/images_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/images/images_config.php (.../images_config.php) (revision 12299) +++ branches/5.0.x/core/units/images/images_config.php (.../images_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array('type'=>'int', 'not_null'=>1, 'default' => 0), 'Url' => Array('type' => 'string', 'max_len'=>255, 'default' => '', 'not_null'=>1), 'Name' => Array('type' => 'string', 'max_len'=>255, 'required'=>1, 'not_null'=>1, 'default' => ''), - 'AltName' => Array('type' => 'string', 'max_len'=>255, 'required' => 1, 'not_null' => 1, 'default' => ''), + 'AltName' => Array('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'ImageIndex' => Array('type'=>'int', 'default' => 0, 'not_null'=>1), 'LocalImage' => Array('type'=>'int', 'default' => 1, 'not_null'=>1), 'LocalPath' => Array('type' => 'string', 'formatter'=>'kPictureFormatter', 'skip_empty'=>1, 'max_len'=>240, 'default' => '', 'not_null' => 1, 'include_path' => 1, @@ -166,14 +166,20 @@ 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon17_custom.gif','1_0'=>'icon16_image.gif','0_0'=>'icon16_image_disabled.gif','1_1'=>'icon16_image_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( - 'ImageId' => Array( 'title'=>'la_col_Id', 'filter_block' => 'grid_range_filter'), - 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'image_caption_td', 'filter_block' => 'grid_like_filter'), - 'AltName' => Array( 'title'=>'la_col_AltName', 'filter_block' => 'grid_like_filter'), - 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td', 'filter_block' => 'grid_like_filter'), - 'Enabled' => Array( 'title'=>'la_col_ImageEnabled', 'filter_block' => 'grid_options_filter'), - 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'image_preview_td', 'filter_block' => 'grid_like_filter'), + 'ImageId' => Array( 'title'=>'la_col_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, ), + 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'image_preview_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Enabled' => Array( 'title'=>'la_col_ImageEnabled', 'filter_block' => 'grid_options_filter', 'width' => 80, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_settings_search.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_form.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_backup.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_tool_restore.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_view_item.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_selector.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_form.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/languages/languages_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 12299) +++ branches/5.0.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array('lang'=>''), ), - 'languages_list' => Array( 'prefixes' => Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks!"), + 'languages_list' => Array( + 'prefixes' => Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks!", + 'toolbar_button' => Array ('new_item', 'edit', 'delete', 'export', 'import', 'setprimary', 'refresh', 'view', 'dbl-click'), + ), 'languages_edit_general' => Array( 'prefixes' => Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"), @@ -205,7 +208,7 @@ 'not_null' => 1, 'required' => 1, 'default' => '' ), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Active'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), 'PrimaryLang' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'AdminInterfaceLang' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -234,14 +237,23 @@ 'Grids' => Array( 'Default' => 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'), - 'PackName' => Array ('title' => 'la_col_PackName', 'filter_block' => 'grid_options_filter'), - 'LocalName' => Array ('title' => 'la_col_LocalName', 'filter_block' => 'grid_options_filter'), - 'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'), - 'PrimaryLang' => Array ('title' => 'la_col_IsPrimary', 'filter_block' => 'grid_options_filter'), - 'AdminInterfaceLang' => Array ('title' => 'la_col_AdminInterfaceLang', 'filter_block' => 'grid_options_filter'), + '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, ),// + '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_options_filter', 'width' => 100, ), + 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 60, ), + 'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 60, ), + + ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_settings_custom.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_server_info.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_agents.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_e-mail-settings.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_image_primary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_goto_order_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_image.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_catalog.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_catalog.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_users_settings.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_transactions.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_users_general.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_review.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_section_new.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_order_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_email_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_advanced_view.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/catalog/catalog_elements.tpl =================================================================== diff -u -r12459 -r12495 --- branches/5.0.x/core/admin_templates/catalog/catalog_elements.tpl (.../catalog_elements.tpl) (revision 12459) +++ branches/5.0.x/core/admin_templates/catalog/catalog_elements.tpl (.../catalog_elements.tpl) (revision 12495) @@ -8,7 +8,7 @@ -   +   @@ -20,7 +20,7 @@ - +   @@ -51,7 +51,7 @@ - +
@@ -64,7 +64,7 @@ PrefixSpecial="" Grid="" ajax="1" - onkeydown="searchKeydown(event);"/> + onkeydown="searchKeydown(event);" style="width:160px;"/> Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_cat_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_spelling_dictionary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_language.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_email_templates.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_sessions_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/themes/themes_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/themes/themes_config.php (.../themes_config.php) (revision 12299) +++ branches/5.0.x/core/units/themes/themes_config.php (.../themes_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array( 'prefixes' => Array('theme_List'), 'format' => "!la_tab_Themes!", - 'toolbar_buttons' => Array ('new_theme', 'edit', 'delete', 'primary_theme', 'rescan_themes', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'setprimary', 'refresh', 'view', 'dbl-click'), ), 'themes_edit_general' => Array( @@ -130,7 +130,7 @@ 'Fields' => Array( 'ThemeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string','not_null' => 1, 'required' => 1, 'default' => ''), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1=>'la_Enabled', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => 1, 'default' => 1), + 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1=>'la_Active', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => 1, 'default' => 1), 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'PrimaryTheme' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'CacheTimeout' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -144,12 +144,18 @@ 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif', '1_1' => 'icon16_theme_primary.gif', '1_0' => 'icon16_theme.gif', '0_0' => 'icon16_theme_disabled.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( - 'ThemeId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'filter_block' => 'grid_like_filter'), - 'Enabled' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'), + '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'), ), ), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_language_var.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_language_primary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_form.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_tool_restore.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_users.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_tool_backup.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_phrases_labels.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/thesaurus/thesaurus_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/thesaurus/thesaurus_config.php (.../thesaurus_config.php) (revision 12299) +++ branches/5.0.x/core/units/thesaurus/thesaurus_config.php (.../thesaurus_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'in-portal:thesaurus' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'custom', + 'icon' => 'conf_thesaurus', 'label' => 'la_title_Thesaurus', 'url' => Array('t' => 'thesaurus/thesaurus_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), @@ -94,11 +94,15 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + ), 'Fields' => Array ( - 'ThesaurusId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'SearchTerm' => Array ('title' => 'la_col_SearchTerm', 'filter_block' => 'grid_like_filter',), - 'ThesaurusTerm' => Array ('title' => 'la_col_ThesaurusTerm', 'filter_block' => 'grid_like_filter',), + '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',), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon46_search_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_user_pending.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/phrases/phrases_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 12382) +++ branches/5.0.x/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'parent' => 'in-portal:site', - 'icon' => 'conf_regional', + 'icon' => 'phrases_labels', 'label' => 'la_title_Phrases', 'url' => Array ('t' => 'languages/phrase_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), @@ -193,27 +193,36 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_language_var.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + ), 'Fields' => Array ( - 'Phrase' => Array ('title' => 'la_col_Label', 'data_block' => 'grid_checkbox_td'), - 'Translation' => Array ('title' => 'la_col_Translation'), - 'PrimaryTranslation' => Array ('title' => 'la_col_PrimaryValue'), - 'PhraseType' => Array ('title' => 'la_col_PhraseType', 'filter_block' => 'grid_options_filter'), - 'LastChanged' => Array ('title' => 'la_col_LastChanged', 'filter_block' => 'grid_date_range_filter'), - 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter'), + 'PhraseId' => Array ('title' => 'la_col_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), + 'Translation' => Array ('title' => 'la_col_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), ), ), 'Phrases' => Array ( - 'Icons' => Array ('default' => 'icon16_language_var.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + ), 'Fields' => Array ( 'PhraseId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50), - 'Phrase' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150), - 'Translation' => Array ('title' => 'la_col_Translation', 'filter_block' => 'grid_like_filter', 'width' => 150), - 'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Phrase' => Array ('title' => 'la_col_Label', 'filter_block' => 'grid_like_filter', 'width' => 170), + 'Translation' => Array ('title' => 'la_col_Phrase', 'filter_block' => 'grid_like_filter', 'width' => 180), + 'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 95), 'PhraseType' => Array ('title' => 'la_col_Location', 'filter_block' => 'grid_options_filter', 'width' => 80), - 'LastChanged' => Array ('title' => 'la_col_LastChanged', 'filter_block' => 'grid_date_range_filter'), - 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter'), + '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), ), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon24_folder.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/tools/system_tools.tpl =================================================================== diff -u -r12481 -r12495 --- branches/5.0.x/core/admin_templates/tools/system_tools.tpl (.../system_tools.tpl) (revision 12481) +++ branches/5.0.x/core/admin_templates/tools/system_tools.tpl (.../system_tools.tpl) (revision 12495) @@ -23,7 +23,7 @@ : @@ -42,7 +42,7 @@ Compile Templates (with NParser): @@ -54,8 +54,8 @@ @@ -66,8 +66,8 @@
Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_form_submission.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_theme_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_setprimary.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/email_queue/email_queue_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 12382) +++ branches/5.0.x/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 12495) @@ -1,6 +1,6 @@ 'email-queue', @@ -43,7 +43,7 @@ 'Sections' => Array ( 'in-portal:email_queue' => Array ( 'parent' => 'in-portal:mailing_folder', - 'icon' => 'email_log', + 'icon' => 'mailing_list', 'label' => 'la_tab_EmailQueue', 'url' => Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'), 'permissions' => Array ('view', 'delete'), @@ -76,16 +76,17 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array ('default' => 'icon16_item.png'), 'Fields' => Array ( - 'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',), - 'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', ), - 'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ), - 'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', ), - 'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', ), - 'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', ), - 'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', ), - 'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', ), + 'EmailQueueId' => Array ('title' => 'la_col_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, ), + '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, ), + 'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), + ), ), ), Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat_deleted.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_file.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_community.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_server_info.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_community.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_admin.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_browse-site.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_user_group.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_relation_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/tree.tpl =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/admin_templates/tree.tpl (.../tree.tpl) (revision 12382) +++ branches/5.0.x/core/admin_templates/tree.tpl (.../tree.tpl) (revision 12495) @@ -41,9 +41,9 @@ - " priority="" onclick="" icon="img/icons/icon24_.gif"> + " priority="" onclick="" icon="img/icons/icon24_.png"> - " priority="" container="" onclick="" name="" icon="img/icons/icon24_.gif" load_url=""> + " priority="" container="" onclick="" name="" icon="img/icons/icon24_.png" load_url=""> @@ -55,7 +55,7 @@ var TREE_ICONS_PATH = 'img/tree'; var TREE_SHOW_PRIORITY = 10; - var the_tree = new TreeFolder('tree', '', '', 'img/icons/icon24_.gif', null, null, '', ''); + var the_tree = new TreeFolder('tree', '', '', 'img/icons/icon24_.png', null, null, '', ''); Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_search_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_add_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_spelling_dictionary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_place_order.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_language_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_struct.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -r12449 -r12495 --- branches/5.0.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 12449) +++ branches/5.0.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 12495) @@ -16,7 +16,10 @@
-   + + - ', '');" value="Go"> + ', '');" value="Run">
- +
- - table name (prefix optional) OR unit config prefix + + Table Name (table prefix is optional) OR "Unit-config" Prefix
- - Unit config prefix + + Unit-config Prefix
Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_group_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_image_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/ban_rules/ban_rule_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/ban_rules/ban_rule_list.tpl (.../ban_rule_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/ban_rules/ban_rule_list.tpl (.../ban_rule_list.tpl) (revision 12495) @@ -28,6 +28,28 @@ a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + a_toolbar.AddButton( + new ToolBarButton( + 'approve', + '', + function() { + submit_event('ban-rule', 'OnMassApprove'); + } + ) + ); + + a_toolbar.AddButton( + new ToolBarButton( + 'decline', + '', + function() { + submit_event('ban-rule', 'OnMassDecline'); + } + ) + ); + + a_toolbar.AddButton( new ToolBarSeparator('sep1') ); + a_toolbar.AddButton( new ToolBarButton('view', '', function() { show_viewmenu(a_toolbar,'view'); } @@ -43,6 +65,6 @@ \ No newline at end of file Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/show_all.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_file_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_struct.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_user_attn.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_catalog.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_regional.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_users_settings.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_usergroups.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_email_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_email_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_view_item_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_selector.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_advanced_view.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_conf.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_group_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_user_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_site.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_form_submission_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_setprimary_f2.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_language_var.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/custom_fields/custom_fields_list.tpl =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 12382) +++ branches/5.0.x/core/admin_templates/custom_fields/custom_fields_list.tpl (.../custom_fields_list.tpl) (revision 12495) @@ -16,7 +16,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_item', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_precreate_item('cf', 'custom_fields/custom_fields_edit') } ) ); Index: branches/5.0.x/core/units/user_groups/user_groups_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 12299) +++ branches/5.0.x/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array( 'GroupUsers' => Array( - 'Icons' => Array ('default' => 'icon16_group.gif'), + 'Icons' => Array ('default' => 'icon16_item.png'), 'Fields' => Array( - 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'UserName' => Array ('title'=>'la_col_UserFirstLastName'), - 'UserLogin' => Array ('title'=>'la_col_Login'), - 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter'), - 'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter'), + 'PortalUserId' => Array ('title' => 'la_col_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, ), + '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, ), ), ), ), @@ -114,13 +114,16 @@ 'Grids' => Array( 'Default' => Array( - 'Icons' => Array ('default' => 'icon16_group.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 1 => 'icon16_primary.png' + ), 'Fields' => Array( - 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'GroupName' => Array ('title'=>'la_col_GroupName'), - 'GroupDescription' => Array ('title'=>'la_col_Description'), - 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter'), - 'MembershipExpires' => Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter'), + '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, ), + '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: branches/5.0.x/core/admin_templates/img/icons/icon24_structure.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_restore.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_style_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/users/users_edit_groups.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 12495) @@ -39,7 +39,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - a_toolbar.AddButton( new ToolBarButton('usertogroup', '::', + a_toolbar.AddButton( new ToolBarButton('select_user', '::', function() { openSelector('u-ug', '', 'GroupId', '800x600'); } ) ); @@ -50,7 +50,7 @@ std_delete_items('u-ug'); } ) ); - a_toolbar.AddButton( new ToolBarButton('primary_group', '', + a_toolbar.AddButton( new ToolBarButton('setprimary', '', function() { submit_event('u-ug','OnSetPrimary'); } ) ); @@ -96,7 +96,7 @@ " /> Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_query_database_f2.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/logs/search_logs/search_log_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/logs/search_logs/search_log_list.tpl (.../search_log_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/logs/search_logs/search_log_list.tpl (.../search_log_list.tpl) (revision 12495) @@ -30,7 +30,7 @@ a_toolbar.AddButton( new ToolBarButton( - 'clear_selected', + 'delete', '', function() { std_delete_items('search-log'); @@ -79,7 +79,7 @@ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_tools.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_review_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_agent.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_user_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/themes/themes_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/themes/themes_list.tpl (.../themes_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/themes/themes_list.tpl (.../themes_list.tpl) (revision 12495) @@ -14,7 +14,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_theme', '::', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_precreate_item('theme', 'themes/themes_edit') } ) ); @@ -28,12 +28,12 @@ a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - a_toolbar.AddButton( new ToolBarButton('primary_theme', '::', function() { + a_toolbar.AddButton( new ToolBarButton('setprimary', '', function() { submit_event('theme','OnSetPrimary'); } ) ); - a_toolbar.AddButton( new ToolBarButton('rescan_themes', '::', function() { + a_toolbar.AddButton( new ToolBarButton('refresh', '::', function() { submit_event('adm', 'OnRebuildThemes'); } ) ); @@ -56,7 +56,7 @@ \ No newline at end of file Index: branches/5.0.x/core/admin_templates/img/icons/icon46_usergroups.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_settings_email.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_sessions_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/sections/sections_config.php =================================================================== diff -u -r12389 -r12495 --- branches/5.0.x/core/units/sections/sections_config.php (.../sections_config.php) (revision 12389) +++ branches/5.0.x/core/units/sections/sections_config.php (.../sections_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'parent' => 'in-portal:root', - 'icon' => 'community', + 'icon' => 'user_management', 'label' => 'la_tab_Community', 'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -151,7 +151,7 @@ 'in-portal:website_setting_folder' => Array ( 'parent' => 'in-portal:system', - 'icon' => 'conf', + 'icon' => 'conf_website', 'label' => 'la_title_Website', 'use_parent_header' => 1, 'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'), @@ -174,7 +174,7 @@ 'in-portal:configure_advanced' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'settings_general', + 'icon' => 'conf_advanced', 'label' => 'la_title_Advanced', 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -197,7 +197,7 @@ 'in-portal:backup' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'tool_backup', + 'icon' => 'backup', 'label' => 'la_tab_Backup', 'url' => Array ('t' => 'tools/backup1', 'section' => 'in-portal:configure_general', 'module' => 'In-Portal', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -207,7 +207,7 @@ 'in-portal:restore' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'tool_restore', + 'icon' => 'restore', 'label' => 'la_tab_Restore', 'url' => Array ('t' => 'tools/restore1', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -217,7 +217,7 @@ 'in-portal:main_import' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'tool_import', + 'icon' => 'import_data', 'label' => 'la_tab_ImportData', 'url' => Array ('t' => 'tools/import1'), 'onclick' => 'direct_edit(\'adm\', this.href);', @@ -228,7 +228,7 @@ 'in-portal:sql_query' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'tool_import', + 'icon' => 'query_database', 'label' => 'la_tab_QueryDB', 'url' => Array ('t' => 'tools/sql_query', 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_user_denied.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_modules.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_email_log.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/tools/backup3.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/tools/backup3.tpl (.../backup3.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/tools/backup3.tpl (.../backup3.tpl) (revision 12495) @@ -34,7 +34,7 @@ "> -
+

M Index: branches/5.0.x/core/admin_templates/thesaurus/thesaurus_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/thesaurus/thesaurus_list.tpl (.../thesaurus_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/thesaurus/thesaurus_list.tpl (.../thesaurus_list.tpl) (revision 12495) @@ -14,7 +14,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_item', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_precreate_item('thesaurus', 'thesaurus/thesaurus_edit'); } ) ); Index: branches/5.0.x/core/admin_templates/img/icons/icon24_modules.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_users.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_search.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_tool_backup.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_order.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_disabled.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_settings_general.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_search_log.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_conf_general.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_browse-site.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_review_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_folder-red.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/skins/skins_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/skins/skins_config.php (.../skins_config.php) (revision 12382) +++ branches/5.0.x/core/units/skins/skins_config.php (.../skins_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array( 'prefixes' => Array('skin_List'), 'format' => '!la_tab_Skins!', - 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'primary_theme', 'clone', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'setprimary', 'clone', 'view', 'dbl-click'), ), 'skin_edit'=>Array( @@ -80,12 +80,12 @@ 'Sections' => Array( 'in-portal:skins' => Array( 'parent' => 'in-portal:tools', - 'icon' => 'conf_general', + 'icon' => 'admin_skins', 'label' => 'la_tab_Skins', 'url' => Array('t' => 'skins/skin_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), 'priority' => 7, - 'show_mode' => smSUPER_ADMIN, +// 'show_mode' => smSUPER_ADMIN, 'type' => stTREE, ), ), @@ -163,11 +163,14 @@ 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_test.gif'), + 'Icons' => Array( + 'default' => 'icon16_item.png', + 1 => 'icon16_primary.png', + ), 'Fields' => Array( - 'SkinId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'width'=>50, 'filter_block' => 'grid_range_filter' ), - 'Name' => Array( 'title'=>'la_col_SkinName', 'width'=>200, 'filter_block' => 'grid_like_filter'), - 'IsPrimary' => Array( 'title'=>'la_col_IsPrimary', 'width'=>150, 'filter_block' => 'grid_options_filter'), + '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), ), ), ), Index: branches/5.0.x/core/admin_templates/logs/visits/visits_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/logs/visits/visits_list.tpl (.../visits_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/logs/visits/visits_list.tpl (.../visits_list.tpl) (revision 12495) @@ -19,7 +19,7 @@ } ) ); - a_toolbar.AddButton( new ToolBarButton('reset', '', function() { + a_toolbar.AddButton( new ToolBarButton('delete', '', function() { std_delete_items('visits'); } ) ); @@ -66,6 +66,6 @@ \ No newline at end of file Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_section_pending.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_struct.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_tools.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_conf_regional.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/logs/search_logs/search_logs_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 12299) +++ branches/5.0.x/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'search_log_list' => Array ( 'prefixes' => Array('search-log_List'), 'format' => '!la_tab_SearchLog!', - 'toolbar_buttons' => Array ('refresh', 'clear_selected', 'reset', 'export', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('refresh', 'delete', 'reset', 'export', 'view', 'dbl-click'), ), ), @@ -78,11 +78,13 @@ 'Grids' => Array ( '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',), - 'SearchType' => Array ('title' => 'la_prompt_SearchType', 'filter_block' => 'grid_options_filter', ), - 'Keyword' => Array ('title' => 'la_col_Keyword', 'filter_block' => 'grid_like_filter', ), - 'Indices' => Array ('title' => 'la_prompt_Frequency', 'filter_block' => 'grid_range_filter', ), + 'SearchLogId' => Array ('title' => 'la_col_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, ), + + 'Indices' => Array ('title' => 'la_prompt_Frequency', 'filter_block' => 'grid_range_filter', 'width' => 100, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon24_user_management.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_form_submission.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_settings_output.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/forms/forms_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/forms/forms_list.tpl (.../forms_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/forms/forms_list.tpl (.../forms_list.tpl) (revision 12495) @@ -14,7 +14,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_form', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_precreate_item('form', 'forms/forms_edit') } ) ); Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_order_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_item.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/admin/admin_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/admin/admin_config.php (.../admin_config.php) (revision 12382) +++ branches/5.0.x/core/units/admin/admin_config.php (.../admin_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'parent' => 'in-portal:tools', - 'icon' => 'conf_general', + 'icon' => 'service', 'label' => 'la_tab_Service', 'url' => Array ('t' => 'tools/system_tools', 'pass' => 'm'), 'permissions' => Array ('view'), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_theme_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat_pending.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/show_structure.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_site.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_form_submission.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/logo_bg.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/logs/change_logs/change_logs_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/logs/change_logs/change_logs_config.php (.../change_logs_config.php) (revision 12299) +++ branches/5.0.x/core/units/logs/change_logs/change_logs_config.php (.../change_logs_config.php) (revision 12495) @@ -1,6 +1,6 @@ 'change-log', @@ -62,7 +62,7 @@ 'Sections' => Array ( 'in-portal:change_logs' => Array ( 'parent' => 'in-portal:reports', - 'icon' => 'sessions_log', // 'change_logs', + 'icon' => 'changes_log', // 'change_logs', 'label' => 'la_tab_ChangeLog', 'url' => Array('t' => 'logs/change_logs/change_log_list', 'pass' => 'm'), 'permissions' => Array('view', 'edit', 'delete'), @@ -129,20 +129,21 @@ 'Grids' => Array ( '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',), - 'PortalUserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_like_filter',), - 'UserLogin' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter',), - 'UserFirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter',), - 'UserLastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter',), - 'SessionLogId' => Array ('title' => 'la_col_SessionLogId', 'filter_block' => 'grid_like_filter',), - 'Action' => Array ('title' => 'la_col_Action', 'filter_block' => 'grid_options_filter', ), - 'OccuredOn' => Array ('title' => 'la_col_OccuredOn', 'filter_block' => 'grid_date_range_filter',), - 'MasterPrefix' => Array ('title' => 'la_col_MasterPrefix', 'filter_block' => 'grid_options_filter', ), - 'MasterId' => Array ('title' => 'la_col_MasterId', 'filter_block' => 'grid_range_filter',), - 'Prefix' => Array ('title' => 'la_col_ItemPrefix', 'filter_block' => 'grid_options_filter', ), - 'ItemId' => Array ('title' => 'la_col_ItemId', 'filter_block' => 'grid_range_filter',), - 'Changes' => Array ('title' => 'la_col_Changes', 'data_block' => 'grid_changes_td', 'filter_block' => 'grid_like_filter',), + 'ChangeLogId' => Array ('title' => 'la_col_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, ), + 'SessionLogId' => Array ('title' => 'la_col_SessionLogId', 'filter_block' => 'grid_like_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, ), + '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', 'width' => 100, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_relation_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_tool_import.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_related_search_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_changes_log.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_cat_settings.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat_new.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_add_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_group_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/users/users_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/users/users_config.php (.../users_config.php) (revision 12299) +++ branches/5.0.x/core/units/users/users_config.php (.../users_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'prefixes' => Array ('u', 'u-img_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Images!", - 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'approve', 'decline', 'setprimary', 'move_up', 'move_down', 'view', 'dbl-click'), ), 'user_edit_groups' => Array ( 'prefixes' => Array ('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups!", - 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'edit', 'delete', 'primary_group', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'select_user', 'edit', 'delete', 'setprimary', 'view', 'dbl-click'), ), 'user_edit_items' => Array ( @@ -238,7 +238,7 @@ 'in-portal:admins' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'users', + 'icon' => 'administrators', 'label' => 'la_title_Administrators', 'url' => Array ('t' => 'users/admins_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), @@ -250,7 +250,7 @@ // user settings 'in-portal:user_setting_folder' => Array ( 'parent' => 'in-portal:system', - 'icon' => 'conf', + 'icon' => 'conf_users', 'label' => 'la_title_Users', 'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -261,7 +261,7 @@ 'in-portal:configure_users' => Array ( 'parent' => 'in-portal:user_setting_folder', - 'icon' => 'users_settings', + 'icon' => 'conf_users_general', 'label' => 'la_tab_ConfigSettings', 'url' => Array ('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -271,7 +271,7 @@ 'in-portal:user_email' => Array ( 'parent' => 'in-portal:user_setting_folder', - 'icon' => 'settings_email', + 'icon' => 'conf_email', 'label' => 'la_tab_ConfigE-mail', 'url' => Array ('t' => 'config/config_email', 'module' => 'Core:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -281,7 +281,7 @@ 'in-portal:user_custom' => Array ( 'parent' => 'in-portal:user_setting_folder', - 'icon' => 'settings_custom', + 'icon' => 'conf_customfields', 'label' => 'la_tab_ConfigCustom', 'url' => Array ('t' => 'custom_fields/custom_fields_list', 'cf_type' => 6, 'pass_section' => true, 'pass' => 'm,cf'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), @@ -408,7 +408,11 @@ 'Grids' => Array( // not in use 'Default' => Array( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_user_disabled.png', + 1 => 'icon16_user.png', + 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'), @@ -421,40 +425,52 @@ // used 'UserSelector' => Array( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_user_disabled.png', + 1 => 'icon16_user.png', + 2 => 'icon16_user_pending.png' + ), 'Selector' => 'radio', 'Fields' => Array( - 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_login_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'), + '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, ), + '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, ), ), ), // used 'Admins' => Array ( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_admin_disabled.png', + 1 => 'icon16_admin.png', + 2 => 'icon16_admin_disabled.png', + ), 'Fields' => Array ( - 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60), - 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width'=>100), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width'=>100), - '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'=>140), + '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, ), ), ), // used 'RegularUsers' => Array ( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), + 'Icons' => Array( + 0 => 'icon16_user_disabled.png', + 1 => 'icon16_user.png', + 2 => 'icon16_user_pending.png' + ), 'Fields' => Array( - 'PortalUserId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60), - 'Login' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter', 'width'=>100), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter', 'width'=>100), - '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'=>140), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width'=>100), + '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, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_modules.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/general/general_config.php =================================================================== diff -u -r12343 -r12495 --- branches/5.0.x/core/units/general/general_config.php (.../general_config.php) (revision 12343) +++ branches/5.0.x/core/units/general/general_config.php (.../general_config.php) (revision 12495) @@ -1,6 +1,6 @@ 'CachedNavbar', 'TitlePhrase' => 'la_Text_Category', - 'CatalogTabIcon' => 'icon16_folder.gif', + 'CatalogTabIcon' => 'icon16_section.png', 'ItemType' => 1, 'TableName' => TABLE_PREFIX . 'Category', Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_user_pending.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/custom_fields/custom_fields_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 12299) +++ branches/5.0.x/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array( - 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), - 'Fields' => Array( - 'CustomFieldId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter' ), - 'FieldName' => Array( 'title'=>'la_prompt_FieldName'), - 'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ), - 'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder', 'filter_block' => 'grid_range_filter' ), -// 'IsSystem' => Array ('title' => 'la_col_IsSystem', 'filter_block' => 'grid_options_filter'), - ), - ), + 'Default' => Array ( + 'Icons' => Array ( + 'default' => 'icon16_item.png', + ), + 'Fields' => Array ( + 'CustomFieldId' => Array ( 'title'=>'la_col_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'), + ), + ), - 'SeparateTab' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), - 'Selector' => '', - 'Fields' => Array( - 'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'), - 'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter'), - 'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter'), - 'Error' => Array( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td', 'filter_block' => 'grid_empty_filter'), - ), - ), + 'SeparateTab' => Array ( + 'Icons' => Array ( + 'default' => 'icon16_item.png', + ), + 'Selector' => '', + 'Fields' => Array ( + 'FieldName' => Array ( 'title'=>'la_col_FieldName', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Prompt' => Array ( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter', 'width' => 200, ), + 'Value' => Array ( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter', 'width' => 200, ), + 'Error' => Array ( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td', 'filter_block' => 'grid_empty_filter', 'width' => 100, ), + ), + ), - 'SeparateTabOriginal' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), - 'Selector' => '', - 'Fields' => Array( - 'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td', 'filter_block' => 'grid_like_filter'), - 'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter'), - 'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter'), - 'OriginalValue' => Array( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td', 'filter_block' => 'grid_like_filter'), - ), - ), + 'SeparateTabOriginal' => Array ( + 'Icons' => Array ( + 'default' => 'icon16_item.png', + ), + 'Selector' => '', + 'Fields' => Array ( + 'FieldName' => Array ( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td', 'filter_block' => 'grid_like_filter'), + 'Prompt' => Array ( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter'), + 'Value' => Array ( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter'), + 'OriginalValue' => Array ( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td', 'filter_block' => 'grid_like_filter'), + ), + ), ), ); \ No newline at end of file Index: branches/5.0.x/core/units/ban_rules/ban_rules_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 12382) +++ branches/5.0.x/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 12495) @@ -1,6 +1,6 @@ TABLE_PREFIX.'BanRules', + 'StatusField' => Array ('Status'), + 'TitleField' => 'ItemValue', 'TitlePresets' => Array ( @@ -43,7 +45,7 @@ 'ban_rule_list' => Array ( 'prefixes' => Array ('ban-rule_List'), 'format' => "!la_tab_BanList!", - 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), ), 'ban_rule_edit' => Array ( @@ -114,14 +116,18 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + ), 'Fields' => Array ( - 'RuleId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'RuleType' => Array ('title' => 'la_col_RuleType', 'filter_block' => 'grid_options_filter', ), - 'ItemField' => Array ('title' => 'la_col_ItemField', 'filter_block' => 'grid_options_filter', ), - 'ItemVerb' => Array ('title' => 'la_col_FieldComparision', 'filter_block' => 'grid_options_filter', ), - 'ItemValue' => Array ('title' => 'la_col_FieldValue', 'filter_block' => 'grid_like_filter', ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', ), + '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, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_tools_f3.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_cat.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_option.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_spelling_dictionary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_usergroups.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_regional.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_agent.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/section_properties.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_settings_search.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/agents/agents_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/agents/agents_config.php (.../agents_config.php) (revision 12299) +++ branches/5.0.x/core/units/agents/agents_config.php (.../agents_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'in-portal:agents' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'agents', + 'icon' => 'conf_agents', 'label' => 'la_title_Agents', 'url' => Array('t' => 'agents/agent_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), @@ -136,18 +136,21 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_agent.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + ), 'Fields' => Array ( - 'AgentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'AgentName' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter',), - 'AgentType' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter',), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter',), - 'Event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter',), - 'RunInterval' => Array ('title' => 'la_col_RunInterval', 'filter_block' => 'grid_range_filter',), - 'RunMode' => Array ('title' => 'la_col_RunMode', 'filter_block' => 'grid_options_filter',), - 'LastRunOn' => Array ('title' => 'la_col_LastRunOn', 'filter_block' => 'grid_date_range_filter',), - 'LastRunStatus' => Array ('title' => 'la_col_LastRunStatus', 'filter_block' => 'grid_options_filter',), - 'NextRunOn' => Array ('title' => 'la_col_NextRunOn', 'filter_block' => 'grid_date_range_filter',), + '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' => 2145, ), + '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, ), ), ), ), Index: branches/5.0.x/core/admin_templates/config/config_search.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 12495) @@ -11,7 +11,7 @@ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_query_database.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/themes/extra_toolbar.tpl =================================================================== diff -u -r12246 -r12495 --- branches/5.0.x/core/admin_templates/themes/extra_toolbar.tpl (.../extra_toolbar.tpl) (revision 12246) +++ branches/5.0.x/core/admin_templates/themes/extra_toolbar.tpl (.../extra_toolbar.tpl) (revision 12495) @@ -5,7 +5,7 @@ - +   Index: branches/5.0.x/core/admin_templates/img/icons/icon24_structure.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_section_system.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/sections/site_config_tp.php =================================================================== diff -u -r12370 -r12495 --- branches/5.0.x/core/units/sections/site_config_tp.php (.../site_config_tp.php) (revision 12370) +++ branches/5.0.x/core/units/sections/site_config_tp.php (.../site_config_tp.php) (revision 12495) @@ -1,6 +1,6 @@ Array ('image' => 'show_structure', 'title' => 'Browse Mode'), + EDITING_MODE_BROWSE => Array ('image' => 'browse_site_mode', 'title' => 'Browse Mode'), EDITING_MODE_CONTENT => Array ('image' => 'content_mode', 'title' => 'Content Mode'), - EDITING_MODE_DESIGN => Array ('image' => 'show_all', 'title' => 'Design Mode'), + EDITING_MODE_DESIGN => Array ('image' => 'design_mode', 'title' => 'Design Mode'), ); $site_config_helper =& $this->Application->recallObject('SiteConfigHelper'); Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat_hot.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_tools.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_folder-red.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_style_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_user_group_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_advanced_view.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/categories/categories_edit_relations.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/categories/categories_edit_relations.tpl (.../categories_edit_relations.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/categories/categories_edit_relations.tpl (.../categories_edit_relations.tpl) (revision 12495) @@ -35,7 +35,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep2') ); //Relations related: - a_toolbar.AddButton( new ToolBarButton('new_relation', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { openSelector('c-rel', '', 'TargetId', '950x600'); } ) ); Index: branches/5.0.x/core/units/forms/forms_config.php =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/units/forms/forms_config.php (.../forms_config.php) (revision 12382) +++ branches/5.0.x/core/units/forms/forms_config.php (.../forms_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array( 'in-portal:forms' => Array( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:form', + 'icon' => 'form', 'label' => 'la_tab_CMSForms', //'la_tab_FormsConfig', 'url' => Array('t' => 'forms/forms_list', 'pass' => 'm'), // set "container" parameter (in section definition, not url) to true when form editing should be disabled, but submissions still visible 'permissions' => Array('view', 'add', 'edit', 'delete'), @@ -65,7 +65,7 @@ 'forms_list' => Array ( 'prefixes' => Array ('form_List'), 'format' => "!la_title_Forms!", - 'toolbar_buttons' => Array('new_form', 'edit', 'delete', 'view', 'dbl-click'), + 'toolbar_buttons' => Array('new_item', 'edit', 'delete', 'view', 'dbl-click'), ), 'forms_edit' => Array ( @@ -123,10 +123,16 @@ ), 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_form.gif'), + 'Icons' => Array( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + 2 => 'icon16_pending.png', + ), 'Fields' => Array( - 'FormId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Title' => Array( 'title' => 'la_col_Title', 'filter_block' => 'grid_like_filter'), + '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' => 250, ), + 'Description' => Array( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 300, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_form_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_form_submission.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_sessions_log.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/regional/languages_edit.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/regional/languages_edit.tpl (.../languages_edit.tpl) (revision 12495) @@ -1,4 +1,4 @@ - + Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_summary_logs.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_import_data.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_tool_import.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_conf_general.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_users.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_search_log.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_pending.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_group.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_user.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_language_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_import_language_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/tools/server_info.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/tools/server_info.tpl (.../server_info.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/tools/server_info.tpl (.../server_info.tpl) (revision 12495) @@ -1,7 +1,7 @@ - + - - + + +##--> \ No newline at end of file Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_file.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_custom_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_language.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/tools/import2.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/tools/import2.tpl (.../import2.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/tools/import2.tpl (.../import2.tpl) (revision 12495) @@ -76,7 +76,7 @@ "> - Select the program you are importing the data from: + Select the format you are importing the data from: "> Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_select_user_f3.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/stop_words/stop_words_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/stop_words/stop_words_config.php (.../stop_words_config.php) (revision 12299) +++ branches/5.0.x/core/units/stop_words/stop_words_config.php (.../stop_words_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'in-portal:stop_words' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'custom', + 'icon' => 'conf_stopwords', 'label' => 'la_title_StopWords', 'url' => Array('t' => 'stop_words/stop_word_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), @@ -84,10 +84,14 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + ), 'Fields' => Array ( - 'StopWordId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'StopWord' => Array ('title' => 'la_col_StopWord', 'filter_block' => 'grid_like_filter',), + '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, ), ), ), ), Index: branches/5.0.x/core/units/categories/categories_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 12299) +++ branches/5.0.x/core/units/categories/categories_config.php (.../categories_config.php) (revision 12495) @@ -1,6 +1,6 @@ 'c', @@ -71,7 +71,7 @@ ), 'IDField' => 'CategoryId', - 'StatusField' => Array ('IsMenu'), // 'Status' + 'StatusField' => Array ('Status'), // 'Status' 'TitleField' => 'Name', 'TitlePhrase' => 'la_Text_Category', @@ -90,7 +90,7 @@ 'TableName' => TABLE_PREFIX.'Category', 'ViewMenuPhrase' => 'la_text_Categories', - 'CatalogTabIcon' => 'icon16_folder.gif', + 'CatalogTabIcon' => 'icon16_sections.png', 'TitlePresets' => Array ( 'default' => Array ( @@ -102,12 +102,12 @@ 'category_list' => Array ('prefixes' => Array ('c_List'), 'format' => "!la_title_Categories! (#c_recordcount#)"), 'catalog' => Array ( 'prefixes' => Array (), 'format' => "!la_title_Categories!", - 'toolbar_buttons' => Array ('select', 'cancel', 'upcat', 'homecat', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_item', 'edit', 'delete', 'new_listing', 'approve', 'decline', 'cut', 'copy', 'paste', 'move_up', 'move_down', 'rebuild_cache', 'view', 'dbl-click') + 'toolbar_buttons' => Array ('select', 'cancel', 'upcat', 'homecat', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_product', 'edit', 'delete', 'new_listing', 'approve', 'decline', 'cut', 'copy', 'paste', 'move_up', 'move_down', 'tools', 'view', 'dbl-click') ), 'advanced_view' => Array ( 'prefixes' => Array (), 'format' => "!la_title_AdvancedView!", - 'toolbar_buttons' => Array ('select', 'cancel', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_item', 'edit', 'delete', 'new_listing', 'approve', 'decline', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('select', 'cancel', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_product', 'edit', 'delete', 'new_listing', 'approve', 'decline', 'view', 'dbl-click'), ), 'reviews' => Array ( 'prefixes' => Array (), 'format' => "!la_title_Reviews!", @@ -133,7 +133,7 @@ 'categories_related_searches' => Array ( 'prefixes' => Array ('c'), 'format' => "#c_status# '#c_titlefield#' - !la_title_RelatedSearches!", - 'toolbar_buttons' => Array ('new_related_search', 'edit', 'delete', 'move_up', 'move_down', 'approve', 'decline', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'new_related_search', 'edit', 'delete', 'move_up', 'move_down', 'approve', 'decline', 'view', 'dbl-click'), ), 'categories_images' => Array ( @@ -197,7 +197,7 @@ 'Sections' => Array ( 'in-portal:configure_categories' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'settings_output', + 'icon' => 'conf_output', 'label' => 'la_tab_ConfigOutput', 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -207,7 +207,7 @@ 'in-portal:configuration_search' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'settings_search', + 'icon' => 'conf_search', 'label' => 'la_tab_ConfigSearch', 'url' => Array ('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -217,7 +217,7 @@ 'in-portal:configuration_email' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'settings_email', + 'icon' => 'conf_email', 'label' => 'la_tab_ConfigE-mail', 'url' => Array ('t' => 'config/config_email', 'module' => 'Core:Category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -227,7 +227,7 @@ 'in-portal:configuration_custom' => Array ( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'settings_custom', + 'icon' => 'conf_customfields', 'label' => 'la_tab_ConfigCustom', 'url' => Array ('t' => 'custom_fields/custom_fields_list', 'cf_type' => 1, 'pass_section' => true, 'pass' => 'm,cf'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), @@ -354,7 +354,7 @@ 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Regular', 1 => 'la_CategoryIndex', 2 => 'la_Container'), 'use_phrases' => 1, ), 'IsMenu' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Show', 0 => 'la_Hide'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), - 'IsSystem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_System', 0 => 'la_Regular'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), + 'IsSystem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_System', 0 => 'la_text_User'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'FormId' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ('' => ''), @@ -385,43 +385,80 @@ 'Grids' => Array( 'Default' => Array ( - 'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'), + 'Icons' => Array( // 'StatusField' => Array ('IsSystem', 'Status', 'IsMenu'), // 'Status' + 'default' => 'icon_section.png', + '1_0_0' => 'icon16_section_system.png', // system + '1_0_1' => 'icon16_section_system.png', // system + '1_1_1' => 'icon16_section_system.png', // system + '0_0_0' => 'icon16_section_disabled.png', // disabled + '0_0_1' => 'icon16_section_disabled.png', // disabled + '0_1_0' => 'icon16_section_menuhidden.png', // hidden from menu + '0_2_0' => 'icon16_section_pending.png', // pending + '0_2_1' => 'icon16_section_pending.png', // pending + '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' => 50), + 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60), 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250), - 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), + 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 60), + 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 75), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150), 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), - 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70), - 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), - 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75), + + 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 80), + ), ), 'Radio' => Array ( 'Selector' => 'radio', - 'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'), + 'Icons' => Array( // 'StatusField' => Array ('IsSystem', 'Status', 'IsMenu'), // 'Status' + 'default' => 'icon_section.png', + '1_0_0' => 'icon16_section_system.png', // system + '1_0_1' => 'icon16_section_system.png', // system + '1_1_1' => 'icon16_section_system.png', // system + '0_0_0' => 'icon16_section_disabled.png', // disabled + '0_0_1' => 'icon16_section_disabled.png', // disabled + '0_1_0' => 'icon16_section_menuhidden.png', // hidden from menu + '0_2_0' => 'icon16_section_pending.png', // pending + '0_2_1' => 'icon16_section_pending.png', // pending + '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' => 50), + 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60), 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250), - 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), + 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 60), + 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 75), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150), 'Template' => Array( 'title'=>'la_col_TemplateType', 'filter_block' => 'grid_options_filter', 'width' => 220), - 'IsMenu' => Array( 'title'=>'la_col_Visible', 'filter_block' => 'grid_options_filter', 'width' => 70), - 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), - 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75), + + 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 80), ), ), 'Structure' => Array ( - 'Icons' => Array(1 => 'icon16_folder.gif', 0 => 'icon16_folder-red.gif'), + 'Icons' => Array( // 'StatusField' => Array ('IsSystem', 'Status', 'IsMenu'), // 'Status' + 'default' => 'icon_section.png', + '1_0_0' => 'icon16_section_system.png', // system + '1_0_1' => 'icon16_section_system.png', // system + '1_1_1' => 'icon16_section_system.png', // system + '0_0_0' => 'icon16_section_disabled.png', // disabled + '0_0_1' => 'icon16_section_disabled.png', // disabled + '0_1_0' => 'icon16_section_menuhidden.png', // hidden from menu + '0_2_0' => 'icon16_section_pending.png', // pending + '0_2_1' => 'icon16_section_pending.png', // pending + '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' => 50), + 'CategoryId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60), 'Name' => Array( 'title'=>'la_col_PageTitle', 'data_block' => 'page_browse_td', 'filter_block' => 'grid_like_filter', 'width' => 250), - 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 170), + 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 60), + 'IsMenu' => Array( 'title'=>'la_col_InMenu', 'filter_block' => 'grid_options_filter', 'width' => 75), + 'Path' => Array( 'title'=>'la_col_Path', 'data_block' => 'page_entercat_td', 'filter_block' => 'grid_like_filter', 'width' => 150), + 'Modified' => Array( 'title'=>'la_col_Modified', 'filter_block' => 'grid_date_range_filter', 'width' => 150), 'Template' => Array( 'title'=>'la_col_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'), - 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 100), - 'Priority' => Array( 'title'=>'la_col_Priority', 'filter_block' => 'grid_options_filter', 'width' => 75), + + 'IsSystem' => Array( 'title'=>'la_col_System', 'filter_block' => 'grid_options_filter', 'width' => 80), ), ), ), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_agent_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_customfields.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/kernel/nparser/nparser.php =================================================================== diff -u -r12450 -r12495 --- branches/5.0.x/core/kernel/nparser/nparser.php (.../nparser.php) (revision 12450) +++ branches/5.0.x/core/kernel/nparser/nparser.php (.../nparser.php) (revision 12495) @@ -1,6 +1,6 @@ _btnPhrases['design']; $btn_class = 'cms-edit-design-btn'; $btn_container_class = 'block-edit-design-btn-container'; + $btn_name = 'design'; } else { $btn_text = $this->_btnPhrases['block']; $btn_class = 'cms-edit-block-btn'; $btn_container_class = 'block-edit-block-btn-container'; + $btn_name = 'content'; } $block_editor = '
- +
' . $btn_text . '
Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_image_disabled.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/helpers/sections_helper.php =================================================================== diff -u -r12306 -r12495 --- branches/5.0.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 12306) +++ branches/5.0.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 12495) @@ -1,6 +1,6 @@ Tree[$section_name]['icon'] = 'help'; - $this->Tree[$section_name]['icon_module'] = 'core'; - } +// if (!file_exists(FULL_PATH.'/'.$icon_file.'.png')) { +// $this->Tree[$section_name]['icon'] = 'help'; +// $this->Tree[$section_name]['icon_module'] = 'core'; +// } } $this->Application->HandleEvent( new kEvent('adm:OnAfterBuildTree') ); Index: branches/5.0.x/core/admin_templates/img/icons/icon24_site.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_form_submission.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_cat_settings.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_settings_custom.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_export_language_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_review_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/categories/categories_tag_processor.php =================================================================== diff -u -r12389 -r12495 --- branches/5.0.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 12389) +++ branches/5.0.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 12495) @@ -1,6 +1,6 @@ getObject($params); - if ($object->GetDBField('IsMenu')) { - $status = $object->GetDBField('Status'); - if ($status == 1) { - $ret = $object->GetDBField('IsNew') ? 'icon16_cat_new.gif' : 'icon16_folder.gif'; - } - else { - $ret = $status ? 'icon16_cat_pending.gif' : 'icon16_cat_disabled.gif'; - } + if ($object->GetDBField('IsSystem')) { + return 'icon16_section_system.png'; } - else { - $ret = 'icon16_folder-red.gif'; + + $status = $object->GetDBField('Status'); + if (!$status) { + return 'icon16_section_disabled.png'; } - return $ret; + if (!$object->GetDBField('IsMenu')) { + return 'icon16_section_menuhidden.png'; + } + + if ($status == 2) { + return 'icon16_section_pending.png'; + } + + if ($object->GetDBField('IsNew')) { + return 'icon16_section_new.png'; + } + + return 'icon16_section.png'; } function ItemCount($params) @@ -1167,7 +1175,7 @@
- +
' . $this->Application->Phrase('la_btn_EditContent', false) . ' '.(defined('DEBUG_MODE') && DEBUG_MODE ? " - #{$num}" : '').'
@@ -1447,7 +1455,7 @@ $edit_btn .= '
- +
' . $this->Application->Phrase('la_btn_SectionProperties', false) . '
' . "\n"; @@ -1486,7 +1494,7 @@
- +
' . $this->Application->Phrase('la_btn_SectionTemplate', false) . '
' . "\n"; Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_rescan_themes_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_conf_regional.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_service.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_reviews.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_place_order_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_tools.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_custom.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_reviews.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_group.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_export_language.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_settings_email.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/js/tree.js =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/admin_templates/js/tree.js (.../tree.js) (revision 12382) +++ branches/5.0.x/core/admin_templates/js/tree.js (.../tree.js) (revision 12495) @@ -84,8 +84,8 @@ TreeItem.prototype.appendIcon = function (td) { img = document.createElement('img'); - img.style.width = '24px'; - img.style.height = '22px'; +// img.style.width = '24px'; +// img.style.height = '22px'; if (this.Icon.indexOf('http://') != -1) { img.src = this.Icon; } Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_template.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_usergroups.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_summary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_summary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_style.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_visits.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/logs/email_logs/email_logs_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/logs/email_logs/email_logs_config.php (.../email_logs_config.php) (revision 12299) +++ branches/5.0.x/core/units/logs/email_logs/email_logs_config.php (.../email_logs_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif'), + 'Icons' => Array ('default' => 'icon16_item.png'), 'Fields' => Array ( - 'EmailLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',), - 'fromuser' => Array ('title' => 'la_prompt_FromUsername', 'filter_block' => 'grid_like_filter', ), - 'addressto' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', ), - 'subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ), - 'event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', ), - 'timestamp' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', ), + 'EmailLogId' => Array ('title' => 'la_col_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, ), + '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', ), ), ), Index: branches/5.0.x/core/units/logs/session_logs/session_logs_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 12299) +++ branches/5.0.x/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'Default' => Array ( 'Fields' => Array ( - 'SessionLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ), - 'PortalUserId' => Array ('title' => 'la_col_PortalUserId', 'filter_block' => 'grid_like_filter',), - 'UserLogin' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_like_filter',), - 'UserFirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter',), - 'UserLastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter',), - 'SessionStart' => Array ('title' => 'la_col_SessionStart', 'filter_block' => 'grid_date_range_filter', ), - 'SessionEnd' => Array ('title' => 'la_col_SessionEnd', 'filter_block' => 'grid_date_range_filter', ), - 'Duration' => Array ('title' => 'la_col_Duration', 'filter_block' => 'grid_range_filter', ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', ), - 'IP' => Array ('title' => 'la_col_IP', 'filter_block' => 'grid_like_filter',), - 'AffectedItems' => Array ('title' => 'la_col_AffectedItems', 'data_block' => 'affected_td'), + 'Icons' => Array ('default' => 'icon16_item.png'), + 'SessionLogId' => Array ('title' => 'la_col_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, ), + '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, ), + '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: branches/5.0.x/core/admin_templates/img/icons/icon46_list_tool_import.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_banlist.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/regional/languages_edit_email_events.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/regional/languages_edit_email_events.tpl (.../languages_edit_email_events.tpl) (revision 12495) @@ -1,4 +1,4 @@ - + Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_group_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_banlist.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_general.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_tools_f2.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_goto_order.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/design_mode.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/config/config_search_edit.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/config/config_search_edit.tpl (.../config_search_edit.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/config/config_search_edit.tpl (.../config_search_edit.tpl) (revision 12495) @@ -66,8 +66,8 @@ - - + +
Index: branches/5.0.x/core/admin_templates/import/import_start.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/import/import_start.tpl (.../import_start.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/import/import_start.tpl (.../import_start.tpl) (revision 12495) @@ -14,7 +14,7 @@ \ No newline at end of file Index: branches/5.0.x/core/admin_templates/img/icons/icon46_spelling_dictionary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_import_language_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_e-mail.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_reviews.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_select_user_f2.gif =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/tools/import1.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/tools/import1.tpl (.../import1.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/tools/import1.tpl (.../import1.tpl) (revision 12495) @@ -46,7 +46,7 @@ "> - This utility allows you to import data from other databases and applications, including third party products and earlier versions of this software. + This utility allows you to import data from CSV formatted files. "> Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_theme_primary.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/stop_words/stop_word_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/stop_words/stop_word_list.tpl (.../stop_word_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/stop_words/stop_word_list.tpl (.../stop_word_list.tpl) (revision 12495) @@ -14,7 +14,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_item', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_precreate_item('stop-word', 'stop_words/stop_word_edit'); } ) ); Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_review.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/groups/groups_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/groups/groups_config.php (.../groups_config.php) (revision 12299) +++ branches/5.0.x/core/units/groups/groups_config.php (.../groups_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array ( 'prefixes' => Array ('g.total_List'), 'format' => "!la_title_Groups!", - 'toolbar_buttons' => Array ('new_group', 'edit', 'delete', 'e-mail', 'view', 'dbl-click'), + 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'e-mail', 'view', 'dbl-click'), ), 'groups_edit' => Array ( @@ -56,7 +56,7 @@ 'groups_edit_users' => Array ( 'prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users!", - 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'delete', 'view'), + 'toolbar_buttons' => Array ('select', 'cancel', 'prev', 'next', 'select_user', 'delete', 'view'), ), 'groups_edit_permissions' => Array ( @@ -125,39 +125,43 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + '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'), - 'Name' => Array ('title' => 'la_col_GroupName'), - 'UserCount' => Array ('title' => 'la_col_UserCount', 'filter_block' => 'grid_range_filter'), - 'FrontRegistration' => Array ('title' => 'la_col_FrontRegistration', 'filter_block' => 'grid_options_filter'), + '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, ), + '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, ), ), ), 'UserGroups' => Array ( - 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + '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'), - 'Name' => Array ('title' => 'la_col_GroupName'), + '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, ), ), ), 'Radio' => Array ( - 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + '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'), - 'Name' => Array ('title' => 'la_col_GroupName'), - 'Description' => Array ('title' => 'la_col_Description'), + '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, ), ), ), 'GroupSelector' => Array ( - 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + ), 'Fields' => Array ( - 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array ('title' => 'la_col_GroupName'), - 'Description' => Array ('title' => 'la_col_Description'), + '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, ), ), ), ), Index: branches/5.0.x/core/admin_templates/tools/backup1.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/tools/backup1.tpl (.../backup1.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/tools/backup1.tpl (.../backup1.tpl) (revision 12495) @@ -49,8 +49,11 @@ - - ][VariableValue]" class="text" size="50" value=''> + ][VariableValue]" class="text" value='' style="width:80%"> + + Index: branches/5.0.x/core/admin_templates/img/icons/icon46_conf_themes.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/categories/categories_edit_images.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/categories/categories_edit_images.tpl (.../categories_edit_images.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/categories/categories_edit_images.tpl (.../categories_edit_images.tpl) (revision 12495) @@ -44,7 +44,7 @@ - a_toolbar.AddButton( new ToolBarButton('new_image', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_new_item('c-img', 'categories/images_edit') } ) ); Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_email.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_theme.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_summary_logs.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_visits.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_admin_skins.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/reviews/reviews_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 12299) +++ branches/5.0.x/core/units/reviews/reviews_config.php (.../reviews_config.php) (revision 12495) @@ -1,6 +1,6 @@ 'rev', @@ -186,26 +186,36 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + 2 => 'icon16_pending.png', + ), 'Fields' => Array ( - 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'filter_block' => 'grid_like_filter'), - 'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', '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'), - 'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter'), + '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, ), + '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, ), ), ), 'ReviewsSection' => Array ( - 'Icons' => Array ('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'), + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + 2 => 'icon16_pending.png', + ), 'Fields' => Array ( - 'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter'), - 'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', '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'), - 'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter'), + '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, ), + '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, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon24_administrators.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_export_language_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_section_system.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_custom.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_navigate.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_general.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_banlist.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_cat_pick.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_goto_order_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_rescan_themes_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_folder.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_place_order_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/browse_site_mode.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_settings_output.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/top_frame/icons/content_mode.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/themes/themes_edit_files.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/themes/themes_edit_files.tpl (.../themes_edit_files.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/themes/themes_edit_files.tpl (.../themes_edit_files.tpl) (revision 12495) @@ -1,4 +1,4 @@ - + Index: branches/5.0.x/core/admin_templates/img/icons/icon24_form.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_section_disabled.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_form_submission.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_tool_restore.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_themes.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_server_info.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_settings_general.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/tools/sql_query.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/tools/sql_query.tpl (.../sql_query.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/tools/sql_query.tpl (.../sql_query.tpl) (revision 12495) @@ -8,14 +8,16 @@ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_file_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_agents.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/skins/skin_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/skins/skin_list.tpl (.../skin_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/skins/skin_list.tpl (.../skin_list.tpl) (revision 12495) @@ -35,7 +35,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep1') ); - a_toolbar.AddButton( new ToolBarButton('primary_theme', '::', function() { + a_toolbar.AddButton( new ToolBarButton('setprimary', '::', function() { submit_event('skin','OnSetPrimary'); } ) ); Index: branches/5.0.x/core/admin_templates/img/icons/icon24_style.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/units/modules/modules_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/modules/modules_config.php (.../modules_config.php) (revision 12299) +++ branches/5.0.x/core/units/modules/modules_config.php (.../modules_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array( 'in-portal:mod_status' => Array( 'parent' => 'in-portal:website_setting_folder', - 'icon' => 'modules', + 'icon' => 'conf_modules', 'label' => 'la_title_Module_Status', 'url' => Array('t' => 'modules/modules_list', 'pass' => 'm'), 'permissions' => Array('view', 'edit', 'advanced:approve', 'advanced:decline'), @@ -92,7 +92,7 @@ 'Path' => Array('type' => 'string','not_null' => '1','default' => ''), 'Var' => Array('type' => 'string','not_null' => '1','default' => ''), 'Version' => Array('type' => 'string','not_null' => '1','default' => '0.0.0'), - 'Loaded' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'Loaded' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Active', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), 'LoadOrder' => Array('type' => 'int','not_null' => 1, 'default' => 0), 'TemplatePath' => Array('type' => 'string','not_null' => 1, 'default' => ''), 'RootCat' => Array('type' => 'int','not_null' => 1, 'default' => 0), @@ -103,11 +103,18 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.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_no_icon', 'header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_like_filter'), - 'Version' => Array('title' => 'la_col_Version', 'header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_like_filter'), - 'Loaded' => Array('title' => 'la_col_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter'), + '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', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'BuildDate' => Array('title' => 'la_col_BuildDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), + 'LoadOrder' => Array('title' => 'la_col_Priority', 'filter_block' => 'grid_like_filter', 'width' => 60, ), + '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, ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_language_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_lock_login.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_primary_cat_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/groups/groups_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/groups/groups_list.tpl (.../groups_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/groups/groups_list.tpl (.../groups_list.tpl) (revision 12495) @@ -15,7 +15,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_group', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { set_hidden_field('remove_specials[g.total]', 1); std_precreate_item('g.total', 'groups/groups_edit') Index: branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl =================================================================== diff -u -r12382 -r12495 --- branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 12382) +++ branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl (.../tree_categories.tpl) (revision 12495) @@ -4,14 +4,14 @@ , '')" load_url=""> , '')"> Index: branches/5.0.x/core/admin_templates/agents/agent_list.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/agents/agent_list.tpl (.../agent_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/agents/agent_list.tpl (.../agent_list.tpl) (revision 12495) @@ -14,7 +14,7 @@ } var a_toolbar = new ToolBar(); - a_toolbar.AddButton( new ToolBarButton('new_agent', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_precreate_item('agent', 'agents/agent_edit'); } ) ); Index: branches/5.0.x/core/units/form_submissions/form_submissions_config.php =================================================================== diff -u -r12396 -r12495 --- branches/5.0.x/core/units/form_submissions/form_submissions_config.php (.../form_submissions_config.php) (revision 12396) +++ branches/5.0.x/core/units/form_submissions/form_submissions_config.php (.../form_submissions_config.php) (revision 12495) @@ -1,6 +1,6 @@ 'formsubs', @@ -95,10 +95,10 @@ ), 'Grids' => Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_form_submission.gif'), + 'Icons' => Array('default' => 'icon16_item.png'), 'Fields' => Array( - 'FormSubmissionId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'sort_field' => 'FormFieldId', 'filter_block' => 'grid_range_filter', 'width' => 80 ), - 'SubmissionTime' => Array( 'title'=>'la_prompt_SumbissionTime', 'filter_block' => 'grid_date_range_filter'), + '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 ), ), ), ), Index: branches/5.0.x/core/admin_templates/img/icons/icon24_settings_search.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_list_conf_themes.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon46_conf.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_website.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_theme_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_visits.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_user.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/users/user_edit_images.tpl =================================================================== diff -u -r12117 -r12495 --- branches/5.0.x/core/admin_templates/users/user_edit_images.tpl (.../user_edit_images.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/users/user_edit_images.tpl (.../user_edit_images.tpl) (revision 12495) @@ -41,7 +41,7 @@ a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - a_toolbar.AddButton( new ToolBarButton('new_image', '', + a_toolbar.AddButton( new ToolBarButton('new_item', '::', function() { std_new_item('u-img', 'users/image_edit') } ) ); @@ -54,6 +54,25 @@ a_toolbar.AddButton( new ToolBarSeparator('sep3') ); + a_toolbar.AddButton( new ToolBarButton('approve', '', function() { + submit_event('u-img', 'OnMassApprove'); + } + ) ); + + a_toolbar.AddButton( new ToolBarButton('decline', '', function() { + submit_event('u-img', 'OnMassDecline'); + } + ) ); + + + a_toolbar.AddButton( new ToolBarButton('setprimary', '', function() { + submit_event('u-img','OnSetPrimary'); + } + ) ); + + a_toolbar.AddButton( new ToolBarSeparator('sep4') ); + + a_toolbar.AddButton( new ToolBarButton('move_up', '', function() { submit_event('u-img','OnMassMoveUp'); } @@ -64,12 +83,8 @@ } ) ); - a_toolbar.AddButton( new ToolBarButton('primary_image', '', function() { - submit_event('u-img','OnSetPrimary'); - } - ) ); - a_toolbar.AddButton( new ToolBarSeparator('sep4') ); + a_toolbar.AddButton( new ToolBarSeparator('sep5') ); a_toolbar.AddButton( new ToolBarButton('view', '', function() { show_viewmenu(a_toolbar,'view'); @@ -100,7 +115,7 @@ \ No newline at end of file Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_user_deleted.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/incs/header.tpl =================================================================== diff -u -r12320 -r12495 --- branches/5.0.x/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 12320) +++ branches/5.0.x/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 12495) @@ -10,7 +10,7 @@ - + Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_language_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_group_f3.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/itemicons/icon16_image.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_navigate.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_custom.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_conf_stopwords.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/admin_templates/img/toolbar/tool_new_spelling_dictionary_f2.gif =================================================================== diff -u -r12117 -r12495 Binary files differ Index: branches/5.0.x/core/admin_templates/img/icons/icon24_mailing_list.png =================================================================== diff -u Binary files differ Index: branches/5.0.x/core/units/form_fields/form_fields_config.php =================================================================== diff -u -r12299 -r12495 --- branches/5.0.x/core/units/form_fields/form_fields_config.php (.../form_fields_config.php) (revision 12299) +++ branches/5.0.x/core/units/form_fields/form_fields_config.php (.../form_fields_config.php) (revision 12495) @@ -1,6 +1,6 @@ Array( 'Default' => Array( - 'Icons' => Array('default'=>'icon16_custom.gif'), + 'Icons' => Array('default'=>'icon16_item.png'), 'Fields' => Array( - 'FormFieldId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'FieldName' => Array( 'title'=>'la_prompt_FieldName', 'filter_block' => 'grid_like_filter'), - 'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'label_grid_data_td', 'filter_block' => 'grid_like_filter'), - 'Priority' => Array('title' => 'la_prompt_Priority', 'filter_block' => 'grid_range_filter'), + 'FormFieldId' => Array( 'title'=>'la_col_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'), + 'DisplayInGrid' => Array('title' => 'la_prompt_DisplayInGrid', 'filter_block' => 'grid_options_filter', 'width' => 150 ), ), ), ),