GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'meitar/0.7.x' into 0.7.x

This commit is contained in:
Evan Prodromou 2009-02-06 14:32:26 -05:00
parent be6ce27538 8ec312043f
commit 1f07b187e7
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/usergroups.php
View File

@ -125,6 +125,12 @@ class UsergroupsAction extends Action
_('Create a new group')); _('Create a new group'));
$this->elementEnd('p'); $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; $offset = ($this->page-1) * GROUPS_PER_PAGE;
$limit = GROUPS_PER_PAGE + 1; $limit = GROUPS_PER_PAGE + 1;

2
theme/base/css/display.css
View File

@ -947,7 +947,7 @@ padding:0;
#new_group { #new_group, #group_search {
margin-bottom:18px; margin-bottom:18px;
} }
#new_group a { #new_group a {

5
theme/default/css/display.css
View File

@ -238,7 +238,10 @@ background-color:#fcfcfc;
#new_group a { #new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; 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_prev a,
.pagination .nav_next a { .pagination .nav_next a {

5
theme/identica/css/display.css
View File

@ -238,7 +238,10 @@ background-color:#fcfcfc;
#new_group a { #new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; 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_prev a,
.pagination .nav_next a { .pagination .nav_next a {