aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/acl_selectors.php2
-rw-r--r--view/group_drop.tpl1
-rw-r--r--view/group_edit.tpl1
-rw-r--r--view/style.css4
4 files changed, 7 insertions, 1 deletions
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