Index: branches/5.0.x/core/units/sections/site_config_eh.php =================================================================== diff -u -r12117 -r12265 --- branches/5.0.x/core/units/sections/site_config_eh.php (.../site_config_eh.php) (revision 12117) +++ branches/5.0.x/core/units/sections/site_config_eh.php (.../site_config_eh.php) (revision 12265) @@ -1,6 +1,6 @@ Application->UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs'; + $preset_name = $this->Application->ConfigValue('AdminConsoleInterface'); + $base_path = FULL_PATH . ADMIN_DIRECTORY . '/system_presets/' . $preset_name; } $prefix_file = basename( $this->Application->UnitConfigReader->getPrefixFile($event->MasterEvent->Prefix) ); Index: branches/5.0.x/core/install/upgrades.sql =================================================================== diff -u -r12264 -r12265 --- branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12264) +++ branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12265) @@ -1435,4 +1435,12 @@ ALTER TABLE ConfigurationAdmin CHANGE validation Validation TEXT NULL DEFAULT NULL; UPDATE ConfigurationAdmin SET Validation = 'a:3:{s:4:"type";s:3:"int";s:13:"min_value_inc";i:1;s:8:"required";i:1;}' WHERE VariableName = 'SessionTimeout'; +INSERT INTO ConfigurationAdmin VALUES ('AdminConsoleInterface', 'la_section_SettingsAdmin', 'la_config_AdminConsoleInterface', 'select', '', 'simple=+simple,intermediate=+intermediate,advanced=+advanced', 50.01, 0, 1); +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminConsoleInterface', 'simple', 'In-Portal', 'in-portal:configure_general'); + +INSERT INTO ConfigurationAdmin VALUES ('AllowAdminConsoleInterfaceChange', 'la_section_SettingsAdmin', 'la_config_AllowAdminConsoleInterfaceChange', 'checkbox', NULL , NULL , 40.01, 0, 0); +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowAdminConsoleInterfaceChange', '1', 'In-Portal', 'in-portal:configure_advanced'); + +UPDATE ConfigurationAdmin SET DisplayOrder = DisplayOrder + 0.01 WHERE VariableName IN ('UseToolbarLabels', 'UseSmallHeader', 'UseColumnFreezer', 'UsePopups', 'UseDoubleSorting', 'MenuFrameWidth', 'ResizableFrames', 'AutoRefreshIntervals', 'DebugOnlyFormConfigurator', 'UseModalWindows'); + UPDATE Modules SET Version = '5.0.1', Loaded = 1 WHERE Name = 'In-Portal'; \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/admin_admin.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/admin_admin.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/admin_admin.php (revision 12265) @@ -0,0 +1,6 @@ + Array ('new_agent', 'edit', 'delete', 'approve', 'decline', 'cancel', 'view', 'dbl-click'), + +// edit agent +// 'agent_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /* 'AgentId', 'AgentName', 'AgentType', 'Status', 'Event', 'RunInterval', 'RunMode', 'LastRunOn', + 'LastRunStatus', 'NextRunOn', 'RunTime', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + ); + + // fields to make required + $required_fields = Array ( + /* 'AgentId', 'AgentName', 'AgentType', 'Status', 'Event', 'RunInterval', 'RunMode', 'LastRunOn', + 'LastRunStatus', 'NextRunOn', 'RunTime', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( ); + + // tabs during editing + $hide_edit_tabs = Array ( + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ( 'AgentId', 'AgentName', 'AgentType', 'Status', 'Event', 'RunInterval', 'RunMode', 'LastRunOn', 'LastRunStatus', 'NextRunOn', ), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/ban_rules_ban-rule.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/ban_rules_ban-rule.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/ban_rules_ban-rule.php (revision 12265) @@ -0,0 +1,51 @@ + Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), + +// edit email body direct +// 'ban_rule_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /* 'RuleId', 'RuleType', 'MessageType', 'LanguageId', 'ItemVerb', 'ItemValue', 'ItemType', 'Priority', + 'Status', 'ErrorTag', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + ); + + // fields to make required + $required_fields = Array ( + /* 'RuleId', 'RuleType', 'MessageType', 'LanguageId', 'ItemVerb',*/ 'ItemValue', /*'ItemType', 'Priority', + 'Status', 'ErrorTag', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('RuleId', 'RuleType', 'ItemField', 'ItemVerb', 'ItemValue', 'Status', ), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/categories_c.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/categories_c.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/categories_c.php (revision 12265) @@ -0,0 +1,82 @@ + Array (/*'select', 'cancel', 'upcat', 'homecat', 'new_cat', 'new_link', 'new_article', 'new_topic', 'new_item', 'edit', 'delete',*/ 'approve', 'decline', /*'cut', 'copy', 'paste', 'move_up', 'move_down',*/ 'rebuild_cache', /*'view', 'dbl-click',*/ ), + + 'advanced_view' => Array (/*'select', 'cancel', 'new_cat', 'edit', 'delete',*/ 'approve', 'decline', /*'view', 'dbl-click' */), + +// 'categories_relations' => Array ('select', 'cancel', 'prev', 'next', 'new_relation', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), +// 'categories_propertiries' => Array ('select', 'cancel', 'prev', 'next'), + +// 'categories_permissions' => Array ('select', 'cancel', 'prev', 'next'), + +// 'categories_images' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), + +// 'reviews' => Array ('edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), + +// 'categories_related_searches' => Array ('new_related_search', 'edit', 'delete', 'move_up', 'move_down', 'approve', 'decline', 'view', 'dbl-click'), + +// 'related_searches_edit' => Array ('select', 'cancel'), + ); + + // fields to hide + $hidden_fields = Array ( + 'CategoryId', /*'Type',*/ 'SymLinkCategoryId', /*'ParentId', 'Name', 'Filename', 'AutomaticFilename',*/ + 'Description', 'CreatedOn', 'EditorsPick', 'Status', /*'Priority', 'MetaKeywords', 'CachedDescendantCatsQty', + 'CachedNavbar', 'CreatedById', 'ResourceId', 'ParentPath', 'TreeLeft', 'TreeRight', 'NamedParentPath', + 'MetaDescription', 'HotItem',*/ 'NewItem', /*'PopItem', 'Modified', 'ModifiedById', 'CachedTemplate',*/ + 'Template', 'UseExternalUrl', 'ExternalUrl', 'UseMenuIconUrl', 'MenuIconUrl', 'Title', 'MenuTitle', + /*'MetaTitle', 'IndexTools', 'IsIndex', 'IsMenu', 'IsSystem',*/ 'FormId', 'FormSubmittedTemplate', + /*'Translated', 'FriendlyURL', 'ThemeId'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /*'CurrentSort', 'IsNew', 'OldPriority', 'SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', + 'LocalImage', 'LocalPath', 'FullUrl'*/ + ); + + $debug_only_fields = Array ( + 'Filename', 'AutomaticFilename', 'IsIndex', + ); + + // fields to make required + $required_fields = Array ( + 'ParentId', 'Name', 'Filename', 'CreatedOn', 'Priority', + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + 'Default' => Array (/*'general', */'properties', 'relations', 'related_searches', 'images', 'permissions', 'custom', ), + ); + + // hide columns in grids + $hide_columns = Array ( + 'Default' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu', 'IsSystem',*/ 'Priority'), + 'DefaultShowAll' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu', 'IsSystem', 'Priority', 'CachedNavbar'*/), + 'Radio' => Array (/*'CategoryId', 'Name', 'Modified', 'Template', 'IsMenu', 'IsSystem',*/ 'Priority'), + 'RadioShowALl' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu', 'IsSystem', 'Priority', 'CachedNavbar'*/), + 'Structure' => Array (/*'CategoryId', 'Name', 'Modified', 'Template', 'IsMenu', 'Path', 'IsSystem',*/ 'Priority'), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/change_logs_change-log.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/change_logs_change-log.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/change_logs_change-log.php (revision 12265) @@ -0,0 +1,36 @@ + Array ('view_item', 'view'), + +// view changed records +// 'change_log_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'ChangeLogId', 'PortalUserId', 'SessionLogId', 'Action', 'OccuredOn', 'Prefix', 'ItemId', 'Changes', 'MasterPrefix', 'MasterId',*/ + ); + + // fields to make required + $required_fields = Array ( + /*'ChangeLogId', 'PortalUserId', 'SessionLogId', 'Action', 'OccuredOn', 'Prefix', 'ItemId', 'Changes', 'MasterPrefix', 'MasterId',*/ + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('ChangeLogId', 'PortalUserId', 'UserLogin', 'UserFirstName', 'UserLastName', 'SessionLogId', 'Action', 'OccuredOn', 'MasterPrefix', 'MasterId', 'Prefix', 'ItemId', 'Changes'), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/email_logs_email-log.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/email_logs_email-log.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/email_logs_email-log.php (revision 12265) @@ -0,0 +1,43 @@ + Array ('refresh', 'reset', 'view'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'EmailLogId', 'fromuser', 'addressto', 'subject', 'timestamp', 'event', 'EventParams'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'EmailLogId', 'fromuser', 'addressto', 'subject', 'timestamp', 'event', 'EventParams'*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('EmailLogId', 'fromuser', 'addressto', 'subject', 'timestamp', 'event'), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/email_messages_emailmessages.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/email_messages_emailmessages.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/email_messages_emailmessages.php (revision 12265) @@ -0,0 +1,54 @@ + Array ('edit', 'view', 'dbl-click'), + +// edit email body direct +// 'email_messages_edit_direct' => Array ('select', 'cancel', 'reset_edit'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'EmailMessageId', 'Template',*/ 'MessageType', /*'LanguageId', 'EventId', 'Subject' */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + 'Headers',/* 'Body', 'ReplacementTags', 'Description', 'Module', 'Type', 'MassSubject', 'MassAttachment', + 'MassHtmlMessage', 'MassTextMessage', */ + ); + + // fields to make required + $required_fields = Array ( + /*'EmailMessageId', 'Template', 'MessageType', 'LanguageId', 'EventId', 'Subject' */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + /* 'Headers', 'Body', 'ReplacementTags', 'Description', 'Module', 'Type', 'MassSubject', 'MassAttachment', + 'MassHtmlMessage', 'MassTextMessage', */ + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('Subject', 'Description', 'Type', ), +// 'Emails' => Array ('EventId', 'Subject', 'Description', 'Type', 'LanguageId', ), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/files_file.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/files_file.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/files_file.php (revision 12265) @@ -0,0 +1,43 @@ + Array ('FileId', 'FileName', 'Status'), + ); Index: branches/5.0.x/admin/system_presets/simple/files_l-file.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/files_l-file.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/files_l-file.php (revision 12265) @@ -0,0 +1,7 @@ +UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs/'; + + // include site config settings from main "file" prefix + include('files_file.php'); Index: branches/5.0.x/admin/system_presets/simple/form_fields_formflds.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/form_fields_formflds.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/form_fields_formflds.php (revision 12265) @@ -0,0 +1,34 @@ + Array ('FormFieldId', 'FieldName', 'FieldLabel', 'Priority', 'ElementType', 'Required', 'DisplayInGrid'), + ); Index: branches/5.0.x/admin/system_presets/simple/form_submissions_formsubs.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/form_submissions_formsubs.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/form_submissions_formsubs.php (revision 12265) @@ -0,0 +1,41 @@ + Array ('edit', 'delete', 'dbl-click'), + +// editing form +// 'formsubs_view' => Array ('cancel', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /* 'FormSubmissionId', 'FormId', 'SubmissionTime', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /* 'FormSubmissionId', 'FormId', 'SubmissionTime', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// submission columns +// 'Default' => Array ('FormSubmissionId', 'SubmissionTime'), + ); Index: branches/5.0.x/admin/system_presets/simple/forms_form.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/forms_form.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/forms_form.php (revision 12265) @@ -0,0 +1,58 @@ + Array ('new_form', 'edit', 'delete', 'view', 'dbl-click'), + +// editing form +// 'forms_edit' => Array ('select', 'cancel', 'prev', 'next'), + +// edit list of fields when adding/editing form +// 'forms_edit_fields' => Array ('select', 'cancel', 'prev', 'next', 'new_item', 'edit', 'delete', 'move_up', 'move_down', 'view', 'dbl-click'), + +// edit form field when adding/editing form +// 'form_field_edit' => Array ('select', 'cancel'), + ); + + // fields to hide + $hidden_fields = Array ( + /* 'FormId', 'Title', 'Description', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /* 'FormId',*/ 'Title', /* 'Description', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// tabs during form editing +// 'Default' => Array ('general', 'fields'), + ); + + // hide columns in grids + $hide_columns = Array ( +// list of forms +// 'Default' => Array ('FormId', 'Title'), + ); Index: branches/5.0.x/admin/system_presets/simple/groups_g.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/groups_g.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/groups_g.php (revision 12265) @@ -0,0 +1,75 @@ + Array ('new_group', 'edit', 'delete', 'e-mail', 'view', 'dbl-click'), + +// "Select Group" on Groups tab when adding/editing User +// 'groups_edit' => Array ('select', 'cancel', 'prev', 'next'), + +// edit users when adding/editing group +// 'groups_edit_users' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'delete', 'view'), + +// edit permission on permissions tab when adding/editing group +// 'groups_edit_permissions' => Array ('select', 'cancel', 'prev', 'next'), + +// edit advanced permissions on permissions tab when adding/editing group +// 'groups_edit_additional_permissions' => Array ('select', 'cancel'), + +// select group when adding/editing user +// 'select_group' => Array ('select', 'cancel', 'view'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'GroupId', 'Name', 'Description', 'CreatedOn','System', 'Personal', 'Enabled', 'ResourceId',*/ + 'FrontRegistration', + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /* 'UserCount', */ + ); + + // fields to make required + $required_fields = Array ( + /* 'GroupId', */ 'Name', /* 'Description', 'CreatedOn','System', 'Personal', 'Enabled', 'ResourceId', + 'FrontRegistration', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + /* 'UserCount', */ + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// tabs during groups editing +// 'Default' => Array ('general', 'users', 'permissions'), + ); + + // hide columns in grids + $hide_columns = Array ( +// list of groups +// 'Default' => Array ('GroupId', 'Name', 'UserCount', 'FrontRegistration'), + +// do we need this? +// 'UserGroups' => Array ('GroupId', 'Name'), + +// list of groups with radio type list +// 'Radio' => Array ('GroupId', 'Name', 'Description'), + +// list of groups on add group to user page (when editing user) +// 'GroupSelector' => Array ('GroupId', 'Name', 'Description'), + ); Index: branches/5.0.x/admin/system_presets/simple/images_img.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/images_img.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/images_img.php (revision 12265) @@ -0,0 +1,46 @@ + Array ('ImageId', 'Name', 'AltName', 'Url', 'Enabled', 'Preview'), + ); Index: branches/5.0.x/admin/system_presets/simple/images_l-img.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/images_l-img.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/images_l-img.php (revision 12265) @@ -0,0 +1,7 @@ +UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs/'; + + // include site config settings from main "img" prefix + include('images_img.php'); Index: branches/5.0.x/admin/system_presets/simple/images_u-img.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/images_u-img.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/images_u-img.php (revision 12265) @@ -0,0 +1,7 @@ +UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs/'; + + // include site config settings from main "img" prefix + include('images_img.php'); Index: branches/5.0.x/admin/system_presets/simple/languages_lang.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/languages_lang.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/languages_lang.php (revision 12265) @@ -0,0 +1,18 @@ + Array (), + +// "General" tab during link adding/editing +// 'links_edit' => Array ('select', 'cancel', 'prev', 'next'), + +// "Images" tab during link adding/editing +// 'links_images' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), + +// "Categories" tab during link adding/editing +// 'links_categories' => Array ('select', 'cancel', 'prev', 'next', 'new_cat', 'delete', 'primary_cat',), + +// "Relations" tab during link adding/editing +// 'links_relations' => Array ('select', 'cancel', 'prev', 'next', 'new_relation', 'edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), + +// "Custom" tab during user/admin adding/editing +// 'links_custom' => Array ('select', 'cancel', 'prev', 'next'), + +// "Files" tab +// 'links_files' => Array ('select', 'cancel', 'prev', 'next', 'new_file', 'edit', 'delete', 'view', 'dbl-click'), + +// "Reviews" tab during admin adding/editing AND separate password change form for non-"root" users (in top frame) +// 'links_reviews' => Array ('select', 'cancel', 'prev', 'next', 'new_review', 'edit', 'delete', 'approve', 'decline', 'move_up', 'move_down', 'view', 'dbl-click'), + +// edit iamge +// 'images_edit' => Array ('select', 'cancel'), + +// edit file +// 'file_edit' => Array ('select', 'cancel'), + +// user/admin group membership editing (used on "Groups" tab during user/admin adding/editing) +// 'reviews_edit' => Array ('select', 'cancel'), + +// user image adding/editing (used on "Images" tab during user adding/editing) +// 'relations_edit' => Array ('select', 'cancel'), + +// duplicate links +// 'duplicate_links' => Array ('view_item', 'view', 'dbl-click'), + +// duplicate links -> view duplicates of the link +// 'duplicate_links_view' => Array ('cancel', 'edit', 'delete', 'merge_links', 'view', 'dbl-click'), + + ); + + // fields to hide + $hidden_fields = Array ( + /* 'LinkId', 'Name', 'AutomaticFilename', 'Description', 'Url', 'CreatedOn', 'Modified', 'Expire', + 'Hits', 'CachedRating', 'CachedVotesQty', 'CachedReviewsQty', 'CreatedById', 'ModifiedById' , 'Priority', 'Status', 'EditorPick', + 'ResourceId', 'HotItem', 'PopItem', 'NewItem', 'OrgId', 'CustomTemplate', 'MetaKeywords', 'MetaDescription', 'ReciprocalLinkFound', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /*'UserName', 'DupeCount', 'ListingTypeId', 'MoreCategories', 'CategoryId', 'ExportFormat', 'ExportFilename', + 'FieldsSeparatedBy', 'FieldsEnclosedBy', 'LineEndings', 'LineEndingsInside', 'IncludeFieldTitles', 'ExportColumns', + 'AvailableColumns', 'CategoryFormat', 'CategorySeparator', 'IsBaseCategory', 'FieldTitles', 'ImportSource', + 'ImportFilename', 'ImportLocalFilename', 'CheckDuplicatesMethod', 'ReplaceDuplicates', 'DuplicateCheckFields', + 'SkipFirstRow', 'ThumbnailImage', 'FullImage', 'ImageAlt', 'Filename', 'CachedNavbar', 'ParentPath', + 'SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath', 'FullUrl', */ + ); + + // fields to make required + $required_fields = Array ( + /* 'LinkId', */ 'Name', /* 'AutomaticFilename', 'Description',*/ 'Url', /*'CreatedOn', 'Modified', 'Expire', + 'Hits', 'CachedRating', 'CachedVotesQty', 'CachedReviewsQty', 'CreatedById', 'ModifiedById' , 'Priority', 'Status', 'EditorPick', + 'ResourceId', 'HotItem', 'PopItem', 'NewItem', 'OrgId', 'CustomTemplate', 'MetaKeywords', 'MetaDescription', 'ReciprocalLinkFound', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + /*'UserName', 'DupeCount', 'ListingTypeId', 'MoreCategories', 'CategoryId', 'ExportFormat', 'ExportFilename', + 'FieldsSeparatedBy', 'FieldsEnclosedBy', 'LineEndings', 'LineEndingsInside', 'IncludeFieldTitles', 'ExportColumns', + 'AvailableColumns', 'CategoryFormat', 'CategorySeparator', 'IsBaseCategory', 'FieldTitles', 'ImportSource', + 'ImportFilename', 'ImportLocalFilename', 'CheckDuplicatesMethod', 'ReplaceDuplicates', 'DuplicateCheckFields', + 'SkipFirstRow', 'ThumbnailImage', 'FullImage', 'ImageAlt', 'Filename', 'CachedNavbar', 'ParentPath', + 'SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath', 'FullUrl', */ + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// tabs during link adding/editing +// 'Default' => Array ('general', 'categories', 'relations', 'images', 'files', 'reviews', 'custom'), + ); + + // hide columns in grids + $hide_columns = Array ( +// default grid +// 'Default' => Array ('LinkId', 'Name', 'Url', 'Description', 'CreatedOn', 'Modified', 'Hits', 'CachedRating', 'CachedVotesQty', 'CachedReviewsQty'), + +// link radio selector grid +// 'Radio' => Array ('LinkId', 'Name', 'Url', 'Description', 'CreatedOn', 'Modified', 'Hits', 'CachedRating', 'CachedVotesQty', 'CachedReviewsQty'), + +// duplicate links grid +// 'Duplicates' => Array ('Name', 'Url', 'DupeCount'), + ); Index: branches/5.0.x/admin/system_presets/simple/mailing_lists_mailing-list.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/mailing_lists_mailing-list.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/mailing_lists_mailing-list.php (revision 12265) @@ -0,0 +1,55 @@ + Array ('new_item', 'view_item', 'delete', 'cancel', 'view', 'dbl-click'), + +// "General" tab during adding/editing +// 'mailing_list_edit' => Array ('select', 'cancel', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'MailingId', 'PortalUserId', 'To', 'ToParsed', 'Subject', 'MessageText', 'MessageHtml', 'Status', + 'EmailsQueued', 'EmailsSent', 'EmailsTotal'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'MailingId', */ 'PortalUserId', 'To', /*'ToParsed', 'Subject', 'MessageText', 'MessageHtml', 'Status', + 'EmailsQueued', 'EmailsSent', 'EmailsTotal'*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('MailingId', 'Subject', 'MessageText', 'MessageHtml', 'Status', 'EmailsQueued', 'EmailsSent', 'EmailsTotal'), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/modules_mod.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/modules_mod.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/modules_mod.php (revision 12265) @@ -0,0 +1,48 @@ + Array ('approve', 'deny', 'view'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'Name', 'Path', 'Var', 'Version', 'Loaded', 'LoadOrder', 'TemplatePath', 'RootCat', 'BuildDate'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'Name', 'Path', 'Var', 'Version', 'Loaded', 'LoadOrder', 'TemplatePath', 'RootCat', 'BuildDate'*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('Name', 'Version', 'Loaded'), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/phrases_phrases.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/phrases_phrases.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/phrases_phrases.php (revision 12265) @@ -0,0 +1,34 @@ + Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + +// single phrase list +// 'phrases_list_st' => ('new_item', 'edit', 'delete', 'view', 'dbl-click'), + +// edit phrase +// 'phrase_edit_single' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + + ); + + // hide columns in grids + $hide_columns = Array ( +// default grid +// 'Default' => Array ('Phrase', 'Translation', 'PrimaryTranslation', 'PhraseType', 'LastChanged', 'Module'), + +// single list of phrases +// 'Phrases' => Array ('PhraseId', 'Phrase', 'Translation', 'PackName', 'PhraseType', 'LastChanged', 'Module'), + ); + Index: branches/5.0.x/admin/system_presets/simple/related_searches_c-search.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/related_searches_c-search.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/related_searches_c-search.php (revision 12265) @@ -0,0 +1,7 @@ +UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs/'; + + // include site config settings from main "search" prefix + include('related_searches_search.php'); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/related_searches_search.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/related_searches_search.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/related_searches_search.php (revision 12265) @@ -0,0 +1,43 @@ + Array ('RelatedSearchId', 'Keyword', 'Enabled'), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/relationship_c-rel.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/relationship_c-rel.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/relationship_c-rel.php (revision 12265) @@ -0,0 +1,7 @@ +UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs/'; + + // include site config settings from main "rel" prefix + include('relationship_rel.php'); Index: branches/5.0.x/admin/system_presets/simple/relationship_l-rel.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/relationship_l-rel.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/relationship_l-rel.php (revision 12265) @@ -0,0 +1,7 @@ +UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs/'; + + // include site config settings from main "rel" prefix + include('relationship_rel.php'); Index: branches/5.0.x/admin/system_presets/simple/relationship_rel.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/relationship_rel.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/relationship_rel.php (revision 12265) @@ -0,0 +1,46 @@ + Array ('RelationshipId', 'ItemName', 'ItemType', 'Type', 'Enabled'), + ); Index: branches/5.0.x/admin/system_presets/simple/reviews_l-rev.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/reviews_l-rev.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/reviews_l-rev.php (revision 12265) @@ -0,0 +1,7 @@ +UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs/'; + + // include site config settings from main "rev" prefix + include('reviews_rev.php'); Index: branches/5.0.x/admin/system_presets/simple/reviews_rev.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/reviews_rev.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/reviews_rev.php (revision 12265) @@ -0,0 +1,51 @@ + Array ('edit', 'delete', 'approve', 'decline', 'view', 'dbl-click'), + ); + + // fields to hide + $hidden_fields = Array ( + /* 'ReviewId', 'CreatedOn', 'ReviewText', 'Rating', 'IPAddress', 'ItemId', 'CreatedById', 'ItemType', + 'Priority', 'Status', 'TextFormat', 'Module', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( +// 'ReviewedBy', 'CatalogItemName', 'CatalogItemId', 'CatalogItemCategory', + ); + + // fields to make required + $required_fields = Array ( + /* 'ReviewId', 'CreatedOn',*/ 'ReviewText', /*'Rating', 'IPAddress', 'ItemId', 'CreatedById', 'ItemType', + 'Priority', 'Status', 'TextFormat', 'Module', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( +// 'ReviewedBy', 'CatalogItemName', 'CatalogItemId', 'CatalogItemCategory', + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// no tabs defined here + ); + + // hide columns in grids + $hide_columns = Array ( +// 'Default' => Array ('ReviewId', 'ReviewText', 'ReviewedBy', 'CreatedOn', 'Status', 'Rating'), +// 'ReviewsSection' => Array ('ReviewId', 'ReviewText', 'ReviewedBy', 'CreatedOn', 'Status', 'Rating'), + ); Index: branches/5.0.x/admin/system_presets/simple/search_logs_search-log.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/search_logs_search-log.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/search_logs_search-log.php (revision 12265) @@ -0,0 +1,48 @@ + Array ('refresh', 'clear_selected', 'reset', 'export', 'view', 'dbl-click'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'SearchLogId', 'Keyword', 'Indices', 'SearchType'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'SearchLogId', 'Keyword', 'Indices', 'SearchType'*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('SearchLogId', 'Keyword', 'Indices', 'SearchType'), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/sections_core-sections.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/sections_core-sections.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/sections_core-sections.php (revision 12265) @@ -0,0 +1,19 @@ + Array ('Name', 'SelectorName', 'Description', ), +// 'BlockStyles' => Array ('Name', 'SelectorName', 'Description', 'ParentId', ), + ); Index: branches/5.0.x/admin/system_presets/simple/session_logs_session-log.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/session_logs_session-log.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/session_logs_session-log.php (revision 12265) @@ -0,0 +1,49 @@ + Array ('view', 'dbl-click'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'SessionLogId', 'PortalUserId', 'SessionId', 'Status', 'SessionStart', 'SessionEnd', 'IP', 'AffectedItems',*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /*'Duration', */ + ); + + // fields to make required + $required_fields = Array ( + /*'SessionLogId', 'PortalUserId', 'SessionId', 'Status', 'SessionStart', 'SessionEnd', 'IP', 'AffectedItems',*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + /*'Duration', */ + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user + 'Default' => Array (/* 'SessionLogId', 'PortalUserId', 'SessionId', 'Status', 'SessionStart', 'SessionEnd' +, 'IP', 'Duration', 'AffectedItems', */), + ); \ No newline at end of file Index: branches/5.0.x/admin/system_presets/simple/settings.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/settings.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/settings.php (revision 12265) @@ -0,0 +1,8 @@ + Array ('new_item', 'edit', 'delete', 'primary_theme', 'clone', 'view', 'dbl-click'), + +// General" tab during adding/editing +// 'skin_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'SkinId', 'Name', 'CSS', 'Logo', 'LogoBottom', 'LogoLogin', 'Options', 'LastCompiled', 'IsPrimary' */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'SkinId', */'Name', /*'CSS', 'Logo', 'LogoBottom', 'LogoLogin', 'Options', 'LastCompiled', 'IsPrimary' */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// 'Default' => Array ('SkinId', 'Name', 'IsPrimary'), + ); Index: branches/5.0.x/admin/system_presets/simple/spelling_dictionary_spelling-dictionary.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/spelling_dictionary_spelling-dictionary.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/spelling_dictionary_spelling-dictionary.php (revision 12265) @@ -0,0 +1,50 @@ + Array ('new_spelling_dictionary', 'edit', 'delete', 'export', 'view', 'dbl-click'), + +// General tab during adding/editing +// 'spelling_dictionary_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'SpellingDictionaryId', 'MisspelledWord', 'SuggestedCorrection'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'SpellingDictionaryId',*/ 'MisspelledWord', 'SuggestedCorrection', + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// 'Default' => Array ('SpellingDictionaryId', 'MisspelledWord', 'SuggestedCorrection'), + ); Index: branches/5.0.x/admin/system_presets/simple/stop_words_stop-word.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/stop_words_stop-word.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/stop_words_stop-word.php (revision 12265) @@ -0,0 +1,50 @@ + Array ('new_item', 'edit', 'delete', 'view', 'dbl-click'), + +// General" tab during adding/editing +// 'stop_word_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'StopWordId', 'StopWord'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// 'Default' => Array ('StopWordId', 'StopWord'), + ); Index: branches/5.0.x/admin/system_presets/simple/stylesheets_css.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/stylesheets_css.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/stylesheets_css.php (revision 12265) @@ -0,0 +1,65 @@ + Array ('new_style', 'edit', 'delete', 'approve', 'decline', 'clone', 'view', 'dbl-click'), + +// General" tab during adding/editing +// 'stylesheets_edit' => Array ('select', 'cancel', 'prev', 'next'), + +// list of base styles +// 'base_styles' => Array ('select', 'cancel', 'prev', 'next', 'new_selector', 'edit', 'delete', 'clone', 'view', 'dbl-click'), + +// base style edit +// 'base_style_edit' => Array('select', 'cancel'), + +// list of block styles +// 'block_styles' => Array ('select', 'cancel', 'prev', 'next', 'new_selector', 'edit', 'delete', 'clone', 'reset_to_base', 'view', 'dbl-click'), + +// block style edit +// 'block_style_edit' => Array('select', 'cancel', 'reset_to_base'), + +// style editor +// 'style_edit' => Array('select', 'cancel', 'reset_to_base'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'StylesheetId', 'Name', 'Description', 'AdvancedCSS', 'LastCompiled', 'Enabled' */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'StylesheetId',*/ 'Name',/* 'Description', 'AdvancedCSS', 'LastCompiled', 'Enabled' */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// 'general', 'block_styles', 'base_styles', + ); + + // hide columns in grids + $hide_columns = Array ( +// 'Default' => Array ('Name', 'Description', 'Enabled', 'LastCompiled'), + ); Index: branches/5.0.x/admin/system_presets/simple/theme_files_theme-file.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/theme_files_theme-file.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/theme_files_theme-file.php (revision 12265) @@ -0,0 +1,43 @@ + Array ('FileId', 'FilePath', 'FileName', 'Description'), + ); Index: branches/5.0.x/admin/system_presets/simple/themes_theme.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/themes_theme.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/themes_theme.php (revision 12265) @@ -0,0 +1,58 @@ + Array ('new_theme', 'edit', 'delete', 'primary_theme', 'rescan_themes', 'view', 'dbl-click'), + +// "General" tab during adding/editing +// 'themes_edit_general' => Array ('select', 'cancel', 'prev', 'next'), + +// "Files" tab during adding/editing +// 'themes_edit_files' => Array ('select', 'cancel', 'prev', 'next', 'delete', 'view', 'dbl-click'), + +// "Edit File" +// 'theme_file_edit' => Array ('select', 'cancel', 'reset_edit'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'ThemeId', 'Name', 'Enabled', 'Description', 'PrimaryTheme', 'CacheTimeout', 'StylesheetId',*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /*'StyleName', 'LastCompiled'*/ + ); + + // fields to make required + $required_fields = Array ( + /*'ThemeId',*/ 'Name', /*'Enabled', 'Description', 'PrimaryTheme', 'CacheTimeout', 'StylesheetId'*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + /*'StyleName', 'LastCompiled'*/ + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// tabs during editing +// 'Default' => Array ('general', 'files'), + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('ThemeId', 'Name', 'Description', 'Enabled', 'PrimaryTheme'), + ); Index: branches/5.0.x/admin/system_presets/simple/thesaurus_thesaurus.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/thesaurus_thesaurus.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/thesaurus_thesaurus.php (revision 12265) @@ -0,0 +1,50 @@ + Array ('new_item', 'edit', 'delete', 'export', 'view'), + +// "General" tab during thesaurus term adding/editing +// 'thesaurus_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'ThesaurusId', 'SearchTerm', 'ThesaurusTerm', 'ThesaurusType'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + + ); + + // fields to make required + $required_fields = Array ( + /*'ThesaurusId', */ 'SearchTerm', 'ThesaurusTerm', /*'ThesaurusType'*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// 'Default' => Array ('ThesaurusId', 'SearchTerm', 'ThesaurusTerm', 'ThesaurusType',), + ); Index: branches/5.0.x/admin/system_presets/simple/translator_trans.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/translator_trans.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/translator_trans.php (revision 12265) @@ -0,0 +1,42 @@ + Array ('select', 'cancel'), + ); + + // fields to hide + $hidden_fields = Array ( +// no fields + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /*'Original', 'Language', 'SwitchLanguage', 'Translation'*/ + ); + + // fields to make required + $required_fields = Array ( +// no fields + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + /*'Original', 'Language', 'SwitchLanguage', 'Translation'*/ + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// no tabs + ); + + // hide columns in grids + $hide_columns = Array ( +// no grids/columns + ); Index: branches/5.0.x/admin/system_presets/simple/user_groups_g-ug.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/user_groups_g-ug.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/user_groups_g-ug.php (revision 12265) @@ -0,0 +1,49 @@ +User relations (ie. selecting group when adding/editing Group) */ + + // section removal + $remove_sections = Array ( +// no separate tree section defined for this + ); + + // sections shown with debug on + $debug_only_sections = Array ( +// no separate tree section defined for this + ); + + // toolbar buttons + $remove_buttons = Array ( +// no buttons defined here - see users_u.php + ); + + // fields to hide + $hidden_fields = Array ( + /* 'PortalUserId', 'GroupId', 'MembershipExpires', 'PrimaryGroup', 'ExpirationReminderSent', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( +// 'UserName', 'UserLogin', + ); + + // fields to make required + $required_fields = Array ( +/* 'PortalUserId', 'GroupId', 'MembershipExpires', 'PrimaryGroup', 'ExpirationReminderSent', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( +// 'UserName', 'UserLogin', + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// no tabs defined here + ); + + // hide columns in grids + $hide_columns = Array ( +// 'GroupUsers' => Array ('PortalUserId', 'UserName', 'UserLogin', 'PrimaryGroup', 'MembershipExpires'), + + ); Index: branches/5.0.x/admin/system_presets/simple/user_groups_u-ug.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/user_groups_u-ug.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/user_groups_u-ug.php (revision 12265) @@ -0,0 +1,49 @@ +Group relations (ie. selecting group when adding/editing user) */ + + // section removal + $remove_sections = Array ( +// no separate tree section defined for this + ); + + // sections shown with debug on + $debug_only_sections = Array ( +// no separate tree section defined for this + ); + + // toolbar buttons + $remove_buttons = Array ( +// no buttons defined here - see users_u.php + ); + + // fields to hide + $hidden_fields = Array ( + /* 'PortalUserId', 'GroupId', 'MembershipExpires', 'PrimaryGroup', 'ExpirationReminderSent', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( +// 'GroupName', 'GroupDescription', + ); + + // fields to make required + $required_fields = Array ( + /* 'PortalUserId', 'GroupId', 'MembershipExpires', 'PrimaryGroup', 'ExpirationReminderSent', */ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( +// 'GroupName', 'GroupDescription', + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// no tabs defined here + ); + + // hide columns in grids + $hide_columns = Array ( +// 'Default' => Array ('GroupId', 'GroupName', 'GroupDescription', 'PrimaryGroup', 'MembershipExpires'), + + ); Index: branches/5.0.x/admin/system_presets/simple/users_u.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/users_u.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/users_u.php (revision 12265) @@ -0,0 +1,119 @@ + Users + 'users_list' => Array (/*'new_user', 'edit', 'delete', 'approve', 'decline', 'e-mail',*/ 'export', /*'view', 'dbl-click'*/), + +// "General" tab during user adding/editing +// 'users_edit' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), + +// "Images" tab during user adding/editing +// 'user_edit_images' => Array ('select', 'cancel', 'prev', 'next', 'new_image', 'edit', 'delete', 'move_up', 'move_down', 'primary_image', 'view', 'dbl-click'), + +// "Groups" tab during user/admin adding/editing +// 'user_edit_groups' => Array ('select', 'cancel', 'prev', 'next', 'usertogroup', 'edit', 'delete', 'primary_group', 'view', 'dbl-click'), + +// "Items" tab during user/admin adding/editing +// 'user_edit_items' => Array ('select', 'cancel', 'prev', 'next', 'edit', 'delete', 'view', 'dbl-click'), + +// "Custom" tab during user/admin adding/editing +// 'user_edit_custom' => Array ('select', 'cancel', 'prev', 'next'), + +// list of administrators; section: Users Managements -> Administrators + 'admins_list' => Array (/*'new_user', 'edit', 'delete', */'clone', /*'refresh', 'view', 'dbl-click'*/), + +// "General" tab during admin adding/editing AND separate password change form for non-"root" users (in top frame) + 'admins_edit' => Array (/*'select', 'cancel', */'reset_edit', /*'prev', 'next'*/), + +// 'regular_users_list' => Array (), // not used + +// separate password change form for "root" user (in top frame) +// 'root_edit' => Array ('select', 'cancel'), + +// user/admin group membership editing (used on "Groups" tab during user/admin adding/editing) +// 'user_edit_group' => Array ('select', 'cancel'), + +// user image adding/editing (used on "Images" tab during user adding/editing) +// 'user_image_edit' => Array ('select', 'cancel'), + +// user selector +// 'user_select' => Array ('select', 'cancel', 'view', 'dbl-click'), + +// user selector when adding/editing user group +// 'group_user_select' => Array ('select', 'cancel', 'view', 'dbl-click'), + + ); + + // fields to hide + $hidden_fields = Array ( + /* 'PortalUserId', 'Login', 'Password', 'FirstName','LastName', 'Company', 'Email', 'CreatedOn', + 'Phone', 'Fax', 'Street', 'Street2', 'City', 'State' , 'Zip', 'Country', 'ResourceId', 'Status', + 'Modified', 'dob', 'tz', 'ip', 'IsBanned', 'PassResetTime', 'PwResetConfirm', 'PwRequestTime', + 'MinPwResetDelay', */ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /*'ValidateLogin', 'SubscribeEmail', 'PrimaryGroup', 'RootPassword', 'FullName', 'UserGroup'*/ + ); + + // fields to make required + $required_fields = Array ( + /*'PortalUserId',*/ 'Login', /*'Password', 'FirstName', 'LastName', 'Company', */'Email', /*'CreatedOn', + 'Phone', 'Fax', 'Street', 'Street2', 'City', 'State' , 'Zip', 'Country', 'ResourceId', 'Status', + 'Modified', 'dob', 'tz', 'ip', 'IsBanned', 'PassResetTime', 'PwResetConfirm', 'PwRequestTime', + 'MinPwResetDelay'*/ + ); + + // virtual fields to make required + $virtual_required_fields = Array ( + /*'ValidateLogin', 'SubscribeEmail', 'PrimaryGroup', 'RootPassword', 'FullName', 'UserGroup'*/ + ); + + // tabs during editing + $hide_edit_tabs = Array ( +// tabs during user editing, when In-Portal module is enabled + 'Default' => Array ('general', 'groups', 'images', 'items', 'custom'), + +// tabs during user editing, when In-Portal module isn't enabled + 'RegularUsers' => Array ('general', 'groups'), + +// tabs during admin editing + 'Admins' => Array ('general', 'groups'), + ); + + // hide columns in grids + $hide_columns = Array ( +// currently not in user +// 'Default' => Array ('Login', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn'), + +// user selector +// 'UserSelector' => Array ('Login', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn'), + +// admins list; section: Users Management -> Administrators +// 'Admins' => Array ('PortalUserId', 'Login', 'FirstName', 'LastName', 'Email'), + +// users list; section: Users Management -> Users +// 'RegularUsers' => Array ('PortalUserId', 'Login', 'FirstName', 'LastName', 'Email', 'Status'), + ); Index: branches/5.0.x/admin/system_presets/simple/visits_visits.php =================================================================== diff -u --- branches/5.0.x/admin/system_presets/simple/visits_visits.php (revision 0) +++ branches/5.0.x/admin/system_presets/simple/visits_visits.php (revision 12265) @@ -0,0 +1,45 @@ + Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + +// list of visits when In-Commerce installed; section: Visits + 'visits.incommerce_list' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'), + ); + + // fields to hide + $hidden_fields = Array ( + /*'VisitId', 'VisitDate', 'Referer', 'IPAddress', 'LastName', 'PortalUserId'*/ + ); + + // virtual fields to hide + $virtual_hidden_fields = Array ( + /*'UserName', 'AffiliateUser', 'AffiliatePortalUserId', 'OrderTotalAmount', 'OrderTotalAmountSum', 'OrderAffiliateCommission', + 'OrderAffiliateCommissionSum', 'OrderId'*/ + ); + + // tabs during editing + $hide_edit_tabs = Array ( + + ); + + // hide columns in grids + $hide_columns = Array ( +// NO In-Commerce installed +// 'Default' => Array ('VisitDate', 'IPAddress', 'Referer', 'UserName'), + +// In-Commerce IS installed +// 'visitsincommerce' => Array ('VisitDate', 'IPAddress', 'Referer', 'UserName', 'OrderTotalAmountSum', 'OrderAffiliateCommissionSum'), + ); Index: branches/5.0.x/core/install/english.lang =================================================================== diff -u -r12247 -r12265 --- branches/5.0.x/core/install/english.lang (.../english.lang) (revision 12247) +++ branches/5.0.x/core/install/english.lang (.../english.lang) (revision 12265) @@ -162,7 +162,9 @@ VmlzaXQgRGF0ZQ== QXNjZW5kaW5n RGVzY2VuZGluZw== + QWRtaW4gQ29uc29sZSBJbnRlcmZhY2U= U1NMIEZ1bGwgVVJMIGZvciBBZG1pbmlzdHJhdGl2ZSBDb25zb2xlIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgpIA== + QWxsb3cgQWRtaW4gdG8gY2hhbmdlIEFkbWluIENvbnNvbGUgSW50ZXJmYWNl QWxsb3cgdG8gc2VsZWN0IG1lbWJlcnNoaXAgZ3JvdXAgb24gRnJvbnQtZW5k TGlzdCBhdXRvbWF0aWMgcmVmcmVzaCBpbnRlcnZhbHMgKGluIG1pbnV0ZXMp QmFja3VwIFBhdGg= Index: branches/5.0.x/core/install/site_configs.zip =================================================================== diff -u -r12117 -r12265 Binary files differ Index: branches/5.0.x/core/units/sections/site_config_tp.php =================================================================== diff -u -r12246 -r12265 --- branches/5.0.x/core/units/sections/site_config_tp.php (.../site_config_tp.php) (revision 12246) +++ branches/5.0.x/core/units/sections/site_config_tp.php (.../site_config_tp.php) (revision 12265) @@ -11,7 +11,8 @@ 3 => Array ('image' => 'show_all', 'title' => 'Design Mode'), ); - $base_path = FULL_PATH . dirname( $this->Application->UnitConfigReader->getPrefixFile('custom-sections') ) . '/../site_configs'; + $preset_name = $this->Application->ConfigValue('AdminConsoleInterface'); + $base_path = FULL_PATH . ADMIN_DIRECTORY . '/system_presets/' . $preset_name; if (file_exists($base_path . DIRECTORY_SEPARATOR . 'settings.php')) { include_once $base_path . DIRECTORY_SEPARATOR . 'settings.php'; // will get $visible_editing_modes Index: branches/5.0.x/core/install/install_data.sql =================================================================== diff -u -r12264 -r12265 --- branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12264) +++ branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12265) @@ -51,6 +51,8 @@ INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_AdminMailFrom', 'portal@user.domain.name', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationAdmin VALUES ('SessionTimeout', 'la_section_SettingsSession', 'la_prompt_session_timeout', 'text', 'a:3:{s:4:"type";s:3:"int";s:13:"min_value_inc";i:1;s:8:"required";i:1;}', '', 40.01, 0, 1); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionTimeout', '3600', 'In-Portal', 'in-portal:configure_general'); +INSERT INTO ConfigurationAdmin VALUES ('AdminConsoleInterface', 'la_section_SettingsAdmin', 'la_config_AdminConsoleInterface', 'select', '', 'simple=+simple,intermediate=+intermediate,advanced=+advanced', 50.01, 0, 1); +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminConsoleInterface', 'simple', 'In-Portal', 'in-portal:configure_general'); # Section "in-portal:configure_advanced": INSERT INTO ConfigurationAdmin VALUES ('Site_Path', 'la_section_SettingsWebsite', 'la_config_PathToWebsite', 'text', '', '', 10.01, 0, 1); @@ -92,25 +94,28 @@ INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Force_HTTP_When_SSL_Not_Required', '1', 'In-Portal', 'in-portal:configure_advanced'); INSERT INTO ConfigurationAdmin VALUES ('UseModRewriteWithSSL', 'la_section_SettingsSSL', 'la_config_use_modrewrite_with_ssl', 'checkbox', '', '', 30.06, 0, 1); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModRewriteWithSSL', '0', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_section_SettingsAdmin', 'la_config_UseToolbarLabels', 'checkbox', NULL , NULL , 40.01, 0, 0); + +INSERT INTO ConfigurationAdmin VALUES ('AllowAdminConsoleInterfaceChange', 'la_section_SettingsAdmin', 'la_config_AllowAdminConsoleInterfaceChange', 'checkbox', NULL , NULL , 40.01, 0, 0); +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowAdminConsoleInterfaceChange', '1', 'In-Portal', 'in-portal:configure_advanced'); +INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_section_SettingsAdmin', 'la_config_UseToolbarLabels', 'checkbox', NULL , NULL , 40.02, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('UseSmallHeader', 'la_section_SettingsAdmin', 'la_config_UseSmallHeader', 'checkbox', '', '', 40.02, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('UseSmallHeader', 'la_section_SettingsAdmin', 'la_config_UseSmallHeader', 'checkbox', '', '', 40.03, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseSmallHeader', '0', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('UseColumnFreezer', 'la_section_SettingsAdmin', 'la_config_UseColumnFreezer', 'checkbox', '', '', 40.03, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('UseColumnFreezer', 'la_section_SettingsAdmin', 'la_config_UseColumnFreezer', 'checkbox', '', '', 40.04, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseColumnFreezer', '0', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('UsePopups', 'la_section_SettingsAdmin', 'la_config_UsePopups', 'radio', '', '1=la_Yes,0=la_No', 40.04, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('UsePopups', 'la_section_SettingsAdmin', 'la_config_UsePopups', 'radio', '', '1=la_Yes,0=la_No', 40.05, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UsePopups', '1', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('UseDoubleSorting', 'la_section_SettingsAdmin', 'la_config_UseDoubleSorting', 'radio', '', '1=la_Yes,0=la_No', 40.05, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('UseDoubleSorting', 'la_section_SettingsAdmin', 'la_config_UseDoubleSorting', 'radio', '', '1=la_Yes,0=la_No', 40.06, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseDoubleSorting', '0', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('MenuFrameWidth', 'la_section_SettingsAdmin', 'la_prompt_MenuFrameWidth', 'text', NULL, NULL, 40.06, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('MenuFrameWidth', 'la_section_SettingsAdmin', 'la_prompt_MenuFrameWidth', 'text', NULL, NULL, 40.07, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MenuFrameWidth', 200, 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('ResizableFrames', 'la_section_SettingsAdmin', 'la_config_ResizableFrames', 'checkbox', '', '', 40.07, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('ResizableFrames', 'la_section_SettingsAdmin', 'la_config_ResizableFrames', 'checkbox', '', '', 40.08, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ResizableFrames', '1', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('AutoRefreshIntervals', 'la_section_SettingsAdmin', 'la_config_AutoRefreshIntervals', 'text', '', '', 40.08, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('AutoRefreshIntervals', 'la_section_SettingsAdmin', 'la_config_AutoRefreshIntervals', 'text', '', '', 40.09, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AutoRefreshIntervals', '1,5,15,30,60,120,240', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('DebugOnlyFormConfigurator', 'la_section_SettingsAdmin', 'la_config_DebugOnlyFormConfigurator', 'checkbox', '', '', 40.09, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('DebugOnlyFormConfigurator', 'la_section_SettingsAdmin', 'la_config_DebugOnlyFormConfigurator', 'checkbox', '', '', 40.10, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DebugOnlyFormConfigurator', '0', 'In-Portal', 'in-portal:configure_advanced'); -INSERT INTO ConfigurationAdmin VALUES ('UseModalWindows', 'la_section_SettingsAdmin', 'la_config_UseModalWindows', 'checkbox', '', '', 40.10, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('UseModalWindows', 'la_section_SettingsAdmin', 'la_config_UseModalWindows', 'checkbox', '', '', 40.11, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseModalWindows', '1', 'In-Portal', 'in-portal:configure_advanced'); INSERT INTO ConfigurationAdmin VALUES ('Smtp_Server', 'la_section_SettingsMailling', 'la_prompt_mailserver', 'text', NULL, NULL, 50.01, 0, 1); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Smtp_Server', DEFAULT, 'In-Portal', 'in-portal:configure_advanced');