Merge branch 'meitar/0.7.x' into 0.7.x
This commit is contained in:
commit
1f07b187e7
@ -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;
|
||||
|
||||
|
@ -947,7 +947,7 @@ padding:0;
|
||||
|
||||
|
||||
|
||||
#new_group {
|
||||
#new_group, #group_search {
|
||||
margin-bottom:18px;
|
||||
}
|
||||
#new_group a {
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user