diff --git a/administrator/components/com_associations/access.xml b/administrator/components/com_associations/access.xml index e6fd1ec5258d2..5f4d60de794cc 100644 --- a/administrator/components/com_associations/access.xml +++ b/administrator/components/com_associations/access.xml @@ -1,8 +1,8 @@
- - - + + +
diff --git a/administrator/components/com_banners/access.xml b/administrator/components/com_banners/access.xml index d81db5fbe78ee..8ac1d3710951d 100644 --- a/administrator/components/com_banners/access.xml +++ b/administrator/components/com_banners/access.xml @@ -3,43 +3,36 @@
@@ -47,25 +40,21 @@
diff --git a/administrator/components/com_cache/config.xml b/administrator/components/com_cache/config.xml index 76186ee8c3f1d..7242051448744 100644 --- a/administrator/components/com_cache/config.xml +++ b/administrator/components/com_cache/config.xml @@ -16,11 +16,11 @@ + /> + /> diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml index 038dd9e46c56b..9522159bfb6a3 100644 --- a/administrator/components/com_categories/forms/category.xml +++ b/administrator/components/com_categories/forms/category.xml @@ -125,7 +125,6 @@ name="buttonspacer" type="spacer" label="JGLOBAL_ACTION_PERMISSIONS_LABEL" - description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION" /> + /> + /> diff --git a/administrator/components/com_config/access.xml b/administrator/components/com_config/access.xml index 861fef08ea0eb..7f5724e2caa09 100644 --- a/administrator/components/com_config/access.xml +++ b/administrator/components/com_config/access.xml @@ -1,6 +1,6 @@
- +
diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index 0ce59eb901df2..5a4f6700df46d 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -1166,62 +1166,50 @@ diff --git a/administrator/components/com_contact/access.xml b/administrator/components/com_contact/access.xml index 14de10bac138d..c5b04e6c71c39 100644 --- a/administrator/components/com_contact/access.xml +++ b/administrator/components/com_contact/access.xml @@ -1,35 +1,35 @@
- - - - - - - - - + + + + + + + + +
- - - - - + + + + +
- - - - - - + + + + + +
- - - - + + + +
\ No newline at end of file diff --git a/administrator/components/com_content/access.xml b/administrator/components/com_content/access.xml index 27f108a36e8e2..ac2db9a908bdf 100644 --- a/administrator/components/com_content/access.xml +++ b/administrator/components/com_content/access.xml @@ -1,40 +1,40 @@
- - - - - - - - - + + + + + + + + +
- - - - - + + + + +
- - - + + +
- - - - - - + + + + + +
- - - - + + + +
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml index 3dd3bc7271c22..c15e96f7264cb 100644 --- a/administrator/components/com_content/forms/article.xml +++ b/administrator/components/com_content/forms/article.xml @@ -85,7 +85,6 @@
- - - - - - - + + + + + + +
diff --git a/administrator/components/com_installer/access.xml b/administrator/components/com_installer/access.xml index 1c90bfc488ca8..81b20069a62c8 100644 --- a/administrator/components/com_installer/access.xml +++ b/administrator/components/com_installer/access.xml @@ -1,10 +1,10 @@
- - - - - + + + + +
diff --git a/administrator/components/com_joomlaupdate/access.xml b/administrator/components/com_joomlaupdate/access.xml index c8c9f3dd739df..b88d1a684fb02 100644 --- a/administrator/components/com_joomlaupdate/access.xml +++ b/administrator/components/com_joomlaupdate/access.xml @@ -1,10 +1,10 @@
- - - - - + + + + +
diff --git a/administrator/components/com_languages/access.xml b/administrator/components/com_languages/access.xml index bad626c9c5ba5..84be69f5ab141 100644 --- a/administrator/components/com_languages/access.xml +++ b/administrator/components/com_languages/access.xml @@ -1,11 +1,11 @@
- - - - - - + + + + + +
diff --git a/administrator/components/com_media/access.xml b/administrator/components/com_media/access.xml index d4b0fee8c6fcc..2b49b018b6953 100644 --- a/administrator/components/com_media/access.xml +++ b/administrator/components/com_media/access.xml @@ -1,10 +1,10 @@
- - - - - + + + + +
diff --git a/administrator/components/com_menus/access.xml b/administrator/components/com_menus/access.xml index c709842eecf11..22cc5c6922ade 100644 --- a/administrator/components/com_menus/access.xml +++ b/administrator/components/com_menus/access.xml @@ -1,19 +1,19 @@
- - - - - - - + + + + + + +
- - - - - + + + + +
diff --git a/administrator/components/com_messages/access.xml b/administrator/components/com_messages/access.xml index db0d199295549..16eb2b2026416 100644 --- a/administrator/components/com_messages/access.xml +++ b/administrator/components/com_messages/access.xml @@ -1,10 +1,10 @@
- - - - - + + + + +
diff --git a/administrator/components/com_modules/access.xml b/administrator/components/com_modules/access.xml index 6acf5f1e61da4..f8bfed5ca8347 100644 --- a/administrator/components/com_modules/access.xml +++ b/administrator/components/com_modules/access.xml @@ -1,18 +1,18 @@
- - - - - - - + + + + + + +
- - - - + + + +
\ No newline at end of file diff --git a/administrator/components/com_newsfeeds/access.xml b/administrator/components/com_newsfeeds/access.xml index 0cf23a397571b..45902c65249e1 100644 --- a/administrator/components/com_newsfeeds/access.xml +++ b/administrator/components/com_newsfeeds/access.xml @@ -1,20 +1,20 @@
- - - - - - - - + + + + + + + +
- - - - - + + + + +
\ No newline at end of file diff --git a/administrator/components/com_plugins/access.xml b/administrator/components/com_plugins/access.xml index c7e06d05a3bcf..0f1fcf9e88f75 100644 --- a/administrator/components/com_plugins/access.xml +++ b/administrator/components/com_plugins/access.xml @@ -1,9 +1,9 @@
- - - - + + + +
diff --git a/administrator/components/com_postinstall/access.xml b/administrator/components/com_postinstall/access.xml index 70c6eb673e011..f1d5fc80de7e4 100644 --- a/administrator/components/com_postinstall/access.xml +++ b/administrator/components/com_postinstall/access.xml @@ -1,7 +1,7 @@
- - + +
diff --git a/administrator/components/com_redirect/access.xml b/administrator/components/com_redirect/access.xml index ddf5198b162fe..be225f4449725 100644 --- a/administrator/components/com_redirect/access.xml +++ b/administrator/components/com_redirect/access.xml @@ -1,12 +1,12 @@
- - - - - - - + + + + + + +
diff --git a/administrator/components/com_search/access.xml b/administrator/components/com_search/access.xml index 9b65a75052466..fe5ce1c7837cd 100644 --- a/administrator/components/com_search/access.xml +++ b/administrator/components/com_search/access.xml @@ -1,9 +1,9 @@
- - - - + + + +
diff --git a/administrator/components/com_tags/access.xml b/administrator/components/com_tags/access.xml index c4f8083a72c53..642ce86040338 100644 --- a/administrator/components/com_tags/access.xml +++ b/administrator/components/com_tags/access.xml @@ -1,12 +1,12 @@
- - - - - - - + + + + + + +
diff --git a/administrator/components/com_templates/access.xml b/administrator/components/com_templates/access.xml index 085a53d701b5d..d75ace4004f7a 100644 --- a/administrator/components/com_templates/access.xml +++ b/administrator/components/com_templates/access.xml @@ -1,12 +1,12 @@
- - - - - - - + + + + + + +
diff --git a/administrator/components/com_users/access.xml b/administrator/components/com_users/access.xml index 01051d5e50fe5..77a301f0174cb 100644 --- a/administrator/components/com_users/access.xml +++ b/administrator/components/com_users/access.xml @@ -1,34 +1,34 @@
- - - - - - - - + + + + + + + +
- - - - - + + + + +
- - - - - - + + + + + +
- - - - + + + +
diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini index ed13b02a63732..5914575492e29 100644 --- a/administrator/language/en-GB/en-GB.com_categories.ini +++ b/administrator/language/en-GB/en-GB.com_categories.ini @@ -5,11 +5,6 @@ CATEGORIES_FIELDSET_OPTIONS="Options" COM_CATEGORIES="Categories" -COM_CATEGORIES_ACCESS_CREATE_DESC="New setting for create actions in this category and the calculated setting based on the parent category and group permissions." -COM_CATEGORIES_ACCESS_DELETE_DESC="New setting for delete actions on this category and the calculated setting based on the parent category and group permissions." -COM_CATEGORIES_ACCESS_EDIT_DESC="New setting for edit actions on this category and the calculated setting based on the parent category and group permissions." -COM_CATEGORIES_ACCESS_EDITOWN_DESC="New setting for edit own actions on this category and the calculated setting based on the parent category and group permissions." -COM_CATEGORIES_ACCESS_EDITSTATE_DESC="New setting for edit state actions on this category and the calculated setting based on the parent category and group permissions." COM_CATEGORIES_BATCH_CANNOT_CREATE="You are not allowed to create new categories in this category." COM_CATEGORIES_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these categories." COM_CATEGORIES_BATCH_OPTIONS="Batch process the selected categories." diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 37f101c0b40a8..88ba16feaa15d 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -4,18 +4,6 @@ ; Note : All ini files need to be saved as UTF-8 COM_CONFIG="Configuration Manager" -COM_CONFIG_ACTION_ADMIN_DESC="Allows users in the group to perform any action over the whole site regardless of any other permission settings." -COM_CONFIG_ACTION_CREATE_DESC="Allows users in the group to create any content in any extension." -COM_CONFIG_ACTION_DELETE_DESC="Allows users in the group to delete any content in any extension." -COM_CONFIG_ACTION_EDIT_DESC="Allows users in the group to edit any content in any extension." -COM_CONFIG_ACTION_EDITOWN_DESC="Allows users in the group to edit any content they own in any extension." -COM_CONFIG_ACTION_EDITVALUE_DESC="Allows users in the group to edit any value of custom fields submitted in any extension." -COM_CONFIG_ACTION_EDITSTATE_DESC="Allows users in the group to edit the state of any content in any extension." -COM_CONFIG_ACTION_LOGIN_ADMIN_DESC="Allows users in the group to login to the Backend Administrator site." -COM_CONFIG_ACTION_LOGIN_OFFLINE_DESC="Allows users in the group to access the Frontend site when site is offline." -COM_CONFIG_ACTION_LOGIN_SITE_DESC="Allows users in the group to login to the Frontend site." -COM_CONFIG_ACTION_MANAGE_DESC="Allows users in the group to access all of the administration interface except Global Configuration." -COM_CONFIG_ACTION_OPTIONS_DESC="Allows users in the group to edit the options except the permissions of any extension." COM_CONFIG_CACHE_SETTINGS="Cache Settings" COM_CONFIG_CACHE_WARNING="Failed to clear cache automatically, you may need to do so manually." COM_CONFIG_COMPONENT_FIELDSET_LABEL="Component" diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini index 6d9190261c866..b09d577fa8e6b 100644 --- a/administrator/language/en-GB/en-GB.com_content.ini +++ b/administrator/language/en-GB/en-GB.com_content.ini @@ -4,9 +4,6 @@ ; Note : All ini files need to be saved as UTF-8 COM_CONTENT="Articles" -COM_CONTENT_ACCESS_DELETE_DESC="New setting for delete actions on this article and the calculated setting based on the parent category and group permissions." -COM_CONTENT_ACCESS_EDIT_DESC="New setting for edit actions on this article and the calculated setting based on the parent category and group permissions." -COM_CONTENT_ACCESS_EDITSTATE_DESC="New setting for edit state actions on this article and the calculated setting based on the parent category and group permissions." COM_CONTENT_ARTICLE_CONTENT="Content" COM_CONTENT_ARTICLES_TITLE="Articles" COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL="Options" diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini index 558bd7d04953b..af32165d6aec6 100644 --- a/administrator/language/en-GB/en-GB.com_fields.ini +++ b/administrator/language/en-GB/en-GB.com_fields.ini @@ -27,10 +27,6 @@ COM_FIELDS_FIELD_IMAGE_LABEL="Image" COM_FIELDS_FIELD_INVALID_DEFAULT_VALUE="The default value is invalid." COM_FIELDS_FIELD_LABEL_LABEL="Label" COM_FIELDS_FIELD_NOTE_LABEL="Note" -COM_FIELDS_FIELD_PERMISSION_DELETE_DESC="New setting for delete actions on this field and the calculated setting based on the parent extension and group permissions." -COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC="New setting for edit state actions on this field and the calculated setting based on the parent extension and group permissions." -COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC="Who can edit the custom field value in the form editor?" -COM_FIELDS_FIELD_PERMISSION_EDIT_DESC="New setting for edit actions on this field and the calculated setting based on the parent extension and group permissions." COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class attributes of the field when the field is rendered. If multiple classes are needed, list them with spaces." COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Render Class" COM_FIELDS_FIELD_REQUIRED_LABEL="Required" @@ -40,12 +36,6 @@ COM_FIELDS_FIELD_SHOW_ON_LABEL="Show On" COM_FIELDS_FIELD_SHOW_ON_SITE="Site" COM_FIELDS_FIELD_TYPE_LABEL="Type" COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin" -COM_FIELDS_GROUP_PERMISSION_CREATE_DESC="New setting for create actions in this field group and the calculated setting based on the parent extension permissions." -COM_FIELDS_GROUP_PERMISSION_DELETE_DESC="New setting for delete actions on this field group and the calculated setting based on the parent extension permissions." -COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC="New setting for edit own actions on this field group and the calculated setting based on the parent extension permissions." -COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC="New setting for edit state actions on this field group and the calculated setting based on the parent extension permissions." -COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC="Who can edit the field value in the form editor." -COM_FIELDS_GROUP_PERMISSION_EDIT_DESC="New setting for edit actions on this field group and the calculated setting based on the parent extension permissions." COM_FIELDS_MUSTCONTAIN_A_TITLE_FIELD="Field must have a title." COM_FIELDS_MUSTCONTAIN_A_TITLE_GROUP="Field Group must have a title." COM_FIELDS_FIELD_SAVE_SUCCESS="Field saved" diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini index c399db9772bb2..1fecc3ecbdc94 100644 --- a/administrator/language/en-GB/en-GB.com_modules.ini +++ b/administrator/language/en-GB/en-GB.com_modules.ini @@ -5,7 +5,6 @@ COM_MODULES="Modules Manager" COM_MODULES_ACTION_EDITFRONTEND="Frontend Editing" -COM_MODULES_ACTION_EDITFRONTEND_COMPONENT_DESC="Allows users in the group to edit in Frontend." COM_MODULES_ADMIN_LANG_FILTER_FIELDSET_LABEL="Administrator Modules" COM_MODULES_ADMIN_LANG_FILTER_DESC="Allows filtering administrator modules per administrator language." COM_MODULES_ADMIN_LANG_FILTER_LABEL="Language Filtering" diff --git a/administrator/language/en-GB/en-GB.com_modules.sys.ini b/administrator/language/en-GB/en-GB.com_modules.sys.ini index d32ebc6c0dc3a..51d1b1733e953 100644 --- a/administrator/language/en-GB/en-GB.com_modules.sys.ini +++ b/administrator/language/en-GB/en-GB.com_modules.sys.ini @@ -5,7 +5,6 @@ COM_MODULES="Modules" COM_MODULES_ACTION_EDITFRONTEND="Frontend Editing" -COM_MODULES_ACTION_EDITFRONTEND_COMPONENT_DESC="Allows users in the group to edit in Frontend." COM_MODULES_GENERAL="General" COM_MODULES_MODULES_VIEW_DEFAULT_DESC="Shows a list of modules to manage" COM_MODULES_MODULES_VIEW_DEFAULT_TITLE="Module Manager" diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 9ee038249fd46..62a54ce206c69 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -135,29 +135,19 @@ JYES="Yes" JACTIONS="Actions for: %s" JACTION_ADMIN="Configure ACL & Options" -JACTION_ADMIN_COMPONENT_DESC="Allows users in the group to edit the options and permissions of this extension." JACTION_ADMIN_GLOBAL="Super User" -JACTION_ADMIN_GLOBAL_DESC="Allows users in the group to perform any action regardless of the settings." JACTION_COMPONENT_SETTINGS="Component Settings" JACTION_CREATE="Create" -JACTION_CREATE_COMPONENT_DESC="Allows users in the group to create any content in this extension." JACTION_DELETE="Delete" -JACTION_DELETE_COMPONENT_DESC="Allows users in the group to delete any content in this extension." JACTION_EDIT="Edit" -JACTION_EDIT_COMPONENT_DESC="Allows users in the group to edit any content in this extension." JACTION_EDITOWN="Edit Own" -JACTION_EDITOWN_COMPONENT_DESC="Allows users in the group to edit any content they submitted in this extension." JACTION_EDITVALUE="Edit Custom Field Value" -JACTION_EDITVALUE_COMPONENT_DESC="Allows users in the group to edit any value of custom fields submitted in this extension." JACTION_EDITSTATE="Edit State" -JACTION_EDITSTATE_COMPONENT_DESC="Allows users in the group to change the state of any content in this extension." JACTION_LOGIN_ADMIN="Administrator Login" JACTION_LOGIN_OFFLINE="Offline Access" JACTION_LOGIN_SITE="Site Login" JACTION_MANAGE="Access Administration Interface" -JACTION_MANAGE_COMPONENT_DESC="Allows users in the group to access the administration interface for this extension." JACTION_OPTIONS="Configure Options Only" -JACTION_OPTIONS_COMPONENT_DESC="Allows users in the group to edit the options except the permissions of this extension." JBROWSERTARGET_MODAL="Modal" JBROWSERTARGET_NEW="Open in new window" @@ -265,7 +255,6 @@ JFIELD_XREFERENCE_DESC="An optional field to allow this record to be cross-refer JFIELD_XREFERENCE_LABEL="External Reference" JGLOBAL_ACROSS="Across" JGLOBAL_ACTION_PERMISSIONS_LABEL="Permissions" -JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION="Set the action permissions for this asset" JGLOBAL_ADD_CUSTOM_CATEGORY="Add new Category" JGLOBAL_ALL_ARTICLE="Max Levels Articles" JGLOBAL_ALL_LIST="Max Levels as List" diff --git a/language/en-GB/en-GB.com_content.ini b/language/en-GB/en-GB.com_content.ini index 0c89e14dd0cb0..6cdfc93c045d0 100644 --- a/language/en-GB/en-GB.com_content.ini +++ b/language/en-GB/en-GB.com_content.ini @@ -3,9 +3,6 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_CONTENT_ACCESS_DELETE_DESC="Inherited state for delete actions on this article and the calculated state based on the menu selection." -COM_CONTENT_ACCESS_EDIT_DESC="Inherited state for edit actions on this article and the calculated state based on the menu selection." -COM_CONTENT_ACCESS_EDITSTATE_DESC="Inherited state for edit state actions on this article and the calculated state based on the menu selection." COM_CONTENT_ARTICLE_CONTENT="Content" COM_CONTENT_ARTICLE_HITS="Hits: %s" COM_CONTENT_ARTICLE_INFO="Details" diff --git a/libraries/src/Form/Field/RulesField.php b/libraries/src/Form/Field/RulesField.php index a284c414de111..c0c5beff1a249 100644 --- a/libraries/src/Form/Field/RulesField.php +++ b/libraries/src/Form/Field/RulesField.php @@ -302,8 +302,7 @@ protected function getInput() { $html[] = ''; $html[] = ''; - $html[] = '