Index: branches/RC/core/units/sections/sections_config.php =================================================================== diff -u -r11141 -r11162 --- branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 11141) +++ branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 11162) @@ -7,20 +7,20 @@ // 'SectionPrefix' => 'u', 'Sections' => Array ( - 'in-portal:root' => Array ( + /*'in-portal:root' => Array ( 'parent' => null, - 'icon' => 'in-portal:site', + 'icon' => 'site', 'label' => $this->Application->ConfigValue('Site_Name'), 'url' => Array ('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1), 'permissions' => Array ('advanced:admin_login', 'advanced:front_login'), 'priority' => 0, 'type' => stTREE, 'SectionPrefix' => 'adm', - ), + ),*/ 'in-portal:site' => Array ( 'parent' => 'in-portal:root', - 'icon' => 'in-portal:struct', + 'icon' => 'struct', 'label' => 'la_tab_Site_Structure', 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -31,7 +31,7 @@ 'in-portal:browse' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:catalog', // 'proj-cms:structure' + 'icon' => 'catalog', // 'proj-cms:structure' 'label' => 'la_tab_Browse', 'url' => Array ('t' => 'catalog/catalog', 'pass' => 'm'), 'late_load' => Array ('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), @@ -42,7 +42,7 @@ ), 'in-portal:advanced_view' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:advanced_view', + 'icon' => 'advanced_view', 'label' => 'la_tab_AdvancedView', 'url' => Array ('t' => 'catalog/advanced_view', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -52,7 +52,7 @@ 'in-portal:reviews' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:reviews', + 'icon' => 'reviews', 'label' => 'la_tab_Reviews', 'url' => Array ('t' => 'reviews/reviews', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -62,7 +62,7 @@ 'in-portal:configure_categories' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:cat_settings', + 'icon' => 'cat_settings', 'label' => 'la_tab_Settings', 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -72,7 +72,7 @@ 'in-portal:configuration_search' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:settings_search', + 'icon' => 'settings_search', 'label' => 'la_tab_ConfigSearch', 'url' => Array ('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -82,7 +82,7 @@ 'in-portal:configuration_email' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:settings_email', + 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', 'url' => Array ('t' => 'config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -92,18 +92,17 @@ 'in-portal:configuration_custom' => Array ( 'parent' => 'in-portal:site', - 'icon' => 'in-portal:settings_custom', + 'icon' => 'settings_custom', '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'), 'priority' => 7, 'type' => stTREE, ), - 'in-portal:users' => Array ( 'parent' => 'in-portal:root', - 'icon' => 'in-portal:community', + 'icon' => 'community', 'label' => 'la_tab_Community', 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -114,58 +113,70 @@ 'in-portal:user_list' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'in-portal:users', + 'icon' => 'users', 'label' => 'la_tab_User_List', 'url' => Array ('t' => 'users/users_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:ban', 'advanced:send_email', /*'advanced:add_favorite', 'advanced:remove_favorite',*/), 'priority' => 1, 'type' => stTREE, ), + 'in-portal:admins' => Array ( + 'parent' => 'in-portal:users', + 'icon' => 'users', + 'label' => 'la_title_Administrators', + 'url' => Array ('t' => 'users/admins_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'add', 'edit', 'delete'), + 'perm_prefix' => 'u', + 'priority' => 2, + 'type' => stTREE, + ), + 'in-portal:user_groups' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'in-portal:usergroups', + 'icon' => 'usergroups', 'label' => 'la_tab_User_Groups', 'url' => Array ('t' => 'groups/groups_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:send_email', 'advanced:manage_permissions'), - 'priority' => 2, + 'SectionPrefix' => 'g', + 'priority' => 3, 'type' => stTREE, ), 'in-portal:configure_users' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'in-portal:users_settings', + 'icon' => 'users_settings', 'label' => 'la_tab_ConfigSettings', 'url' => Array ('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), - 'priority' => 3, + 'priority' => 4, 'type' => stTREE, ), 'in-portal:user_email' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'in-portal:settings_email', + 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', 'url' => Array ('t' => 'config/config_email', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), - 'priority' => 4, + 'priority' => 5, 'type' => stTREE, ), 'in-portal:user_custom' => Array ( 'parent' => 'in-portal:users', - 'icon' => 'in-portal:settings_custom', + 'icon' => 'settings_custom', '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'), - 'priority' => 5, + 'priority' => 6, 'type' => stTREE, ), // "Help" section 'in-portal:help' => Array ( 'parent' => 'in-portal:root', - 'icon' => 'in-portal:help', + 'icon' => 'help', 'label' => 'la_tab_Help', 'url' => Array ('index_file' => 'help/manual.pdf', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -176,7 +187,7 @@ // "Summary & Logs" section 'in-portal:reports' => Array ( 'parent' => 'in-portal:root', - 'icon' => 'in-portal:summary_logs', + 'icon' => 'summary_logs', 'label' => 'la_tab_Reports', 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -187,7 +198,7 @@ /* 'in-portal:log_summary' => Array ( 'parent' => 'in-portal:reports', - 'icon' => 'in-portal:summary', + 'icon' => 'summary', 'label' => 'la_tab_Summary', 'url' => Array ('index_file' => 'logs/summary.php', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -197,7 +208,7 @@ 'in-portal:sessionlog' => Array ( 'parent' => 'in-portal:reports', - 'icon' => 'in-portal:sessions_log', + 'icon' => 'sessions_log', 'label' => 'la_tab_SessionLog', 'url' => Array ('index_file' => 'logs/session_list.php', 'pass' => 'm'), 'permissions' => Array ('view', 'delete'), @@ -208,7 +219,7 @@ 'in-portal:visits' => Array ( 'parent' => 'in-portal:reports', - 'icon' => 'in-portal:visits', + 'icon' => 'visits', 'label' => 'la_tab_Visits', 'url' => Array ('t' => 'logs/visits/visits_list', 'pass' => 'm'), 'permissions' => Array ('view', 'delete'), @@ -219,7 +230,7 @@ // "Configuration" section 'in-portal:system' => Array ( 'parent' => 'in-portal:root', - 'icon' => 'in-portal:conf', + 'icon' => 'conf', 'label' => 'la_tab_Sys_Config', 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -230,7 +241,7 @@ 'in-portal:configure_general' => Array ( 'parent' => 'in-portal:system', - 'icon' => 'in-portal:conf_general', + 'icon' => 'conf_general', 'label' => 'la_tab_General', 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -240,7 +251,7 @@ 'in-portal:configure_styles' => Array ( 'parent' => 'in-portal:system', - 'icon' => 'in-portal:style', + 'icon' => 'style', 'label' => 'la_tab_Stylesheets', 'url' => Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), @@ -252,7 +263,7 @@ // "Tools" section 'in-portal:tools' => Array ( 'parent' => 'in-portal:root', - 'icon' => 'in-portal:tools', + 'icon' => 'tools', 'label' => 'la_tab_Tools', 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), @@ -263,7 +274,7 @@ 'in-portal:backup' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'in-portal:tool_backup', + 'icon' => 'tool_backup', 'label' => 'la_tab_Backup', 'url' => Array ('t' => 'tools/backup1', 'section' => 'in-portal:configure_general', 'module' => 'In-Portal', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -273,7 +284,7 @@ 'in-portal:restore' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'in-portal:tool_restore', + 'icon' => 'tool_restore', 'label' => 'la_tab_Restore', 'url' => Array ('t' => 'tools/restore1', 'pass' => 'm'), 'permissions' => Array ('view'), @@ -283,7 +294,7 @@ 'in-portal:main_import' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'in-portal:tool_import', + 'icon' => 'tool_import', 'label' => 'la_tab_ImportData', 'url' => Array ('t' => 'tools/import1'), 'permissions' => Array ('view'), @@ -293,7 +304,7 @@ 'in-portal:sql_query' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'in-portal:tool_import', + 'icon' => 'tool_import', 'label' => 'la_tab_QueryDB', 'url' => Array ('t' => 'tools/sql_query', 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), @@ -303,7 +314,7 @@ 'in-portal:server_info' => Array ( 'parent' => 'in-portal:tools', - 'icon' => 'in-portal:server_info', + 'icon' => 'server_info', 'label' => 'la_tab_ServerInfo', 'url' => Array ('t' => 'tools/server_info', 'pass' => 'm'), 'permissions' => Array ('view'), Index: branches/RC/core/units/files/files_config.php =================================================================== diff -u -r10915 -r11162 --- branches/RC/core/units/files/files_config.php (.../files_config.php) (revision 10915) +++ branches/RC/core/units/files/files_config.php (.../files_config.php) (revision 11162) @@ -16,7 +16,7 @@ ), 'IDField' => 'FileId', - 'StatusField' => Array('Status', 'IsPrimary'), + 'StatusField' => Array('Status'), 'TitleField' => 'FileName', 'TableName' => TABLE_PREFIX.'ItemFiles', @@ -71,7 +71,7 @@ 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array ('default' => 'icon16_custom.gif', '1_0' => 'icon16_file.gif', '1_1' => 'icon16_file_primary.gif', '0_0' => 'icon16_file_disabled.gif'), + 'Icons' => Array (1 => 'icon16_file.gif', 0 => 'icon16_file_disabled.gif'), 'Fields' => Array( 'FileId' => Array ('title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal'), 'FileName' => Array ('title' => 'la_col_FileName'), Index: branches/RC/core/units/logs/search_logs/search_logs_config.php =================================================================== diff -u -r11136 -r11162 --- branches/RC/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 11136) +++ branches/RC/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 11162) @@ -29,7 +29,7 @@ 'Sections' => Array ( 'in-portal:searchlog' => Array ( 'parent' => 'in-portal:reports', - 'icon' => 'in-portal:search_log', + 'icon' => 'search_log', 'label' => 'la_tab_SearchLog', 'url' => Array('t' => 'logs/search_logs/search_log_list', 'pass' => 'm'), 'permissions' => Array('view', 'delete'),