From 60d0fea854a54f4647e5cc89a41dd7148e4cd7c2 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Wed, 2 Nov 2011 15:24:04 +0100
Subject: Fixes #3867. Rewrite and style unvalidated users administration area.

---
 mod/uservalidationbyemail/start.php                |  1 +
 .../views/default/admin/users/unvalidated.php      |  2 +-
 .../forms/uservalidationbyemail/bulk_action.php    | 25 ++++++++++++++--------
 .../views/default/uservalidationbyemail/css.php    |  7 ++++++
 .../views/default/uservalidationbyemail/js.php     |  8 +++----
 .../uservalidationbyemail/unvalidated_user.php     |  2 +-
 6 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php

(limited to 'mod')

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index d3d0c3488..037f863a9 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -41,6 +41,7 @@ function uservalidationbyemail_init() {
 	// admin interface to manually validate users
 	elgg_register_admin_menu_item('administer', 'unvalidated', 'users');
 
+	elgg_extend_view('css/admin', 'uservalidationbyemail/css');
 	elgg_extend_view('js/elgg', 'uservalidationbyemail/js');
 
 	$action_path = dirname(__FILE__) . '/actions';
diff --git a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
index 8b72126ef..abe539108 100644
--- a/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
+++ b/mod/uservalidationbyemail/views/default/admin/users/unvalidated.php
@@ -4,6 +4,6 @@
  */
 
 echo elgg_view_form('uservalidationbyemail/bulk_action', array(
-	'name' => 'unvalidated-users',
+	'id' => 'unvalidated-users',
 	'action' => 'action/uservalidationbyemail/bulk_action'
 ));
diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
index 0e1461058..bc4d33c6a 100644
--- a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
+++ b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
@@ -46,8 +46,6 @@ $pagination = elgg_view('navigation/pagination',array(
 	'limit' => $limit,
 ));
 
-echo $pagination;
-
 $bulk_actions_checkbox = '<label><input type="checkbox" class="unvalidated-users-checkall" />'
 	. elgg_echo('uservalidationbyemail:check_all') . '</label>';
 
@@ -79,8 +77,8 @@ $delete = elgg_view('output/url', array(
 ));
 
 $bulk_actions = <<<___END
-<div class="uvbe_bulk_actions">
-	<div class="uvbe_admin_controls">
+<div class="uvbe_bulk_actions pas">
+	<div class="uvbe_admin_controls right">
 		$resend_email | $validate | $delete
 	</div>
 
@@ -90,15 +88,24 @@ ___END;
 
 //$bulk_actions = elgg_view('page_elements/contentwrapper', array('body' => $bulk_actions));
 
-echo $bulk_actions;
-
-
+$list = '';
 foreach ($users as $user) {
-	echo elgg_view('uservalidationbyemail/unvalidated_user', array('user' => $user));
+	$list .= elgg_view('uservalidationbyemail/unvalidated_user', array('user' => $user));
 }
 
+echo <<<___END
+<div class="elgg-module elgg-module-inline">
+	<div class="elgg-head">
+		$bulk_actions
+	</div>
+	<div class="elgg-body">
+		$list
+	</div>
+</div>
+___END;
+
 if ($count > 5) {
 	echo $bulk_actions;
 }
 
-echo $pagination;
\ No newline at end of file
+echo $pagination;
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
new file mode 100644
index 000000000..11f1aa18b
--- /dev/null
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
@@ -0,0 +1,7 @@
+.elgg-head .uvbe_bulk_actions label, .elgg-head .uvbe_bulk_actions a{
+	color: white;
+}
+
+.right {
+	float: right;
+}
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
index 50c98406e..35f1ada7f 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
@@ -3,12 +3,12 @@ elgg.provide('elgg.uservalidationbyemail');
 
 elgg.uservalidationbyemail.init = function() {
 	$('.unvalidated-users-checkall').click(function() {
-		checked = $(this).attr('checked');
-		$('form[name=unvalidated-users]').find('input[type=checkbox]').attr('checked', checked);
+		checked = $(this).attr('checked') == 'checked';
+		$('form#unvalidated-users').find('input[type=checkbox]').attr('checked', checked);
 	});
 
 	$('.unvalidated-users-bulk-post').click(function(event) {
-		$form = $('form[name=unvalidated-users]');
+		$form = $('form#unvalidated-users');
 		event.preventDefault();
 
 		// check if there are selected users
@@ -23,6 +23,6 @@ elgg.uservalidationbyemail.init = function() {
 
 		$form.attr('action', $(this).attr('href')).submit();
 	});
-};
+}
 
 elgg.register_hook_handler('init', 'system', elgg.uservalidationbyemail.init);
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
index 209dbe02b..9d2f47139 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
@@ -13,7 +13,7 @@ $user = elgg_extract('user', $vars);
 //	'name' => 'user_guids',
 //	'options' => array("$user->username - \"$user->name\" &lt;$user->email&gt;" => $user->guid)
 //));
-$checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"elgg-input-checkboxes\" name=\"user_guids[]\">"
+$checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"elgg-input-checkboxes\" name=\"user_guids[]\" />"
 	. "$user->username - \"$user->name\" &lt;$user->email&gt;</label>";
 
 $created = elgg_echo('uservalidationbyemail:admin:user_created', array(elgg_view_friendly_time($user->time_created)));
-- 
cgit v1.2.3


From 0db0b0578728e30b990123cad1e15bd71acfdbaf Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Wed, 2 Nov 2011 15:56:45 +0100
Subject: Refs #3867. elgg_view_image_block used for list users. Bulk
 operations as a list.

---
 .../forms/uservalidationbyemail/bulk_action.php       |  6 +++---
 .../views/default/uservalidationbyemail/css.php       | 11 +++++++++++
 .../uservalidationbyemail/unvalidated_user.php        | 19 ++++++++++++-------
 3 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'mod')

diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
index bc4d33c6a..4d829778a 100644
--- a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
+++ b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
@@ -78,9 +78,9 @@ $delete = elgg_view('output/url', array(
 
 $bulk_actions = <<<___END
 <div class="uvbe_bulk_actions pas">
-	<div class="uvbe_admin_controls right">
-		$resend_email | $validate | $delete
-	</div>
+	<ul class="uvbe_admin_controls right">
+		<li>$resend_email</li><li>$validate</li><li>$delete</li>
+	</ul>
 
 	$bulk_actions_checkbox
 </div>
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
index 11f1aa18b..f7a1da12d 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
@@ -5,3 +5,14 @@
 .right {
 	float: right;
 }
+
+.uservalidationbyemail_unvalidated_controls li, .uvbe_admin_controls li {
+	display: inline;
+	border-right: solid 1px;
+	padding: 0 4px 0 4px;
+}
+
+.uservalidationbyemail_unvalidated_controls li:last-child, .uvbe_admin_controls li:last-child {
+	border: 0;
+	padding-right: 0;
+}
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
index 9d2f47139..af4545907 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
@@ -36,16 +36,21 @@ $delete = elgg_view('output/confirmlink', array(
 	'text' => elgg_echo('uservalidationbyemail:admin:delete')
 ));
 
-?>
-
+$block = <<<___END
 <div class="admin_settings radius8 pas baa">
-	<?php echo $checkbox; ?><br />
+	$checkbox<br />
 
-	<div class="uservalidationbyemail_unvalidated_controls right">
-		<?php echo "$resend_email | $validate | $delete"; ?>
-	</div>
+	<ul class="uservalidationbyemail_unvalidated_controls right">
+		<li>$resend_email</li><li>$validate</li><li>$delete</li>
+	</ul>
 
 	<div class="uservalidationbyemail_unvalidated_user_details mll small">
-		<?php echo $created; ?>
+		$created
 	</div>
 </div>
+___END;
+
+echo elgg_view_image_block('', $block);
+
+?>
+
-- 
cgit v1.2.3


From 476c4f93769a3d2e7881b228ecfb4623ead6f556 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Thu, 3 Nov 2011 17:50:50 +0100
Subject: Refs #3867. Unvalidated users is an unordered list now. Added right
 class and other css helpers to admin css. Standarized css namespaces and
 dashes in classes. Acomplishing code standards.

---
 .../forms/uservalidationbyemail/bulk_action.php    | 25 ++++---
 .../views/default/uservalidationbyemail/css.php    | 10 +--
 .../views/default/uservalidationbyemail/js.php     |  6 +-
 .../uservalidationbyemail/unvalidated_user.php     |  9 +--
 views/default/css/admin.php                        | 83 ++++++++++++++++++++++
 5 files changed, 107 insertions(+), 26 deletions(-)

(limited to 'mod')

diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
index 4d829778a..036336734 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="unvalidated-users-checkall" />'
+$bulk_actions_checkbox = '<label><input type="checkbox" class="uservalidationbyemail-unvalidated-users-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' => 'unvalidated-users-bulk-post',
+	'class' => 'uservalidationbyemail-unvalidated-users-bulk-post',
 	'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' => 'unvalidated-users-bulk-post',
+	'class' => 'uservalidationbyemail-unvalidated-users-bulk-post',
 	'is_action' => true,
 	'is_trusted' => true,
 ));
@@ -71,14 +71,14 @@ $delete = elgg_view('output/url', array(
 	'href' => 'action/uservalidationbyemail/delete/',
 	'text' => elgg_echo('uservalidationbyemail:admin:delete'),
 	'title' => elgg_echo('uservalidationbyemail:confirm_delete_checked'),
-	'class' => 'unvalidated-users-bulk-post',
+	'class' => 'uservalidationbyemail-unvalidated-users-bulk-post',
 	'is_action' => true,
 	'is_trusted' => true,
 ));
 
 $bulk_actions = <<<___END
-<div class="uvbe_bulk_actions pas">
-	<ul class="uvbe_admin_controls right">
+<div class="uservalidationbyemail-bulk-actions pas">
+	<ul class="uservalidationbyemail-controls right">
 		<li>$resend_email</li><li>$validate</li><li>$delete</li>
 	</ul>
 
@@ -88,9 +88,14 @@ ___END;
 
 //$bulk_actions = elgg_view('page_elements/contentwrapper', array('body' => $bulk_actions));
 
-$list = '';
-foreach ($users as $user) {
-	$list .= elgg_view('uservalidationbyemail/unvalidated_user', array('user' => $user));
+if (is_array($users) && count($users) > 0) {
+	$html = '<ul class="elgg-list uservalidationbyemail-unvalidated-user-list">';
+	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));
+		$html .= '</li>';
+	}
+	$html .= '</ul>';
 }
 
 echo <<<___END
@@ -99,7 +104,7 @@ echo <<<___END
 		$bulk_actions
 	</div>
 	<div class="elgg-body">
-		$list
+		$html
 	</div>
 </div>
 ___END;
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
index f7a1da12d..3ce9a8ac9 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/css.php
@@ -1,18 +1,14 @@
-.elgg-head .uvbe_bulk_actions label, .elgg-head .uvbe_bulk_actions a{
+.elgg-head .uservalidationbyemail-bulk-actions label, .elgg-head .uservalidationbyemail-bulk-actions a{
 	color: white;
 }
 
-.right {
-	float: right;
-}
-
-.uservalidationbyemail_unvalidated_controls li, .uvbe_admin_controls li {
+.uservalidationbyemail-controls li {
 	display: inline;
 	border-right: solid 1px;
 	padding: 0 4px 0 4px;
 }
 
-.uservalidationbyemail_unvalidated_controls li:last-child, .uvbe_admin_controls li:last-child {
+.uservalidationbyemail-controls li:last-child {
 	border: 0;
 	padding-right: 0;
 }
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
index 35f1ada7f..a10d7fbe6 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/js.php
@@ -2,12 +2,12 @@
 elgg.provide('elgg.uservalidationbyemail');
 
 elgg.uservalidationbyemail.init = function() {
-	$('.unvalidated-users-checkall').click(function() {
+	$('.uservalidationbyemail-unvalidated-users-checkall').click(function() {
 		checked = $(this).attr('checked') == 'checked';
 		$('form#unvalidated-users').find('input[type=checkbox]').attr('checked', checked);
 	});
 
-	$('.unvalidated-users-bulk-post').click(function(event) {
+	$('.uservalidationbyemail-unvalidated-users-bulk-post').click(function(event) {
 		$form = $('form#unvalidated-users');
 		event.preventDefault();
 
@@ -23,6 +23,6 @@ elgg.uservalidationbyemail.init = function() {
 
 		$form.attr('action', $(this).attr('href')).submit();
 	});
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.uservalidationbyemail.init);
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
index af4545907..6431712ce 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
@@ -37,20 +37,17 @@ $delete = elgg_view('output/confirmlink', array(
 ));
 
 $block = <<<___END
-<div class="admin_settings radius8 pas baa">
+<div class="admin-settings radius8 pas baa">
 	$checkbox<br />
 
-	<ul class="uservalidationbyemail_unvalidated_controls right">
+	<ul class="uservalidationbyemail-controls right">
 		<li>$resend_email</li><li>$validate</li><li>$delete</li>
 	</ul>
 
-	<div class="uservalidationbyemail_unvalidated_user_details mll small">
+	<div class="uservalidationbyemail-unvalidated-user-details mll small">
 		$created
 	</div>
 </div>
 ___END;
 
 echo elgg_view_image_block('', $block);
-
-?>
-
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 160a2a3e4..61b61c27a 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1001,6 +1001,89 @@ a.elgg-widget-collapsed:before {
 	width: 83.33%;
 }
 
+/* ***************************************
+	HELPERS
+*************************************** */
+
+.clearfloat { 
+	clear: both;
+}
+
+.hidden {
+	display: none;
+}
+
+.centered {
+	margin: 0 auto;
+}
+
+.center {
+	text-align: center;
+}
+
+.float {
+	float: left;
+}
+
+.float-alt {
+	float: right;
+}
+
+.right {
+	float: right;
+}
+
+.left {
+	float: left;
+}
+
+.link {
+	cursor: pointer;
+}
+
+.large {
+	font-size: 120%;
+}
+
+.small {
+	font-size: 80%;
+}
+
+.elgg-discover .elgg-discoverable {
+	display: none;
+}
+
+.elgg-discover:hover .elgg-discoverable {
+	display: block;
+}
+
+.elgg-transition:hover {
+	opacity: .7;
+}
+
+/* ***************************************
+	BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+	border: 1px solid #eeeeee;
+}
+.elgg-border-transition {
+	border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+	border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+	border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+	border-right: 1px solid #CCCCCC;
+}
+
+
 /* ***************************************
 	SPACING (from OOCSS)
 *************************************** */
-- 
cgit v1.2.3