summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-06 14:32:26 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-06 14:32:26 -0500
commit1f07b187e7968ae3d03c0a23a1566e476b8a1f71 (patch)
tree006f25ae53b66e096a61eed1fdf901e181d32489
parentbe6ce275387971692944c3677ea5e03f6fd038f8 (diff)
parent8ec312043f8f4026d560e2cd0805200cb6c0f31a (diff)
Merge branch 'meitar/0.7.x' into 0.7.x
-rw-r--r--actions/usergroups.php6
-rw-r--r--theme/base/css/display.css2
-rw-r--r--theme/default/css/display.css5
-rw-r--r--theme/identica/css/display.css5
4 files changed, 15 insertions, 3 deletions
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 58cf7eeb6..ded4ba76b 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -125,6 +125,12 @@ class UsergroupsAction extends Action
_('Create a new group'));
$this->elementEnd('p');
+ $this->elementStart('p', array('id' => 'group_search'));
+ $this->element('a', array('href' => common_local_url('groupsearch'),
+ 'class' => 'more'),
+ _('Search for more groups'));
+ $this->elementEnd('p');
+
$offset = ($this->page-1) * GROUPS_PER_PAGE;
$limit = GROUPS_PER_PAGE + 1;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f6e3c0fc7..3b72d00ce 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -947,7 +947,7 @@ padding:0;
-#new_group {
+#new_group, #group_search {
margin-bottom:18px;
}
#new_group a {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 854202956..85b5aa13e 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -238,7 +238,10 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
.pagination .nav_prev a,
.pagination .nav_next a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9f6499013..576a2e14b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -238,7 +238,10 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
.pagination .nav_prev a,
.pagination .nav_next a {