Empty commit

This commit is contained in:
Git 2011-11-13 08:00:16 +00:00
parent d52648548e
commit c10811666c
4 changed files with 35 additions and 14 deletions

View File

@ -20,7 +20,8 @@
$DB->query('SELECT ag.ArtistID, ag.Name $DB->query('SELECT ag.ArtistID, ag.Name
FROM bookmarks_artists AS ba FROM bookmarks_artists AS ba
INNER JOIN artists_group AS ag ON ba.ArtistID = ag.ArtistID INNER JOIN artists_group AS ag ON ba.ArtistID = ag.ArtistID
WHERE ba.UserID = '.$UserID); WHERE ba.UserID = '.$UserID.'
ORDER BY ag.Name');
$ArtistList = $DB->to_array(); $ArtistList = $DB->to_array();

View File

@ -167,19 +167,39 @@
<div class="head"><strong>Top Contributors</strong></div> <div class="head"><strong>Top Contributors</strong></div>
<table> <table>
<? $VoteMax = ($VoteCount < 5 ? $VoteCount : 5); <? $VoteMax = ($VoteCount < 5 ? $VoteCount : 5);
$ViewerVote = false;
for($i = 0; $i < $VoteMax; $i++) { for($i = 0; $i < $VoteMax; $i++) {
$User = array_shift($RequestVotes['Voters']); $User = array_shift($RequestVotes['Voters']);
$Boldify = false;
if ($User['UserID'] == $LoggedUser['ID']) {
$ViewerVote = true;
$Boldify = true;
}
?> ?>
<tr> <tr>
<td> <td>
<a href="user.php?id=<?=$User['UserID']?>"><?=display_str($User['Username'])?></a> <a href="user.php?id=<?=$User['UserID']?>"><?=$Boldify?'<strong>':''?><?=display_str($User['Username'])?><?=$Boldify?'</strong>':''?></a>
</td> </td>
<td> <td>
<?=get_size($User['Bounty'])?> <?=$Boldify?'<strong>':''?><?=get_size($User['Bounty'])?><?=$Boldify?'</strong>':''?>
</td> </td>
</tr> </tr>
<? } <? }
reset($RequestVotes['Voters']); reset($RequestVotes['Voters']);
if (!$ViewerVote) {
foreach ($RequestVotes['Voters'] as $User) {
if ($User['UserID'] == $LoggedUser['ID']) { ?>
<tr>
<td>
<a href="user.php?id=<?=$User['UserID']?>"><strong><?=display_str($User['Username'])?></strong></a>
</td>
<td>
<strong><?=get_size($User['Bounty'])?></strong>
</td>
</tr>
<? }
}
}
?> ?>
</table> </table>
</div> </div>

View File

@ -447,28 +447,28 @@
</div> </div>
<table id="request_table" cellpadding="6" cellspacing="1" border="0" class="border" width="100%"> <table id="request_table" cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
<tr class="colhead_dark"> <tr class="colhead_dark">
<td style="width: 38%;"> <td style="width: 38%;" class="nobr">
<strong>Request Name</strong> / <a href="?order=year&amp;sort=<?=(($CurrentOrder == 'year') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Year</strong></a> <strong>Request Name</strong> / <a href="?order=year&amp;sort=<?=(($CurrentOrder == 'year') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Year</strong></a>
</td> </td>
<td> <td class="nobr">
<a href="?order=votes&amp;sort=<?=(($CurrentOrder == 'votes') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Votes</strong></a> <a href="?order=votes&amp;sort=<?=(($CurrentOrder == 'votes') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Votes</strong></a>
</td> </td>
<td> <td class="nobr">
<a href="?order=bounty&amp;sort=<?=(($CurrentOrder == 'bounty') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Bounty</strong></a> <a href="?order=bounty&amp;sort=<?=(($CurrentOrder == 'bounty') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Bounty</strong></a>
</td> </td>
<td> <td class="nobr">
<a href="?order=filled&amp;sort=<?=(($CurrentOrder == 'filled') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Filled</strong></a> <a href="?order=filled&amp;sort=<?=(($CurrentOrder == 'filled') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Filled</strong></a>
</td> </td>
<td> <td class="nobr">
<strong>Filled by</strong> <strong>Filled by</strong>
</td> </td>
<td> <td class="nobr">
<strong>Requested by</strong> <strong>Requested by</strong>
</td> </td>
<td> <td class="nobr">
<a href="?order=created&amp;sort=<?=(($CurrentOrder == 'created') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Created</strong></a> <a href="?order=created&amp;sort=<?=(($CurrentOrder == 'created') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Created</strong></a>
</td> </td>
<td> <td class="nobr">
<a href="?order=lastvote&amp;sort=<?=(($CurrentOrder == 'lastvote') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Last Vote</strong></a> <a href="?order=lastvote&amp;sort=<?=(($CurrentOrder == 'lastvote') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Last Vote</strong></a>
</td> </td>
</tr> </tr>
@ -530,7 +530,7 @@
<?=$TagList?> <?=$TagList?>
</div> </div>
</td> </td>
<td> <td class="nobr">
<form id="form_<?=$RequestID?>"> <form id="form_<?=$RequestID?>">
<span id="vote_count_<?=$RequestID?>"><?=$VoteCount?></span> <span id="vote_count_<?=$RequestID?>"><?=$VoteCount?></span>
<? if(!$IsFilled && check_perms('site_vote')){ ?> <? if(!$IsFilled && check_perms('site_vote')){ ?>
@ -540,7 +540,7 @@
</form> </form>
<? } ?> <? } ?>
</td> </td>
<td> <td class="nobr">
<?=get_size($RequestVotes['TotalBounty'])?> <?=get_size($RequestVotes['TotalBounty'])?>
</td> </td>
<td> <td>

View File

@ -7,7 +7,7 @@
<input type="hidden" name="action" value="link" /> <input type="hidden" name="action" value="link" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" /> <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<div> <div>
<p>Paste a wiki link into the box bellow to link this search string or article name to the appropriate article.</p> <p>Paste a wiki link into the box below to link this search string or article name to the appropriate article.</p>
<strong>Link </strong> <input type="text" name="alias" size="20" value="<?=display_str($Alias->convert($_GET['alias']))?>" /> <strong>Link </strong> <input type="text" name="alias" size="20" value="<?=display_str($Alias->convert($_GET['alias']))?>" />
to <strong>URL</strong> <input type="text" name="url" size="50" maxlength="150" /> to <strong>URL</strong> <input type="text" name="url" size="50" maxlength="150" />
<input type="submit" value="Submit" /> <input type="submit" value="Submit" />