Skip to content

Commit

Permalink
Update group vew on the groups listing page: remove height limit, sta…
Browse files Browse the repository at this point in the history
…ck the join button to prevent the overflow
  • Loading branch information
ishunko authored and nkissebe committed Jun 14, 2023
1 parent d1367e4 commit 8ef8c66
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
8 changes: 6 additions & 2 deletions core/components/com_groups/site/assets/css/groups.css
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@
}
.groups-container .group-details {
padding: 1em;
height: 6.7em;
text-align: center;
overflow: hidden;
flex-grow: 1;
}
.firefox .groups-container .group-details {
height: 6.9em;
Expand Down Expand Up @@ -202,7 +202,7 @@
display: block;
font-size: 0.9rem;
line-height: 1.2rem;
height: 3.6rem;
padding-bottom: 1rem;
overflow: hidden;
border: none;
}
Expand Down Expand Up @@ -251,6 +251,10 @@
color: #666;
display: block;
}

.group-meta .join-group {
margin-top: 1rem;
}
/* User actions */
.groups-container .user-actions {
font-size: 1.4em;
Expand Down
12 changes: 6 additions & 6 deletions core/components/com_groups/site/views/groups/tmpl/_group.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
<?php elseif ($status == 'invitee') : ?>
<a class="btn btn-success accept tooltips" href="<?php echo Route::url('index.php?option=' . $this->option . '&cn=' . $group->get('cn') . '&task=accept'); ?>" title="<?php echo Lang::txt('COM_GROUPS_TOOLBAR_ACCEPT'); ?>"><?php echo Lang::txt('COM_GROUPS_TOOLBAR_ACCEPT'); ?></a>
<?php else : ?>
<div class="grid">
<div class="col span6">
<div>
<div>
<?php if ($group->published == 2) : ?>
<span><?php echo Lang::txt('COM_GROUPS_BROWSE_STATE_ARCHIVED_HINT'); ?></span>
<?php echo Lang::txt('COM_GROUPS_BROWSE_STATE_ARCHIVED'); ?>
Expand Down Expand Up @@ -171,7 +171,7 @@
<?php echo Lang::txt('COM_GROUPS_ACTIVITY_LAST'); ?>
<?php endif; ?>
</div>
<div class="col span6 omega">
<div>
<span><?php echo count($members); ?></span>
<?php echo Lang::txt('COM_GROUPS_MEMBERS'); ?>
</div>
Expand All @@ -182,16 +182,16 @@
<?php echo Lang::txt('COM_GROUPS_BROWSE_STATE_ARCHIVED'); ?>
<?php else : ?>
<?php if (!$group->get('join_policy') || $group->get('join_policy') == 1) : ?>
<div class="grid">
<div class="col span6">
<div>
<div>
<?php if (!$group->get('join_policy')) : ?>
<span class="open join-policy"><?php echo Lang::txt('COM_GROUPS_BROWSE_POLICY_OPEN'); ?></span>
<?php elseif ($group->get('join_policy') == 1) : ?>
<span class="open join-policy"><?php echo Lang::txt('COM_GROUPS_BROWSE_POLICY_RESTRICTED'); ?></span>
<?php endif; ?>
<?php echo Lang::txt('COM_GROUPS_INFO_JOIN_POLICY'); ?>
</div>
<div class="col span6 omega">
<div class="join-group">
<a class="btn btn-success" href="<?php echo Route::url('index.php?option=' . $this->option . '&cn=' . $group->get('cn') . '&task=join'); ?>"><?php echo Lang::txt('COM_GROUPS_TOOLBAR_JOIN'); ?></a>
</div>
</div>
Expand Down

0 comments on commit 8ef8c66

Please sign in to comment.