From f4e634ad526198cc5c79e74d77b19c8a1b518942 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Wed, 11 Aug 2010 01:48:43 -0700
Subject: group drop

---
 view/acl_selectors.php | 2 +-
 view/group_drop.tpl    | 1 +
 view/group_edit.tpl    | 1 +
 view/style.css         | 4 ++++
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 view/group_drop.tpl

(limited to 'view')

diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index c0d3ddcd4..ac34fab3a 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -7,7 +7,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
 
-	$r = q("SELECT * FROM `group` WHERE `uid` = %d ORDER BY `name` ASC",
+	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
 		$_SESSION['uid']
 	);
 
diff --git a/view/group_drop.tpl b/view/group_drop.tpl
new file mode 100644
index 000000000..c87ea459f
--- /dev/null
+++ b/view/group_drop.tpl
@@ -0,0 +1 @@
+<div class="group-delete-wrapper" id="group-delete-wrapper-$id" ><a href="group/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="group-delete-icon-$id" class="group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="group-delete-end"></div>
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 7cfd0fe3e..e6c7afb49 100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -13,6 +13,7 @@
 $selector
 
 </div>
+$drop
 <div id="group_members_select_end"></div>
 <div id="group-edit-submit-wrapper" >
 <input type="submit" name="submit" value="Submit" >
diff --git a/view/style.css b/view/style.css
index 8b52693fa..70f6f45f9 100644
--- a/view/style.css
+++ b/view/style.css
@@ -1404,3 +1404,7 @@ input#dfrn-url {
 	margin-left: 200px;
 }
 
+.group-delete-wrapper {
+	float: right;
+	margin-right: 50px;
+}
\ No newline at end of file
-- 
cgit v1.2.3