Index: trunk/core/units/themes/themes_config.php =================================================================== diff -u -r4607 -r5110 --- trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 4607) +++ trunk/core/units/themes/themes_config.php (.../themes_config.php) (revision 5110) @@ -31,7 +31,7 @@ 'label' => 'la_tab_Themes', 'url' => Array('index_file' => 'config/config_theme.php', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 2, + 'priority' => 3, 'type' => stTREE, ), Index: trunk/core/units/admin/admin_config.php =================================================================== diff -u -r4698 -r5110 --- trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4698) +++ trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 5110) @@ -142,23 +142,13 @@ 'type' => stTREE, ), - 'in-portal:export' => Array( - 'parent' => 'in-portal:tools', - 'icon' => 'tool_export', - 'label' => 'la_tab_ExportData', - 'url' => Array('index_file' => 'backup/export1.php', 'pass' => 'm'), - 'permissions' => Array('view'), - 'priority' => 3, - 'type' => stTREE, - ), - 'in-portal:main_import' => Array( 'parent' => 'in-portal:tools', 'icon' => 'tool_import', 'label' => 'la_tab_ImportData', 'url' => Array('index_file' => 'import/step1.php', 'pass' => 'm'), 'permissions' => Array('view'), - 'priority' => 4, + 'priority' => 3, 'type' => stTREE, ), @@ -168,7 +158,7 @@ 'label' => 'la_tab_QueryDB', 'url' => Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'), 'permissions' => Array('view', 'edit'), - 'priority' => 5, + 'priority' => 4, 'type' => stTREE, ), @@ -178,7 +168,7 @@ 'label' => 'la_tab_ServerInfo', 'url' => Array('index_file' => 'tools/server_info.php', 'pass' => 'm'), 'permissions' => Array('view'), - 'priority' => 6, + 'priority' => 5, 'type' => stTREE, ), Index: trunk/kernel/units/themes/themes_config.php =================================================================== diff -u -r4607 -r5110 --- trunk/kernel/units/themes/themes_config.php (.../themes_config.php) (revision 4607) +++ trunk/kernel/units/themes/themes_config.php (.../themes_config.php) (revision 5110) @@ -31,7 +31,7 @@ 'label' => 'la_tab_Themes', 'url' => Array('index_file' => 'config/config_theme.php', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 2, + 'priority' => 3, 'type' => stTREE, ), Index: trunk/kernel/units/admin/admin_config.php =================================================================== diff -u -r4698 -r5110 --- trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4698) +++ trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 5110) @@ -142,23 +142,13 @@ 'type' => stTREE, ), - 'in-portal:export' => Array( - 'parent' => 'in-portal:tools', - 'icon' => 'tool_export', - 'label' => 'la_tab_ExportData', - 'url' => Array('index_file' => 'backup/export1.php', 'pass' => 'm'), - 'permissions' => Array('view'), - 'priority' => 3, - 'type' => stTREE, - ), - 'in-portal:main_import' => Array( 'parent' => 'in-portal:tools', 'icon' => 'tool_import', 'label' => 'la_tab_ImportData', 'url' => Array('index_file' => 'import/step1.php', 'pass' => 'm'), 'permissions' => Array('view'), - 'priority' => 4, + 'priority' => 3, 'type' => stTREE, ), @@ -168,7 +158,7 @@ 'label' => 'la_tab_QueryDB', 'url' => Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'), 'permissions' => Array('view', 'edit'), - 'priority' => 5, + 'priority' => 4, 'type' => stTREE, ), @@ -178,7 +168,7 @@ 'label' => 'la_tab_ServerInfo', 'url' => Array('index_file' => 'tools/server_info.php', 'pass' => 'm'), 'permissions' => Array('view'), - 'priority' => 6, + 'priority' => 5, 'type' => stTREE, ), Index: trunk/core/units/languages/languages_config.php =================================================================== diff -u -r4758 -r5110 --- trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 4758) +++ trunk/core/units/languages/languages_config.php (.../languages_config.php) (revision 5110) @@ -97,7 +97,7 @@ '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' => 4, + 'priority' => 2, 'type' => stTREE, ), Index: trunk/kernel/admin_templates/incs/ajax.js =================================================================== diff -u -r5073 -r5110 --- trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5073) +++ trunk/kernel/admin_templates/incs/ajax.js (.../ajax.js) (revision 5110) @@ -121,7 +121,9 @@ /*$div.style.border = '1px solid green'; $div.style.backgroundColor = '#FF0000';*/ - var $table = addElement($div, 'table'); + $div.innerHTML = '
'+Request.progressText+'
'+escape(Request.progressText)+'
'; + + /*var $table = addElement($div, 'table'); $table.style.width = '100%'; $table.style.height = '100%'; var $tbody = addElement($table, 'tbody'); @@ -137,7 +139,7 @@ $img.align = 'absmiddle'; $img.width = 100; $img.height = 7; - $img.alt = Request.progressText; + $img.alt = Request.progressText;*/ return $div; } Index: trunk/kernel/units/languages/languages_config.php =================================================================== diff -u -r4758 -r5110 --- trunk/kernel/units/languages/languages_config.php (.../languages_config.php) (revision 4758) +++ trunk/kernel/units/languages/languages_config.php (.../languages_config.php) (revision 5110) @@ -97,7 +97,7 @@ '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' => 4, + 'priority' => 2, 'type' => stTREE, ), Index: trunk/admin/install/upgrades/inportal_upgrade_v1.2.0.sql =================================================================== diff -u -r4914 -r5110 --- trunk/admin/install/upgrades/inportal_upgrade_v1.2.0.sql (.../inportal_upgrade_v1.2.0.sql) (revision 4914) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.2.0.sql (.../inportal_upgrade_v1.2.0.sql) (revision 5110) @@ -15,6 +15,7 @@ ALTER TABLE PhraseCache ADD ConfigVariables text; UPDATE ConfigurationAdmin SET ValueList = '0=lu_none,SELECT GroupId AS OptionName, CONCAT(''+'', Name) AS OptionValue FROM PortalGroup WHERE Enabled=1 AND Personal=0' WHERE VariableName IN ('User_NewGroup','User_GuestGroup','User_SubscriberGroup','User_LoggedInGroup'); +UPDATE ConfigurationAdmin SET heading = 'la_Text_General' WHERE VariableName = 'Category_Sortorder2'; INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:root.view', 11, 1, 1, 0); INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:site.view', 11, 1, 1, 0); Index: trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.sql =================================================================== diff -u -r5108 -r5110 --- trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.sql (.../inportal_upgrade_v1.2.1.sql) (revision 5108) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.sql (.../inportal_upgrade_v1.2.1.sql) (revision 5110) @@ -1,3 +1,4 @@ ALTER TABLE Cache ADD LifeTime INT NOT NULL DEFAULT '-1'; - +ALTER TABLE ConfigurationAdmin CHANGE DisplayOrder DisplayOrder DOUBLE NOT NULL DEFAULT '0'; +ALTER TABLE ConfigurationAdmin ADD GroupDisplayOrder DOUBLE NOT NULL AFTER DisplayOrder; UPDATE Modules SET Version = '1.2.1' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -r5108 -r5110 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 5108) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 5110) @@ -72,7 +72,8 @@ element_type varchar(20) NOT NULL default '', validation varchar(255) default NULL, ValueList text default NULL, - DisplayOrder int(11) NOT NULL default '0', + DisplayOrder double NOT NULL default '0', + GroupDisplayOrder double NOT NULL default '0', Install int(11) NOT NULL default '1', PRIMARY KEY (VariableName) ) Index: trunk/core/units/modules/modules_config.php =================================================================== diff -u -r4687 -r5110 --- trunk/core/units/modules/modules_config.php (.../modules_config.php) (revision 4687) +++ trunk/core/units/modules/modules_config.php (.../modules_config.php) (revision 5110) @@ -34,7 +34,7 @@ 'label' => 'la_tab_ModulesManagement', 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), - 'priority' => 1.1, + 'priority' => 5, 'type' => stTREE, ), Index: trunk/kernel/units/modules/modules_config.php =================================================================== diff -u -r4687 -r5110 --- trunk/kernel/units/modules/modules_config.php (.../modules_config.php) (revision 4687) +++ trunk/kernel/units/modules/modules_config.php (.../modules_config.php) (revision 5110) @@ -34,7 +34,7 @@ 'label' => 'la_tab_ModulesManagement', 'url' => Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array('view'), - 'priority' => 1.1, + 'priority' => 5, 'type' => stTREE, ), Index: trunk/core/units/stylesheets/stylesheets_config.php =================================================================== diff -u -r4685 -r5110 --- trunk/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 4685) +++ trunk/core/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 5110) @@ -69,7 +69,7 @@ 'label' => 'la_tab_Stylesheets', 'url' => Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 3, + 'priority' => 4, 'type' => stTREE, ), Index: trunk/kernel/units/stylesheets/stylesheets_config.php =================================================================== diff -u -r4685 -r5110 --- trunk/kernel/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 4685) +++ trunk/kernel/units/stylesheets/stylesheets_config.php (.../stylesheets_config.php) (revision 5110) @@ -69,7 +69,7 @@ 'label' => 'la_tab_Stylesheets', 'url' => Array('t' => 'stylesheets/stylesheets_list', 'pass' => 'm'), 'permissions' => Array('view', 'add', 'edit', 'delete'), - 'priority' => 3, + 'priority' => 4, 'type' => stTREE, ), Index: trunk/kernel/units/general/custom_fields.php =================================================================== diff -u -r2285 -r5110 --- trunk/kernel/units/general/custom_fields.php (.../custom_fields.php) (revision 2285) +++ trunk/kernel/units/general/custom_fields.php (.../custom_fields.php) (revision 5110) @@ -10,7 +10,7 @@ function GetValuesHash($values_list) { $optionValuesStr = $this->ParseConfigSQL($values_list); - $optionValuesTmp = explode(',', $optionValuesStr); + $optionValuesTmp = explode(',', trim($optionValuesStr, ',')); $optionValues = Array(); foreach($optionValuesTmp as $optionValue) { Index: trunk/core/units/general/custom_fields.php =================================================================== diff -u -r2285 -r5110 --- trunk/core/units/general/custom_fields.php (.../custom_fields.php) (revision 2285) +++ trunk/core/units/general/custom_fields.php (.../custom_fields.php) (revision 5110) @@ -10,7 +10,7 @@ function GetValuesHash($values_list) { $optionValuesStr = $this->ParseConfigSQL($values_list); - $optionValuesTmp = explode(',', $optionValuesStr); + $optionValuesTmp = explode(',', trim($optionValuesStr, ',')); $optionValues = Array(); foreach($optionValuesTmp as $optionValue) { Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -r5106 -r5110 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5106) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5110) @@ -5,7 +5,7 @@ INSERT INTO ConfigurationAdmin VALUES ('Category_Sortfield', 'la_Text_General', 'la_category_sortfield_prompt', 'select', '', 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,Pop=la_Category_Pop,SELECT FieldLabel as OptionName, FieldName as OptionValue FROM CustomField WHERE Type=0', 1, 1); INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder', 'la_Text_General', 'la_category_sortfield_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 2, 1); INSERT INTO ConfigurationAdmin VALUES ('Category_Sortfield2', 'la_Text_General', 'la_category_sortfield2_prompt', 'select', '', 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,Pop=la_Category_Pop,SELECT FieldLabel as OptionName, FieldName as OptionValue FROM CustomField WHERE Type=0', 3, 1); -INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder2', 'la_text_General', 'la_category_sortfield2_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 4, 1); +INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder2', 'la_Text_General', 'la_category_sortfield2_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 4, 1); INSERT INTO ConfigurationAdmin VALUES ('Perpage_Category', 'la_Text_General', 'la_category_perpage_prompt', 'text', '', '', 5, 1); INSERT INTO ConfigurationAdmin VALUES ('Category_DaysNew', 'la_Text_General', 'la_category_daysnew_prompt', 'text', '', '', 6, 1); INSERT INTO ConfigurationAdmin VALUES ('Category_ShowPick', 'la_Text_General', 'la_category_showpick_prompt', 'checkbox', '', '', 7, 1);