Refs #1854. Using text to warn of the handover, instead the toggle with javascript.

3 files changed, 6 insertions, 19 deletions

diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 67b0bbb89..0d57f1680 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -19,7 +19,6 @@ $english = array(
 	'groups:add' => "Create a new group",
 	'groups:edit' => "Edit group",
 	'groups:delete' => 'Delete group',
-	'groups:handover' => 'Hand over',
 	'groups:membershiprequests' => 'Manage join requests',
 	'groups:invitations' => 'Group invitations',
 
@@ -36,6 +35,7 @@ $english = array(
 	'groups:membership' => "Group membership permissions",
 	'groups:access' => "Access permissions",
 	'groups:owner' => "Owner",
+	'groups:owner:warning' => "Warning: if you change this value, you will no longer be the owner of this group.",
 	'groups:widget:num_display' => 'Number of groups to display',
 	'groups:widget:membership' => 'Group membership',
 	'groups:widgets:description' => 'Display the groups you are a member of on your profile',
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 52900d2d9..7a740b878 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -109,6 +109,11 @@ if ($entity && ($owner_guid == elgg_get_logged_in_user_guid() || elgg_is_admin_l
 			));
 			?>
 	</label>
+	<?php
+	if ($owner_guid == elgg_get_logged_in_user_guid()) {
+		echo '<span class="elgg-text-help">' . elgg_echo('groups:owner:warning') . '</span>';
+	}
+	?>
 </div>
 
 <?php 	
diff --git a/mod/groups/views/default/groups/js.php b/mod/groups/views/default/groups/js.php
index c3698aadc..0319be14a 100644
--- a/mod/groups/views/default/groups/js.php
+++ b/mod/groups/views/default/groups/js.php
@@ -11,21 +11,3 @@ elgg.register_hook_handler('init', 'system', function() {
 	// jQuery uses 0-based indexing
 	$('#groups-tools').children('li:even').addClass('odd');
 });
-
-// Hide group owner dropdown
-elgg.register_hook_handler('init', 'system', function() {
-	$('.groups-owner-input').hide().each(function(){
-		$(this).after($(
-			'<?php
-				echo elgg_view('output/url', array(
-					'text' => elgg_echo('groups:handover'),
-					'rel' => 'toggle',
-					'class' => 'elgg-button elgg-button-delete',
-				));
-			?>'
-		).click(function(){
-			$(this).hide()
-			.prev().show();
-		}));
-	});
-});