Commit 2f4785b9 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Remove clutter from forum and topic lists

parent 75c2a119
......@@ -7,16 +7,20 @@
</div>
{/if}
<div>
<label class="blue">{str tag="groupadminlist" section="interaction.forum"}</label>
{foreach name=groupadmins from=$groupadmins item=groupadmin}<a href="{$WWWROOT}user/view.php?id={$groupadmin}" class="groupadmin s">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$groupadmin}" alt="">
{$groupadmin|display_name|escape}</a>{if !$smarty.foreach.groupadmins.last}, {/if}{/foreach}
<label>{str tag="groupadminlist" section="interaction.forum"}</label>
{foreach from=$groupadmins item=groupadmin}
<span class="s inlinelist">
<a href="{$WWWROOT}user/view.php?id={$groupadmin}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$groupadmin}" alt=""></a>
<a href="{$WWWROOT}user/view.php?id={$groupadmin}" class="groupadmin">{$groupadmin|display_name|escape}</a>
</span>
{/foreach}
</div>
{if $forums}
<table id="forumslist" class="fullwidth">
<tr>
<th>{str tag="forumname" section="interaction.forum"}</th>
<th>{str tag="description"}</th>
<th>{str tag=Moderators section=interaction.forum}</th>
<th>{str tag="Topics" section="interaction.forum"}</th>
{if $admin}<th></th>{/if}
{if $forum->subscribe}{/if}<th></th>
......@@ -27,12 +31,14 @@
</td>
<td>
{$forum->description}
</td>
<td>
{if $forum->moderators}
{str tag="moderatorslist" section="interaction.forum"}
{foreach from=$forum->moderators item=mod name=moderators}
<a href="{$WWWROOT}user/view.php?id={$mod}" class="moderator">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$mod}" alt="">
{$mod|display_name|escape}</a>{if !$smarty.foreach.moderators.last}, {/if}
{foreach from=$forum->moderators item=mod}
<div class="s">
<a href="{$WWWROOT}user/view.php?id={$mod}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$mod}" alt=""></a>
<a href="{$WWWROOT}user/view.php?id={$mod}" class="moderator forumuser">{$mod|display_name|escape}</a>
</div>
{/foreach}
{/if}
</td>
......@@ -40,7 +46,7 @@
{if $admin}
<td class="nowrap btn-spacer s">
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id|escape}&amp;returnto=index" id="btn-edit" class="btn-edit">{str tag=edit}</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id|escape}&amp;returnto=index" id="btn-delete" class="btn-del">{str tag=delete}</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id|escape}&amp;returnto=index" class="btn-del">{str tag=delete}</a>
</td>
{/if}
{if $forum->subscribe}<td class="nowrap s">{$forum->subscribe}</td>{/if}
......
......@@ -9,13 +9,16 @@
margin-bottom: .5em;
}
.groupadmin{
color: #d32a8a !important;
color: #d32a8a;
}
.moderator {
color: #2a8bd3 !important;
color: #2a8bd3;
}
.btn-spacer #btn-delete {
margin-left: 1em;
.forumuser {
vertical-align: top;
}
.inlinelist img {
vertical-align: middle;
}
#forumslist {
margin: 1em 0;
......@@ -30,7 +33,10 @@
margin: 1em 0;
}
#viewforum {
padding: .25em;
padding: 0 .25em;
}
#viewforum h3 {
margin: 0;
}
.btn-subscribe input.submit {
background: url(../images/icon-subscribe.gif) no-repeat left 5px;
......@@ -48,34 +54,12 @@
.nowrap {
white-space: nowrap;
}
.lastpost {
font-size: .9em;
color: #aaaaaa;
}
.forumselectwrap {
padding: .5em 0;
}
.forumkey {
clear: left;
font-size: .9em;
padding: .5em;
}
#forumkeylist {
list-style: none;
margin: 0;
display: inline;
}
#forumkeylist li {
display: inline;
margin: 0 1.5em 0 0;
}
.stickytopic {
background-color: #f4fbdc;
}
.forumtopicdescription,
.forumposter {
font-size: .9em;
}
/* FORUM > ADD TOPIC */
......
......@@ -4,9 +4,9 @@
{if $membership}
<div class="rbuttons pagetabs">
{if $topic->canedit}
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id|escape}" id="btn-edittopic" class="btn-edit s">{str tag=edittopic section=interaction.forum}</a>
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id|escape}" class="btn-edit s">{str tag=edittopic section=interaction.forum}</a>
{if $moderator}
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id|escape}" id="btn-deletetopic" class="delete btn-del s">{str tag=deletetopic section=interaction.forum}</a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id|escape}" class="delete btn-del s">{str tag=deletetopic section=interaction.forum}</a>
{/if}
{/if}
{if !$topic->forumsubscribed}
......
......@@ -15,29 +15,17 @@
{/if}
<td>
<a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id|escape}">{$topic->subject|escape}</a>
<div class="forumtopicdescription">{$topic->body}</div>
<div class="s">{$topic->body}</div>
</td>
<td class="forumposter">
<a href="{$WWWROOT}user/view.php?id={$topic->poster}"
{if in_array($topic->poster, $groupadmins)} class="groupadmin"
{elseif $topic->moderator} class="moderator"
{/if}
>
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$topic->poster}" alt="">
{$topic->poster|display_name|escape}
</a>
<td class="s">
<a href="{$WWWROOT}user/view.php?id={$topic->poster}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$topic->poster}" alt=""></a>
<a href="{$WWWROOT}user/view.php?id={$topic->poster}" class="forumuser{if in_array($topic->poster, $groupadmins)} groupadmin{elseif $topic->moderator} moderator{/if}">{$topic->poster|display_name|escape}</a>
</td>
<td class="postscount">{$topic->postcount|escape}</td>
<td class="lastpost">
<td class="s">
{if !$topic->lastpostdeleted}
<a href="{$WWWROOT}user/view.php?id={$topic->lastposter}"
{if in_array($topic->lastposter, $groupadmins)} class="groupadmin"
{elseif $topic->lastpostermoderator} class="moderator"
{/if}
>
{$topic->lastposter|display_name|escape}</a>
<br>
<a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}#post{$topic->lastpost}">{$topic->lastposttime}</a>
<a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}#post{$topic->lastpost}">{$topic->lastposttime}</a> {str tag=by section=view}
<a href="{$WWWROOT}user/view.php?id={$topic->lastposter}" {if in_array($topic->lastposter, $groupadmins)} class="groupadmin"{elseif $topic->lastpostermoderator} class="moderator"{/if}>{$topic->lastposter|display_name|escape}</a>
{/if}
</td>
{if $moderator}
......
......@@ -3,8 +3,8 @@
<h2>{$subheading|escape}</h2>
<div class="rbuttons pagetabs">
{if $admin}
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id|escape}" class="btn-edit s" id="btn-editforum">{str tag="edittitle" section="interaction.forum"}</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id|escape}" class="btn-del s" id="btn-deleteforum">{str tag="deleteforum" section="interaction.forum"}</a>
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id|escape}" class="btn-edit s">{str tag="edittitle" section="interaction.forum"}</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id|escape}" class="btn-del s">{str tag="deleteforum" section="interaction.forum"}</a>
{/if}
{$forum->subscribe}
</div>
......@@ -12,24 +12,10 @@
<div id="viewforum" class="rel">
<h3>{str tag=Topics section="interaction.forum"}</h3>
{if $membership}
<div class="rbuttons">
<div class="rbuttons">
<a href="{$WWWROOT}interaction/forum/edittopic.php?forum={$forum->id|escape}" class="btn-add s">{str tag="newtopic" section="interaction.forum}</a>
</div>
{/if}
<label>{str tag="groupadminlist" section="interaction.forum"}</label>
{foreach name=groupadmins from=$groupadmins item=groupadmin}<a href="{$WWWROOT}user/view.php?id={$groupadmin}" class="groupadmin s">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$groupadmin}" alt="">
{$groupadmin|display_name|escape}</a>{if !$smarty.foreach.groupadmins.last}, {/if}{/foreach}
{if $moderators}
<br>
<label>{str tag="moderatorslist" section="interaction.forum"}</label>
{foreach from=$moderators item=mod name=moderators}
<a href="{$WWWROOT}user/view.php?id={$mod}" class="moderator">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$mod}" alt="">
{$mod|display_name|escape}</a>{if !$smarty.foreach.moderators.last}, {/if}
{/foreach}
{/if}
</div>
{if $stickytopics || $regulartopics}
<form action="" method="post">
<table id="forumtopicstable" class="fullwidth">
......@@ -76,15 +62,27 @@
</div>
{/if}
</form>
</div>
<div class="forumkey">
<label>{str tag="Key" section="interaction.forum"}:</label>
<ul id="forumkeylist">
<li><img src="{$closedicon|escape}" alt="{str tag="Closed" section="interaction.forum"}"> {str tag="Closed" section="interaction.forum"}</li>
<li><img src="{$subscribedicon|escape}" alt="{str tag="Subscribed" section="interaction.forum"}"> {str tag="Subscribed" section="interaction.forum"}</li>
<li><span class="groupadmin">{str tag="groupadmins" section="interaction.forum"}</span></li>
<li><span class="moderator">{str tag="Moderators" section="interaction.forum"}</span></li>
</ul>
<div class="cr">
<label>{str tag="groupadminlist" section="interaction.forum"}</label>
{foreach from=$groupadmins item=groupadmin}
<span class="s inlinelist">
<a href="{$WWWROOT}user/view.php?id={$groupadmin}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$groupadmin}" alt=""></a>
<a href="{$WWWROOT}user/view.php?id={$groupadmin}" class="groupadmin">{$groupadmin|display_name|escape}</a>
</span>
{/foreach}
{if $moderators}
<div>
<label>{str tag="moderatorslist" section="interaction.forum"}</label>
{foreach from=$moderators item=mod}
<span class="s inlinelist">
<a href="{$WWWROOT}user/view.php?id={$mod}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$mod}" alt=""></a>
<a href="{$WWWROOT}user/view.php?id={$mod}" class="moderator">{$mod|display_name|escape}</a>
</span>
{/foreach}
</div>
{/if}
</div>
{else}
<p>{str tag="notopics" section="interaction.forum"}</p>
......
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