Index: branches/RC/core/units/email_messages/email_messages_config.php =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 11610) +++ branches/RC/core/units/email_messages/email_messages_config.php (.../email_messages_config.php) (revision 11612) @@ -61,7 +61,11 @@ 'EmailMessageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Template' => Array('type' => 'string', 'default' => null), 'MessageType' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'use_phrases' => 1, 'not_null' => '1','default' => 'text'), - 'LanguageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), + 'LanguageId' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY PackName', 'option_key_field' => 'LanguageId', 'option_title_field' => 'PackName', + 'not_null' => 1, 'default' => 0 + ), 'EventId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Subject' => Array('type' => 'string', 'default' => null), ), @@ -91,6 +95,17 @@ ), ), + + 'Emails' => Array( + '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'), + 'LanguageId' => Array( 'title'=>'la_col_PackName', 'filter_block' => 'grid_options_filter'), + ), + + ), ), ); Index: branches/RC/core/units/forms/forms_config.php =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/units/forms/forms_config.php (.../forms_config.php) (revision 11610) +++ branches/RC/core/units/forms/forms_config.php (.../forms_config.php) (revision 11612) @@ -31,16 +31,16 @@ 'TitleField' => 'Title', 'PermSection' => Array('main' => 'in-portal:forms'), 'Sections' => Array( - 'in-portal:forms' => Array( - 'parent' => 'in-portal:site', - 'icon' => 'in-portal:form', - 'label' => 'la_tab_FormsConfig', - 'url' => Array('t' => 'forms/forms_list', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 0.3, - 'show_mode' => smSUPER_ADMIN, - 'type' => stTREE, - ), + 'in-portal:forms' => Array( + 'parent' => 'in-portal:site', + 'icon' => 'in-portal:form', + 'label' => 'la_tab_CMSForms', //'la_tab_FormsConfig', + 'url' => Array('t' => 'forms/forms_list', 'pass' => 'm'), // set template to "sections_list" when form editing should be disabled + 'permissions' => Array('view', 'add', 'edit', 'delete'), + 'priority' => 7, +// 'show_mode' => smSUPER_ADMIN, + 'type' => stTREE, + ), ), 'TitlePresets' => Array( 'default' => Array( 'new_status_labels' => Array('form'=>'!la_title_Adding_Form!'), Index: branches/RC/core/units/email_queue/email_queue_config.php =================================================================== diff -u -N -r11546 -r11612 --- branches/RC/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 11546) +++ branches/RC/core/units/email_queue/email_queue_config.php (.../email_queue_config.php) (revision 11612) @@ -33,7 +33,7 @@ 'label' => 'la_tab_EmailQueue', 'url' => Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'), 'permissions' => Array ('view', 'delete'), - 'priority' => 2, + 'priority' => 7.2, 'type' => stTAB, ), ), Index: branches/RC/core/install/english.lang =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/install/english.lang (.../english.lang) (revision 11610) +++ branches/RC/core/install/english.lang (.../english.lang) (revision 11612) @@ -1564,7 +1564,7 @@ U2hvdw== U2hvd2luZyBMb2dz U2hvd2luZyBTdGF0aXN0aWNz - U2hvdyBFbWFpbCBMb2c= + U2hvdyBFLW1haWxzIExvZw== U2hvd2luZyBMb2dz QW5kIHRoZW4gYnk= U3BhY2U= @@ -1644,38 +1644,38 @@ QWRtaW5pc3RyYXRpb24gUGFuZWwgVUk= QWR2YW5jZWQgVmlldw== QmFja3Vw - VXNlciBCYW4gTGlzdA== + QmFuIExpc3Q= QmFzZSBTdHlsZXM= QmxvY2sgU3R5bGVz Q2F0YWxvZw== - QnJvd3NlIFNpdGU= + QnJvd3NlIFdlYnNpdGU= Q2F0ZWdvcmllcw== U2VsZWN0IEl0ZW0= Q2F0ZWdvcnkgU2VsZWN0 Q2Vuc29yc2hpcA== - Q2hhbmdlIExvZw== + Q2hhbmdlcyBMb2c= Rm9ybXM= U3VibWlzc2lvbnM= Q29tbXVuaXR5 R2VuZXJhbCBTZXR0aW5ncw== Q2Vuc29yc2hpcA== Q3VzdG9tIEZpZWxkcw== - RS1tYWlsIFNldHRpbmdz + RS1tYWls Q29uZmlndXJhdGlvbg== R2VuZXJhbCBTZXR0aW5ncw== Q29uZmlndXJhdGlvbg== - T3V0cHV0IFNldHRpbmdz - U2VhcmNoIFNldHRpbmdz - R2VuZXJhbCBTZXR0aW5ncw== + T3V0cHV0 + U2VhcmNo + R2VuZXJhbA== U21pbGV5cw== U3lzdGVtIENvbmZpZ3VyYXRpb24= Q29uZmlndXJhdGlvbg== R2VuZXJhbCBTZXR0aW5ncw== Q3VzdG9t - RS1tYWlscw== + RS1tYWlsIFRlbXBsYXRlcw== RWRpdGluZyBSZXZpZXc= RW1haWwgRXZlbnRz - RW1haWwgTG9n + RS1tYWlscyBMb2c= RW1haWwgTWVzc2FnZQ== RW1haWwgUXVldWU= RXhwb3J0IERhdGE= @@ -1684,7 +1684,7 @@ RmlsZXM= Rm9ybXMgQ29uZmlndXJhdGlvbg== R2VuZXJhbA== - R2VuZXJhbCBTZXR0aW5ncw== + R2VuZXJhbA== R3JvdXA= R3JvdXBz U2VsZWN0IEdyb3Vw @@ -1714,24 +1714,24 @@ UmVnaW9uYWw= UmVsYXRlZCBTZWFyY2hlcw== UmVsYXRpb25z - U3VtbWFyeSAmIExvZ3M= + UmVwb3J0cyAmIExvZ3M= UmVzdG9yZQ== UmV2aWV3 - UmV2aWV3cw== + Q29tbWVudHM= UnVsZSBQcm9wZXJ0aWVz U2VhcmNo U2VhcmNoIExvZw== U2VhcmNoIEdyb3Vwcw== U2VhcmNoIFVzZXJz U2VuZCBlLW1haWw= U2VydmVyIEluZm9ybWF0aW9u - U3lzdGVtIFRvb2xz + U2VydmljZQ== U2Vzc2lvbiBMb2c= U2Vzc2lvbiBMb2c= R2VuZXJhbCBTZXR0aW5ncw== U2hvdyBBbGw= U2hvdyBTdHJ1Y3R1cmU= - U3RydWN0dXJlICYgRGF0YQ== + V2Vic2l0ZSAmIENvbnRlbnQ= U2tpbnM= U3RhdGlzdGljcw== U3R5bGVzaGVldHM= @@ -1744,7 +1744,7 @@ VG9vbHM= VXBkYXRlIExpY2Vuc2U= QmFuIHVzZXI= - VXNlciBCYW4gTGlzdA== + QmFuIExpc3Q= VXNlcnM= VXNlciBTZWxlY3Q= R3JvdXBz @@ -2081,9 +2081,7 @@ SW1hZ2Vz SW1wb3J0IERhdGE= SW1wb3J0IExhbmd1YWdlIFBhY2s= - SW4tYnVsbGV0aW4= - SW4tbGluaw== - SW4tbmV3eg== + SW4tZWRpdA== SW5zdGFsbGF0aW9uIEhlbHA= SW5zdGFsbCBMYW5ndWFnZSBQYWNrIC0gU3RlcCAx SW5zdGFsbCBMYW5ndWFnZSBQYWNrIC0gU3RlcCAy @@ -2118,14 +2116,14 @@ Tm8gUGVybWlzc2lvbnM= T3RoZXIgU2V0dGluZ3M= UGVybWlzc2lvbnM= - UGhyYXNlcw== + VHJhbnNsYXRpb25z UGxlYXNlIFdhaXQ= UHJvcGVydGllcw== UmVnaW9uYWw= UmVnaW9uYWwgU2V0dGluZ3M= UmVsYXRlZCBTZWFyY2hlcw== UmVsYXRpb25z - U3VtbWFyeSAmIExvZ3M= + UmVwb3J0cyAmIExvZ3M= UmVzdG9yZQ== UmV2aWV3cw== U2VhcmNoIExvZw== @@ -2144,10 +2142,10 @@ U2VuZGluZyBNZXNzYWdlLi4= U2Vzc2lvbiBMb2c= TW9kdWxlcyAmIFNldHRpbmdz - U3RydWN0dXJlICYgRGF0YQ== + V2Vic2l0ZSAmIENvbnRlbnQ= U3BlbGxpbmcgRGljdGlvbmFyeQ== U3RvcCBXb3Jkcw== - U3RydWN0dXJl + U3RydWN0dXJlICYgRGF0YQ== U3R5bGVzaGVldHM= U3VtbWFyeQ== U3lzdGVtIFRvb2xz @@ -2164,6 +2162,7 @@ Vmlld2luZyBmb3JtIHN1Ym1pc3Npb24= Vmlld2luZyBNYWlsaW5nIExpc3Q= VmlzaXRz + V2Vic2l0ZQ== V2Vic2l0ZSBTZXR0aW5ncw== dG8= Q3Vyci4gQ2F0ZWdvcnk= Index: branches/RC/core/units/logs/search_logs/search_logs_config.php =================================================================== diff -u -N -r11538 -r11612 --- branches/RC/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 11538) +++ branches/RC/core/units/logs/search_logs/search_logs_config.php (.../search_logs_config.php) (revision 11612) @@ -33,7 +33,7 @@ 'label' => 'la_tab_SearchLog', 'url' => Array('t' => 'logs/search_logs/search_log_list', 'pass' => 'm'), 'permissions' => Array('view', 'delete'), - 'priority' => 2, + 'priority' => 4, 'type' => stTREE, ), ), Index: branches/RC/core/admin_templates/img/icons/icon46_list_settings_output.gif =================================================================== diff -u -N Binary files differ Index: branches/RC/core/units/users/users_config.php =================================================================== diff -u -N -r11546 -r11612 --- branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 11546) +++ branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 11612) @@ -169,6 +169,70 @@ 'PermSection' => Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'), + 'Sections' => Array ( + 'in-portal:user_list' => Array ( + 'parent' => '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, + ), + + // user settings + 'in-portal:user_setting_folder' => Array ( + 'parent' => 'in-portal:system', + 'icon' => 'conf', + 'label' => 'la_title_Users', + 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:configure_users' => Array ( + 'parent' => 'in-portal:user_setting_folder', + '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' => 1, + 'type' => stTREE, + ), + + 'in-portal:user_email' => Array ( + 'parent' => 'in-portal:user_setting_folder', + 'icon' => 'settings_email', + 'label' => 'la_tab_ConfigE-mail', + 'url' => Array ('t' => 'config/config_email', 'module' => 'Core:Users', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view', 'edit'), + 'priority' => 2, + 'type' => stTREE, + ), + + 'in-portal:user_custom' => Array ( + 'parent' => 'in-portal:user_setting_folder', + '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' => 3, + 'type' => stTREE, + ), + ), + 'TableName' => TABLE_PREFIX.'PortalUser', 'ListSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s Index: branches/RC/core/install/upgrades.sql =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11610) +++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11612) @@ -1116,7 +1116,7 @@ ALTER TABLE CustomField ADD IsRequired TINYINT(3) UNSIGNED; -DELETE FROM Permissions WHERE Permission LIKE 'proj-cms:structure%'; +DELETE FROM Permissions WHERE (Permission LIKE 'proj-cms:structure%') OR (Permission IN ('proj-cms:submissions', 'proj-base:users_management')); UPDATE Permissions SET Permission = REPLACE(Permission, 'proj-cms:browse', 'in-portal:browse_site'); UPDATE Permissions SET Permission = REPLACE(Permission, 'proj-cms:', 'in-portal:'); @@ -1135,3 +1135,6 @@ DELETE FROM ConfigurationValues WHERE VariableName LIKE 'PerPage_Pages%'; UPDATE Modules SET Version = '5.0.0' WHERE Name = 'In-Portal'; + +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:website_setting_folder.view', 11, 1, 1, 0); +INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:user_setting_folder.view', 11, 1, 1, 0); Index: branches/RC/core/units/modules/modules_config.php =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/units/modules/modules_config.php (.../modules_config.php) (revision 11610) +++ branches/RC/core/units/modules/modules_config.php (.../modules_config.php) (revision 11612) @@ -30,12 +30,12 @@ 'Sections' => Array( 'in-portal:mod_status' => Array( - 'parent' => 'in-portal:system', + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'modules', 'label' => 'la_title_Module_Status', 'url' => Array('t' => 'modules/modules_list', 'pass' => 'm'), 'permissions' => Array('view', 'edit', 'advanced:approve', 'advanced:decline'), - 'priority' => 5, + 'priority' => 12, 'type' => stTREE, ), Index: branches/RC/core/units/ban_rules/ban_rules_config.php =================================================================== diff -u -N -r11546 -r11612 --- branches/RC/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 11546) +++ branches/RC/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 11612) @@ -40,7 +40,7 @@ 'label' => 'la_tab_BanList', 'url' => Array('t' => 'ban_rules/ban_rule_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), - 'priority' => 7, + 'priority' => 6, 'type' => stTREE, ), ), Index: branches/RC/core/units/logs/session_logs/session_logs_config.php =================================================================== diff -u -N -r11538 -r11612 --- branches/RC/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 11538) +++ branches/RC/core/units/logs/session_logs/session_logs_config.php (.../session_logs_config.php) (revision 11612) @@ -32,12 +32,12 @@ 'Sections' => Array ( 'in-portal:session_logs' => Array ( 'parent' => 'in-portal:reports', - 'icon' => 'conf_general', - 'label' => 'la_tab_SessionLogs', + 'icon' => 'sessions_log', + 'label' => 'la_tab_SessionLog', // 'la_tab_SessionLogs', 'url' => Array('t' => 'logs/session_logs/session_log_list', 'pass' => 'm'), 'permissions' => Array('view', 'delete'), - 'priority' => 0.1, - 'show_mode' => smSUPER_ADMIN, + 'priority' => 2, +// 'show_mode' => smSUPER_ADMIN, 'type' => stTREE, ), ), Index: branches/RC/core/units/logs/email_logs/email_logs_config.php =================================================================== diff -u -N -r11538 -r11612 --- branches/RC/core/units/logs/email_logs/email_logs_config.php (.../email_logs_config.php) (revision 11538) +++ branches/RC/core/units/logs/email_logs/email_logs_config.php (.../email_logs_config.php) (revision 11612) @@ -33,7 +33,7 @@ 'label' => 'la_tab_EmailLog', 'url' => Array('t' => 'logs/email_logs/email_log_list', 'pass' => 'm'), 'permissions' => Array ('view', 'delete'), - 'priority' => 4, + 'priority' => 5, 'type' => stTREE, ), ), Index: branches/RC/core/units/logs/change_logs/change_logs_config.php =================================================================== diff -u -N -r11560 -r11612 --- branches/RC/core/units/logs/change_logs/change_logs_config.php (.../change_logs_config.php) (revision 11560) +++ branches/RC/core/units/logs/change_logs/change_logs_config.php (.../change_logs_config.php) (revision 11612) @@ -48,12 +48,12 @@ 'Sections' => Array ( 'in-portal:change_logs' => Array ( 'parent' => 'in-portal:reports', - 'icon' => 'change_logs', + 'icon' => 'sessions_log', // 'change_logs', 'label' => 'la_tab_ChangeLog', 'url' => Array('t' => 'logs/change_logs/change_log_list', 'pass' => 'm'), 'permissions' => Array('view', 'edit', 'delete'), - 'priority' => 0.2, - 'show_mode' => smSUPER_ADMIN, + 'priority' => 3, +// 'show_mode' => smSUPER_ADMIN, 'type' => stTREE, ), ), Index: branches/RC/core/units/stylesheets/stylesheets_config.php =================================================================== diff -u -N -r11538 -r11612 --- branches/RC/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 11538) +++ branches/RC/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 11612) @@ -70,6 +70,18 @@ 'PermSection' => Array('main' => 'in-portal:configure_styles'), + /*'Sections' => Array ( + 'in-portal:configure_styles' => Array ( + 'parent' => 'in-portal:website_setting_folder', + 'icon' => 'style', + 'label' => 'la_tab_Stylesheets', + 'url' => Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'), + 'permissions' => Array('view', 'add', 'edit', 'delete'), + 'priority' => 10, + 'type' => stTREE, + ), + ),*/ + 'TableName' => TABLE_PREFIX.'Stylesheets', 'SubItems' => Array('selectorsbase', 'selectorsblock'), Index: branches/RC/core/admin_templates/img/icons/icon24_settings_general.gif =================================================================== diff -u -N Binary files differ Index: branches/RC/core/units/mailing_lists/mailing_lists_config.php =================================================================== diff -u -N -r11546 -r11612 --- branches/RC/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 11546) +++ branches/RC/core/units/mailing_lists/mailing_lists_config.php (.../mailing_lists_config.php) (revision 11612) @@ -43,7 +43,7 @@ 'icon' => 'custom', 'label' => 'la_title_MailingLists', 'permissions' => Array (), - 'priority' => 3.1, + 'priority' => 7, 'type' => stTREE, ), @@ -53,7 +53,7 @@ 'label' => 'la_title_MailingLists', 'url' => Array('t' => 'mailing_lists/mailing_list_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 1, + 'priority' => 7.1, 'type' => stTAB, ), ), Index: branches/RC/core/units/visits/visits_config.php =================================================================== diff -u -N -r11538 -r11612 --- branches/RC/core/units/visits/visits_config.php (.../visits_config.php) (revision 11538) +++ branches/RC/core/units/visits/visits_config.php (.../visits_config.php) (revision 11612) @@ -44,6 +44,18 @@ 'PermSection' => Array('main' => 'in-portal:visits'), + 'Sections' => Array ( + 'in-portal:visits' => Array ( + 'parent' => 'in-portal:reports', + 'icon' => 'visits', + 'label' => 'la_tab_Visits', + '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!"), 'visits.incommerce_list' => Array('prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits!"), Index: branches/RC/core/units/agents/agents_config.php =================================================================== diff -u -N -r11546 -r11612 --- branches/RC/core/units/agents/agents_config.php (.../agents_config.php) (revision 11546) +++ branches/RC/core/units/agents/agents_config.php (.../agents_config.php) (revision 11612) @@ -52,12 +52,12 @@ 'Sections' => Array ( 'in-portal:agents' => Array ( - 'parent' => 'in-portal:system', + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'agents', 'label' => 'la_title_Agents', 'url' => Array('t' => 'agents/agent_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 3.1, // after Themes section + 'priority' => 6, 'type' => stTREE, ), ), Index: branches/RC/core/units/themes/themes_config.php =================================================================== diff -u -N -r11546 -r11612 --- branches/RC/core/units/themes/themes_config.php (.../themes_config.php) (revision 11546) +++ branches/RC/core/units/themes/themes_config.php (.../themes_config.php) (revision 11612) @@ -22,12 +22,12 @@ 'Sections' => Array ( 'in-portal:configure_themes' => Array ( - 'parent' => 'in-portal:system', + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'conf_themes', 'label' => 'la_tab_Themes', 'url' => Array('t' => 'themes/themes_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), - 'priority' => 3, + 'priority' => 5, 'type' => stTREE, ), ), Index: branches/RC/core/units/categories/categories_config.php =================================================================== diff -u -N -r11574 -r11612 --- branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11574) +++ branches/RC/core/units/categories/categories_config.php (.../categories_config.php) (revision 11612) @@ -144,90 +144,47 @@ 'PermSection' => Array ('main' => 'CATEGORY:in-portal:categories', /*'search' => 'in-portal:configuration_search',*/ 'email' => 'in-portal:configuration_email', 'custom' => 'in-portal:configuration_custom'), - /*'Sections' => Array ( - // "Structure & Data" section - 'in-portal:site' => Array ( - 'parent' => 'in-portal:root', - 'icon' => 'struct', - 'label' => 'la_tab_Site_Structure', - 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array ('view'), - 'priority' => 1, - 'type' => stTREE, - ), - - 'in-portal:browse' => Array ( - 'parent' => 'in-portal:site', - 'icon' => 'catalog', - '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), - 'onclick' => 'checkCatalog(0)', - 'permissions' => Array ('view'), - 'priority' => 0.1, - 'type' => stTREE, - ), - - 'in-portal:advanced_view' => Array ( - 'parent' => 'in-portal:site', - 'icon' => 'advanced_view', - 'label' => 'la_tab_AdvancedView', - 'url' => Array ('t' => 'catalog/advanced_view', 'pass' => 'm'), - 'permissions' => Array ('view'), - 'priority' => 0.2, - 'type' => stTREE, - ), - - 'in-portal:reviews' => Array ( - 'parent' => 'in-portal:site', - 'icon' => 'reviews', - 'label' => 'la_tab_Reviews', - 'url' => Array ('index_file' => 'reviews.php', 'pass' => 'm'), - 'permissions' => Array ('view'), - 'priority' => 3, - 'type' => stTREE, - ), - - 'in-portal:configure_categories' => Array ( - 'parent' => 'in-portal:site', - 'icon' => 'cat_settings', - 'label' => 'la_tab_Settings', + 'Sections' => Array ( + 'in-portal:configure_categories' => Array ( + 'parent' => 'in-portal:website_setting_folder', + 'icon' => 'settings_output', + 'label' => 'la_tab_ConfigOutput', 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), - 'priority' => 4, + 'priority' => 11.1, 'type' => stTREE, ), - 'in-portal:configuration_search' => Array ( - 'parent' => 'in-portal:site', + 'in-portal:configuration_search' => Array ( + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'settings_search', 'label' => 'la_tab_ConfigSearch', - 'url' => Array ('t' => 'in-portal/config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'), + 'url' => Array ('t' => 'config/config_search', 'module_key' => 'category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), - 'priority' => 5, + 'priority' => 11.2, 'type' => stTREE, ), - 'in-portal:configuration_email' => Array ( - 'parent' => 'in-portal:site', + 'in-portal:configuration_email' => Array ( + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'settings_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array ('t' => 'in-portal/config/config_email', 'module' => 'In-Portal:Category', 'pass_section' => true, 'pass' => 'm'), + 'url' => Array ('t' => 'config/config_email', 'module' => 'Core:Category', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view', 'edit'), - 'priority' => 6, + 'priority' => 11.3, 'type' => stTREE, ), - 'in-portal:configuration_custom' => Array ( - 'parent' => 'in-portal:site', + 'in-portal:configuration_custom' => Array ( + 'parent' => 'in-portal:website_setting_folder', '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, + 'priority' => 11.4, 'type' => stTREE, ), - ),*/ + ), 'FilterMenu' => Array ( 'Groups' => Array ( Index: branches/RC/core/units/sections/sections_config.php =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 11610) +++ branches/RC/core/units/sections/sections_config.php (.../sections_config.php) (revision 11612) @@ -35,20 +35,10 @@ 'label' => 'la_tab_BrowsePages', 'url' => Array('t' => 'index', 'index_file' => '../index.php', 'admin' => 1, 'pass' => 'm'), 'permissions' => Array('view'), - 'priority' => 0.1, + 'priority' => 1, 'type' => stTREE, ), - 'in-portal:configemail' => Array( - 'parent' => 'in-portal:site', - 'icon' => 'core:e-mail', - 'label' => 'la_tab_E-mails', - 'url' => Array('t' => 'config/email_events', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view', 'edit'), - 'priority' => 0.2, - 'type' => stTREE, - ), - 'in-portal:browse' => Array ( 'parent' => 'in-portal:site', 'icon' => 'structure', // 'catalog' @@ -57,102 +47,41 @@ 'late_load' => Array ('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0), 'onclick' => 'checkCatalog(0)', 'permissions' => Array ('view'), - 'priority' => 1, + 'priority' => 2, 'type' => stTREE, ), - /*'in-portal:advanced_view' => Array ( + 'in-portal:configemail' => Array( 'parent' => 'in-portal:site', - 'icon' => 'advanced_view', - 'label' => 'la_tab_AdvancedView', - 'url' => Array ('t' => 'catalog/advanced_view', 'pass' => 'm'), - 'permissions' => Array ('view'), - 'priority' => 2, + 'icon' => 'core:e-mail', + 'label' => 'la_tab_E-mails', + 'url' => Array('t' => 'config/email_events', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array('view', 'edit'), + 'priority' => 6, 'type' => stTREE, - ),*/ + ), 'in-portal:reviews' => Array ( - 'parent' => 'in-portal:site', + 'parent' => 'in-portal:users', 'icon' => 'reviews', 'label' => 'la_tab_Reviews', 'url' => Array ('t' => 'reviews/reviews', 'pass' => 'm'), 'permissions' => Array ('view'), - 'priority' => 3, - 'type' => stTREE, - ), - - 'in-portal:configure_categories' => Array ( - 'parent' => 'in-portal:site', - 'icon' => 'cat_settings', - 'label' => 'la_tab_Settings', - 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array ('view', 'edit'), - 'priority' => 4, - 'type' => stTREE, - ), - - 'in-portal:configuration_search' => Array ( - 'parent' => 'in-portal:site', - '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'), 'priority' => 5, 'type' => stTREE, ), - 'in-portal:configuration_email' => Array ( - 'parent' => 'in-portal:site', - 'icon' => 'settings_email', - 'label' => 'la_tab_ConfigE-mail', - 'url' => Array ('t' => 'config/config_email', 'module' => 'Core:Category', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array ('view', 'edit'), - 'priority' => 6, - 'type' => stTREE, - ), - - 'in-portal:configuration_custom' => Array ( - 'parent' => 'in-portal:site', - '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' => 'community', 'label' => 'la_tab_Community', 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), - 'priority' => 2, + 'priority' => 3, 'type' => stTREE, 'SectionPrefix' => 'u', ), - 'in-portal:user_list' => Array ( - 'parent' => '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' => 'usergroups', @@ -164,36 +93,6 @@ 'type' => stTREE, ), - 'in-portal:configure_users' => Array ( - 'parent' => 'in-portal:users', - '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' => 4, - 'type' => stTREE, - ), - - 'in-portal:user_email' => Array ( - 'parent' => 'in-portal:users', - 'icon' => 'settings_email', - 'label' => 'la_tab_ConfigE-mail', - 'url' => Array ('t' => 'config/config_email', 'module' => 'Core:Users', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array ('view', 'edit'), - 'priority' => 5, - 'type' => stTREE, - ), - - 'in-portal:user_custom' => Array ( - 'parent' => 'in-portal:users', - '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' => 6, - 'type' => stTREE, - ), - // "Help" section 'in-portal:help' => Array ( 'parent' => 'in-portal:root', @@ -216,38 +115,17 @@ 'type' => stTREE, 'SectionPrefix' => 'adm', ), -/* - 'in-portal:log_summary' => Array ( + + /*'in-portal:log_summary' => Array ( 'parent' => 'in-portal:reports', 'icon' => 'summary', 'label' => 'la_tab_Summary', 'url' => Array ('index_file' => 'logs/summary.php', 'pass' => 'm'), 'permissions' => Array ('view'), 'priority' => 1, 'type' => stTREE, - ), + ),*/ - 'in-portal:sessionlog' => Array ( - 'parent' => 'in-portal:reports', - 'icon' => 'sessions_log', - 'label' => 'la_tab_SessionLog', - 'url' => Array ('index_file' => 'logs/session_list.php', 'pass' => 'm'), - 'permissions' => Array ('view', 'delete'), - 'priority' => 3, - 'type' => stTREE, - ), -*/ - - 'in-portal:visits' => Array ( - 'parent' => 'in-portal:reports', - 'icon' => 'visits', - 'label' => 'la_tab_Visits', - 'url' => Array ('t' => 'logs/visits/visits_list', 'pass' => 'm'), - 'permissions' => Array ('view', 'delete'), - 'priority' => 5, - 'type' => stTREE, - ), - // "Configuration" section 'in-portal:system' => Array ( 'parent' => 'in-portal:root', @@ -260,8 +138,24 @@ 'SectionPrefix' => 'adm', ), - 'in-portal:configure_general' => Array ( + 'in-portal:website_setting_folder' => Array ( 'parent' => 'in-portal:system', + 'icon' => 'conf', + 'label' => 'la_title_Website', + 'url' => Array ('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view'), + 'priority' => 1, + 'type' => stTREE, + 'SectionPrefix' => 'adm', + ), + + + + + + + 'in-portal:configure_general' => Array ( + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'conf_general', 'label' => 'la_tab_General', 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'), @@ -270,17 +164,6 @@ 'type' => stTREE, ), - 'in-portal:configure_styles' => Array ( - 'parent' => 'in-portal:system', - 'icon' => 'style', - 'label' => 'la_tab_Stylesheets', - 'url' => Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 4, - 'type' => stTREE, - 'SectionPrefix' => 'css', - ), - // "Tools" section 'in-portal:tools' => Array ( 'parent' => 'in-portal:root', Index: branches/RC/core/units/stop_words/stop_words_config.php =================================================================== diff -u -N -r11574 -r11612 --- branches/RC/core/units/stop_words/stop_words_config.php (.../stop_words_config.php) (revision 11574) +++ branches/RC/core/units/stop_words/stop_words_config.php (.../stop_words_config.php) (revision 11612) @@ -43,12 +43,12 @@ 'Sections' => Array ( 'in-portal:stop_words' => Array ( - 'parent' => 'in-portal:system', + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'custom', 'label' => 'la_title_StopWords', 'url' => Array('t' => 'stop_words/stop_word_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 3.3, + 'priority' => 8, 'type' => stTREE, ), ), Index: branches/RC/core/units/forms/forms_eh.php =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/units/forms/forms_eh.php (.../forms_eh.php) (revision 11610) +++ branches/RC/core/units/forms/forms_eh.php (.../forms_eh.php) (revision 11612) @@ -30,21 +30,8 @@ return; } - $base_priority = $sections['in-portal:forms']['priority']; - - $sections['in-portal:submissions'] = Array( - 'parent' => 'in-portal:site', - 'use_parent_header' => 1, - 'icon' => 'form_submission', - 'label' => 'la_tab_CMSForms', - 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => $base_priority + 0.1, - 'type' => stTREE, - ); - $form_subsection = Array( - 'parent' => 'in-portal:submissions', + 'parent' => 'in-portal:forms', 'icon' => 'form_submission', 'label' => '', 'url' => Array('t' => 'submissions/submissions_list', 'pass' => 'm,form'), Index: branches/RC/core/units/spelling_dictionary/spelling_dictionary_config.php =================================================================== diff -u -N -r11561 -r11612 --- branches/RC/core/units/spelling_dictionary/spelling_dictionary_config.php (.../spelling_dictionary_config.php) (revision 11561) +++ branches/RC/core/units/spelling_dictionary/spelling_dictionary_config.php (.../spelling_dictionary_config.php) (revision 11612) @@ -42,12 +42,12 @@ 'Sections' => Array ( 'in-portal:spelling_dictionary' => Array ( - 'parent' => 'in-portal:system', + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'spelling_dictionary', 'label' => 'la_title_SpellingDictionary', 'url' => Array('t' => 'spelling_dictionary/spelling_dictionary_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 3.2, + 'priority' => 7, 'type' => stTREE, ), ), Index: branches/RC/core/units/languages/languages_config.php =================================================================== diff -u -N -r11546 -r11612 --- branches/RC/core/units/languages/languages_config.php (.../languages_config.php) (revision 11546) +++ branches/RC/core/units/languages/languages_config.php (.../languages_config.php) (revision 11612) @@ -105,6 +105,9 @@ 'email_messages_edit' => Array( 'prefixes' => Array('lang','emailmessages'), 'new_titlefield' => Array('emailmessages' => ''), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"), + + // for separate language list + 'languages_list_st' => Array ('prefixes' => Array ('lang_List'), 'format' => "!la_title_LanguagesManagement!"), ), 'EditTabPresets' => Array ( 'Default' => Array ( @@ -118,12 +121,12 @@ 'Sections' => Array ( 'in-portal:configure_lang' => Array ( - 'parent' => 'in-portal:system', + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'conf_regional', 'label' => 'la_tab_Regional', 'url' => Array('t' => 'regional/languages_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:set_primary', 'advanced:import', 'advanced:export'), - 'priority' => 2, + 'priority' => 4, 'type' => stTREE, ), ), @@ -158,8 +161,26 @@ 'Fields' => Array( 'LanguageId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'PackName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), - 'LocalName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), + + 'PackName' => Array ( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', + 'option_title_field' => 'PackName', + 'option_key_field' => 'PackName', + 'not_null' => 1, 'required' => 1, 'default' => '' + ), + + + 'LocalName' => Array ( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', + 'option_title_field' => 'LocalName', + 'option_key_field' => 'LocalName', + '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), '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), @@ -191,13 +212,23 @@ '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'), 'Fields' => Array( 'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'PackName' => Array ('title' => 'la_col_PackName',), - 'LocalName' => Array ('title' => 'la_col_LocalName'), + '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'), ), ), + + 'LangManagement' => 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'), + 'Fields' => Array ( + 'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60), + 'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 120), + 'LocalName' => Array ('title' => 'la_col_Prefix', 'filter_block' => 'grid_options_filter', 'width' => 120), + 'IconURL' => Array ('title' => 'la_col_Image', 'filter_block' => 'grid_empty_filter', 'width' => 80), + ), + ), ), ); Index: branches/RC/core/admin_templates/img/icons/icon46_list_settings_general.gif =================================================================== diff -u -N Binary files differ Index: branches/RC/core/units/phrases/phrases_config.php =================================================================== diff -u -N -r11134 -r11612 --- branches/RC/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 11134) +++ branches/RC/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 11612) @@ -60,6 +60,10 @@ ), 'phrase_edit' => Array ('prefixes' => Array ('phrases'), 'format' => '#phrases_status# #phrases_titlefield#'), + + // for separate phrases list + 'phrases_list_st' => Array ('prefixes' => Array ('phrases.st_List'), 'format' => "!la_title_Phrases!"), + 'phrase_edit_single' => Array ('prefixes' => Array ('phrases'), 'format' => '#phrases_status# #phrases_titlefield#'), ), 'FilterMenu' => Array ( @@ -83,12 +87,19 @@ '' => Array ( 'PrimaryTranslation' => 'pri.Translation', ), + + 'st' => Array ( + 'PackName' => 'lang.PackName', + ), ), 'ListSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s - LEFT JOIN ' . TABLE_PREFIX . 'Phrase pri ON (%1$s.Phrase = pri.Phrase) AND (pri.LanguageId = 1)' + LEFT JOIN ' . TABLE_PREFIX . 'Phrase pri ON (%1$s.Phrase = pri.Phrase) AND (pri.LanguageId = 1)', + 'st' => 'SELECT %1$s.* %2$s + FROM %1$s + LEFT JOIN ' . TABLE_PREFIX . 'Language lang ON (%1$s.LanguageId = lang.LanguageId)', ), 'ListSortings' => Array ( @@ -130,6 +141,11 @@ 'LangFile' => Array (), 'ImportOverwrite' => Array (), 'DoNotEncode' => Array (), + 'PackName' => Array ( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY PackName', 'option_title_field' => 'PackName', 'option_key_field' => 'PackName', + ), ), 'Grids' => Array ( @@ -144,5 +160,17 @@ 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter'), ), ), + + 'Phrases' => Array ( + 'Icons' => Array ('default' => 'icon16_language_var.gif'), + '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), + 'PhraseType' => Array ('title' => 'la_col_Location', 'filter_block' => 'grid_options_filter', 'width' => 80), + 'Module' => Array ('title' => 'la_col_Module', 'filter_block' => 'grid_options_filter'), + ), + ), ), ); \ No newline at end of file Index: branches/RC/core/units/thesaurus/thesaurus_config.php =================================================================== diff -u -N -r11538 -r11612 --- branches/RC/core/units/thesaurus/thesaurus_config.php (.../thesaurus_config.php) (revision 11538) +++ branches/RC/core/units/thesaurus/thesaurus_config.php (.../thesaurus_config.php) (revision 11612) @@ -36,12 +36,12 @@ 'Sections' => Array ( 'in-portal:thesaurus' => Array ( - 'parent' => 'in-portal:system', + 'parent' => 'in-portal:website_setting_folder', 'icon' => 'custom', 'label' => 'la_title_Thesaurus', 'url' => Array('t' => 'thesaurus/thesaurus_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 3.4, + 'priority' => 9, 'type' => stTREE, ), ), Index: branches/RC/core/units/configuration/configuration_config.php =================================================================== diff -u -N -r11576 -r11612 --- branches/RC/core/units/configuration/configuration_config.php (.../configuration_config.php) (revision 11576) +++ branches/RC/core/units/configuration/configuration_config.php (.../configuration_config.php) (revision 11612) @@ -19,17 +19,17 @@ 'TitleField' => 'VariableName', 'TitlePresets' => Array( - 'default' => Array('tag_params' => Array('conf' => Array('per_page' => -1))), + 'default' => Array('tag_params' => Array('conf' => Array('per_page' => -1))), - 'config_list_general' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), - 'config_list_output' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), - 'config_list_contacts' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), + 'config_list_general' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), + 'config_list_output' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), + 'config_list_contacts' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), - 'config_list_categories' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), - 'config_list_users' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), + 'config_list_categories' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), + 'config_list_users' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"), - 'section_label' => Array('prefixes' => Array('conf_List'), 'format' => "#section_label#"), - ), + 'section_label' => Array ('prefixes' => Array ('conf_List'), 'format' => "#section_label#"), + ), 'TableName' => TABLE_PREFIX.'ConfigurationValues', Index: branches/RC/tools/debug_sample.php =================================================================== diff -u -N -r11431 -r11612 --- branches/RC/tools/debug_sample.php (.../debug_sample.php) (revision 11431) +++ branches/RC/tools/debug_sample.php (.../debug_sample.php) (revision 11612) @@ -39,7 +39,6 @@ // 'DBG_VALIDATE_CONFIGS' => 1, // Check that config fields match ones from database // 'DBG_SHOW_TAGS' => 1, // Show tags beeing processed // 'DBG_PRE_PARSE' => 1, // Show new compiled functions in debugger -// 'DBG_DECORATE_BLOCKS' => 1, // Decorate blocks // 'DBG_SHOW_TREE_PRIORITY'=> 1, // Show tree node priority // 'DBG_SKIP_AJAX' => 1, // Don't debug AJAX requests // 'DBG_PAYMENT_GW' => 1, // All requests to payment gateways goes in TEST MODE Index: branches/RC/core/admin_templates/img/icons/icon24_settings_output.gif =================================================================== diff -u -N Binary files differ Index: branches/RC/core/admin_templates/config/email_events.tpl =================================================================== diff -u -N -r11610 -r11612 --- branches/RC/core/admin_templates/config/email_events.tpl (.../email_events.tpl) (revision 11610) +++ branches/RC/core/admin_templates/config/email_events.tpl (.../email_events.tpl) (revision 11612) @@ -1,5 +1,5 @@ - + @@ -28,12 +28,12 @@ - +
- +