feat(icons): icon cropping is now default enabled in entity/edit/icon

fixes #14016
Elgg · Aug 4, 2022 · a845ce0 · a845ce0
1 parent ddb2597
commit a845ce0
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 7 deletions.
diff --git a/docs/guides/actions.rst b/docs/guides/actions.rst
@@ -403,6 +403,7 @@ The view supports some variables to control the output
 * ``name`` - name of the input/file (default: icon)
 * ``remove_name`` - name of the remove icon toggle (default: $vars['name'] . '_remove')
 * ``required`` - is icon upload required (default: false)
+* ``cropper_enabled`` - is icon cropping allowed (default: true)
 * ``show_remove`` - show the remove icon option (default: true)
 * ``show_thumb`` - show the thumb of the entity if available (default: true)
 * ``thumb_size`` - the icon size to use as the thumb (default: medium)

diff --git a/mod/groups/views/default/groups/edit/profile.php b/mod/groups/views/default/groups/edit/profile.php
@@ -17,7 +17,6 @@
 	'entity' => elgg_extract('entity', $vars),
 	'entity_type' => 'group',
 	'entity_subtype' => 'group',
-	'cropper_enabled' => true,
 ]);
 
 // show the configured group profile fields

diff --git a/views/default/entity/edit/icon.php b/views/default/entity/edit/icon.php
@@ -12,7 +12,7 @@
  * @uses $vars['show_remove']     show the remove icon option (default: true)
  * @uses $vars['show_thumb']      show the thumb of the entity if available (default: true)
  * @uses $vars['thumb_size']      the icon size to use as the thumb (default: medium)
- * @uses $vars['cropper_enabled'] enable cropper features (default: false), see the view 'entity/edit/icon/crop' for more details
+ * @uses $vars['cropper_enabled'] enable cropper features (default: true), see the view 'entity/edit/icon/crop' for more details
  */
 
 $entity = elgg_extract('entity', $vars);

diff --git a/views/default/entity/edit/icon/crop.php b/views/default/entity/edit/icon/crop.php
@@ -5,15 +5,15 @@
  * @uses $vars['entity']                    the entity being edited
  * @uses $vars['entity_type']               the type of the entity
  * @uses $vars['entity_subtype']            the subtype of the entity
- * @uses $vars['cropper_enabled']           enable cropper features (default: false)
+ * @uses $vars['cropper_enabled']           enable cropper features (default: true)
  * @uses $vars['cropper_config']            configuration for CropperJS
  * @uses $vars['cropper_aspect_ratio_size'] the icon size to use to detect cropping aspact ratio (default: master) pass 'false' to disable
  * @uses $vars['cropper_show_messages']     show messages (default: true for icon_type = 'icon', false otherwise)
  * @uses $vars['cropper_min_width']         the minimal width of the cropped image
  * @uses $vars['cropper_min_height']        the minimal height of the cropped image
  */
 
-if (elgg_extract('cropper_enabled', $vars, false) === false) {
+if (elgg_extract('cropper_enabled', $vars, true) === false) {
 	return;
 }
 

diff --git a/views/default/entity/edit/icon/thumb.php b/views/default/entity/edit/icon/thumb.php
@@ -9,7 +9,7 @@
  * @uses $vars['cropper_enabled'] enable cropper features (default: false), when cropper is enabled thumbnail is disabled by default
  */
 
-if (elgg_extract('show_thumb', $vars, !elgg_extract('cropper_enabled', $vars, false)) === false) {
+if (elgg_extract('show_thumb', $vars, !elgg_extract('cropper_enabled', $vars, true)) === false) {
 	return;
 }
 

diff --git a/views/default/forms/admin/site/icons.php b/views/default/forms/admin/site/icons.php
@@ -4,7 +4,6 @@
 
 $site_icon .= elgg_view('entity/edit/icon', [
 	'entity' => elgg_get_site_entity(),
-	'cropper_enabled' => true,
 ]);
 
 echo elgg_view_module('info', elgg_echo('admin:site_icons:site_icon'), $site_icon);

diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php
@@ -19,7 +19,6 @@
 echo elgg_view('entity/edit/icon', [
 	'entity' => $entity,
 	'name' => 'avatar',
-	'cropper_enabled' => true,
 ]);
 
 $footer = elgg_view_field([