Commit 9c992dd1 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Group member page styles

parent 649552db
......@@ -30,6 +30,7 @@ defined('INTERNAL') || die();
$string['groupname'] = 'Group Name';
$string['creategroup'] = 'Create Group';
$string['groupmemberrequests'] = 'Pending membership requests';
$string['membershiprequests'] = 'Membership requests';
$string['sendinvitation'] = 'Send invite';
$string['invitetogroupsubject'] = 'You were invited to join a group';
$string['invitetogroupmessage'] = '%s has invited you to join a group, \'%s\'. Click on the link below for more information.';
......@@ -127,8 +128,6 @@ $string['groupsimin'] = 'Groups I\'m In';
$string['groupsiown'] = 'Groups I Own';
$string['groupsiminvitedto'] = 'Groups I\'m Invited To';
$string['groupsiwanttojoin'] = 'Groups I Want To Join';
$string['therearependingrequests'] = 'There are %s pending membership requests for this group';
$string['thereispendingrequest'] = 'There is 1 pending membership request for this group';
$string['requestedtojoin'] = 'You have requested to join this group';
$string['groupnotfound'] = 'Group with id %s not found';
$string['groupconfirmleave'] = 'Are you sure you want to leave this group?';
......
......@@ -447,6 +447,14 @@ input#myfriends_addfriend_add {
border: 0;
margin: 0;
}
div.delete input {
background: url(../images/icon-delete.gif) no-repeat left 50%;
color: #dd0221;
}
div.add input {
background: url(../images/icon-add.gif) no-repeat left 4px;
color: #547c22;
}
div.rbuttons {
position: absolute;
right: 0;
......@@ -716,6 +724,28 @@ p.progress-text {
font-weight: bold;
}
/* Group members */
#results .twocolumn form input {
border: none;
font-weight: normal;
font-size: .9em;
line-height: .9em;
}
#results .twocolumn {
font-size: .9em;
}
#results .twocolumn td {
width: 50%;
border: 4px solid #FFF;
}
#results .twocolumn td img {
margin-right: .5em;
}
#results .twocolumn h3 {
margin: 0;
}
/*
#staffusers table,
......@@ -947,12 +977,6 @@ input#myfriends_addfriend_add {
font-size: .85em;
font-weight: bold;
}
#membersearchresults .removeform input {
background: url(../images/icon-delete.gif) no-repeat left 7px;
padding-left: .6em;
border: none;
color: #ca0000;
}
/****** DELETE FORUM ICON LINKS ********/
/*
input.delete {
......@@ -1529,19 +1553,10 @@ fieldset.collapsed .mceEditor td {
list-style: none;
}
#membersearchresults td {
width: 50%;
border: 4px solid #FFF;
}
#membersearchresults form {
margin: 0;
float: right;
}
#mygroupstable,
#findgroups,
.friendinfo,
#membersearchresults {
.friendinfo {
font-size: .9em;
}
......
......@@ -10,11 +10,7 @@
{if $group->jointype == 'request' && $group->requests}
<li>
{if $group->requests == 1}
<a href="{$WWWROOT}group/members.php?id={$group->id|escape}&amp;membershiptype=request" class="btn-pending">{str tag="thereispendingrequest" section="group"}</a>
{else}
<a href="{$WWWROOT}group/members.php?id={$group->id|escape}&amp;membershiptype=request" class="btn-pending">{str tag="therearependingrequests" section="group" args=$group->requests}</a>
{/if}
<a href="{$WWWROOT}group/members.php?id={$group->id|escape}&amp;membershiptype=request" class="btn-pending">{str tag="membershiprequests" section="group"} ({$group->requests})</a>
</li>
{/if}
......
......@@ -12,7 +12,7 @@
</form>
{if $membershiptype}<h3>{str tag=pendingmembers section=group}</h3>{/if}
<div id="results">
<table id="membersearchresults" class="tablerenderer fullwidth">
<table id="membersearchresults" class="tablerenderer fullwidth twocolumn">
<tbody>
{$results}
</tbody>
......
......@@ -6,20 +6,20 @@
<div class="fl"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=40&amp;id={$r.id|escape}" alt=""></div>
<h3><a href="{$WWWROOT}user/view.php?id={$r.id|escape}">{$r.name|escape}</a></h3>
{if $r.role}
<h5 class="removeform">
{$results.roles[$r.role]->display}{if $caneditroles && $r.canchangerole} (<a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}">{str tag=changerole section=group}</a>){/if}
{$r.removeform}
</h5>
<div class="introduction">{$r.introduction|str_shorten_html:80:true}</div>
<label>{str tag="Joined" section="group"}:</label> {$r.jointime}
<div class="rel">
<strong>{$results.roles[$r.role]->display}</strong>
{if $caneditroles && $r.canchangerole} (<a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}">{str tag=changerole section=group}</a>){/if}
<div class="rbuttons delete">{$r.removeform}</div>
<div>{$r.introduction|str_shorten_html:80:true}</div>
<label>{str tag="Joined" section="group"}:</label> {$r.jointime}
</div>
{elseif $membershiptype == 'request'}
<div class="requested">{str tag=hasrequestedmembership section=group}.{if $r.reason}
<label>{str tag=reason}:</label> {$r.reason|format_whitespace}{/if}
</div>
{$r.addform}
<div>{str tag=hasrequestedmembership section=group}.{if $r.reason}
<label>{str tag=reason}:</label> {$r.reason|format_whitespace}{/if}
</div>
<div class="right add">{$r.addform}</div>
{elseif $membershiptype == 'invite'}
<div class="invited">{str tag=hasbeeninvitedtojoin section=group}</div>
<div>{str tag=hasbeeninvitedtojoin section=group}</div>
{/if}
</td>
{/foreach}
......
{include file="header.tpl"}
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
<h3>{$subheading|escape}</h3>
{$form}
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file="header.tpl"}
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
{if $views}
<table id="myviewstable" class="groupviews">
......@@ -33,6 +31,5 @@
{/if}
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment