Fixes #3867 finished up uservalidationbyemail styling after a great start by Sem

1 files changed, 7 insertions, 11 deletions

diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
index 036336734..2afd6022d 100644
--- a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
+++ b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
@@ -46,14 +46,14 @@ $pagination = elgg_view('navigation/pagination',array(
 	'limit' => $limit,
 ));
 
-$bulk_actions_checkbox = '<label><input type="checkbox" class="uservalidationbyemail-unvalidated-users-checkall" />'
+$bulk_actions_checkbox = '<label><input type="checkbox" id="uservalidationbyemail-checkall" />'
 	. elgg_echo('uservalidationbyemail:check_all') . '</label>';
 
 $validate = elgg_view('output/url', array(
 	'href' => 'action/uservalidationbyemail/validate/',
 	'text' => elgg_echo('uservalidationbyemail:admin:validate'),
 	'title' => elgg_echo('uservalidationbyemail:confirm_validate_checked'),
-	'class' => 'uservalidationbyemail-unvalidated-users-bulk-post',
+	'class' => 'uservalidationbyemail-submit',
 	'is_action' => true,
 	'is_trusted' => true,
 ));
@@ -62,7 +62,7 @@ $resend_email = elgg_view('output/url', array(
 	'href' => 'action/uservalidationbyemail/resend_validation/',
 	'text' => elgg_echo('uservalidationbyemail:admin:resend_validation'),
 	'title' => elgg_echo('uservalidationbyemail:confirm_resend_validation_checked'),
-	'class' => 'uservalidationbyemail-unvalidated-users-bulk-post',
+	'class' => 'uservalidationbyemail-submit',
 	'is_action' => true,
 	'is_trusted' => true,
 ));
@@ -71,25 +71,21 @@ $delete = elgg_view('output/url', array(
 	'href' => 'action/uservalidationbyemail/delete/',
 	'text' => elgg_echo('uservalidationbyemail:admin:delete'),
 	'title' => elgg_echo('uservalidationbyemail:confirm_delete_checked'),
-	'class' => 'uservalidationbyemail-unvalidated-users-bulk-post',
+	'class' => 'uservalidationbyemail-submit',
 	'is_action' => true,
 	'is_trusted' => true,
 ));
 
 $bulk_actions = <<<___END
-<div class="uservalidationbyemail-bulk-actions pas">
-	<ul class="uservalidationbyemail-controls right">
+	<ul class="elgg-menu elgg-menu-general elgg-menu-hz float-alt">
 		<li>$resend_email</li><li>$validate</li><li>$delete</li>
 	</ul>
 
 	$bulk_actions_checkbox
-</div>
 ___END;
 
-//$bulk_actions = elgg_view('page_elements/contentwrapper', array('body' => $bulk_actions));
-
 if (is_array($users) && count($users) > 0) {
-	$html = '<ul class="elgg-list uservalidationbyemail-unvalidated-user-list">';
+	$html = '<ul class="elgg-list elgg-list-distinct">';
 	foreach ($users as $user) {
 		$html .= "<li id=\"unvalidated-user-{$user->guid}\" class=\"elgg-item uservalidationbyemail-unvalidated-user-item\">";
 		$html .= elgg_view('uservalidationbyemail/unvalidated_user', array('user' => $user));
@@ -99,7 +95,7 @@ if (is_array($users) && count($users) > 0) {
 }
 
 echo <<<___END
-<div class="elgg-module elgg-module-inline">
+<div class="elgg-module elgg-module-inline uservalidation-module">
 	<div class="elgg-head">
 		$bulk_actions
 	</div>