Empty commit

This commit is contained in:
Git 2013-06-08 08:01:02 +00:00
parent cae775e7e2
commit 0c8d35eec1
11 changed files with 1135 additions and 1125 deletions

View File

@ -44,9 +44,7 @@
ob_start(); ob_start();
?> ?>
<tr> <tr>
<td> <td><a href="artist.php?id=<?=$Artist['ArtistID']?>"><?=$Artist['Name']?></a></td>
<a href="artist.php?id=<?=$Artist['ArtistID']?>"><?=$Artist['Name']?></a>
</td>
</tr> </tr>
<? <?
$ArtistTable.= ob_get_clean(); $ArtistTable.= ob_get_clean();
@ -72,7 +70,7 @@
} }
// Silly hack for people who are on the old setting // Silly hack for people who are on the old setting
$CollageCovers = isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1)); $CollageCovers = (isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1)));
$CollagePages = array(); $CollagePages = array();
// Pad it out // Pad it out

View File

@ -88,7 +88,7 @@
if ($GroupVanityHouse) { if ($GroupVanityHouse) {
$DisplayName .= ' [<abbr title="This is a Vanity House release">VH</abbr>]'; $DisplayName .= ' [<abbr title="This is a Vanity House release">VH</abbr>]';
} }
$SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : ''; $SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : '');
// Start an output buffer, so we can store this output in $TorrentTable // Start an output buffer, so we can store this output in $TorrentTable
ob_start(); ob_start();
@ -107,12 +107,14 @@
</td> </td>
<td colspan="5"> <td colspan="5">
<strong><?=$DisplayName?></strong> <strong><?=$DisplayName?></strong>
<? if (Bookmarks::has_bookmarked('torrent', $GroupID)) { <? // PHP start tag is indented for proper formatting of generated HTML
if (Bookmarks::has_bookmarked('torrent', $GroupID)) {
echo "<a style = \"float: right;\" href=\"#\" id=\"bookmarklink_torrent_$GroupID\" class=\"remove_bookmark brackets\" title=\"Unbookmark\" onclick=\"Unbookmark('torrent',$GroupID,'Bookmark');return false;\">Unbookmark</a>"; echo "<a style = \"float: right;\" href=\"#\" id=\"bookmarklink_torrent_$GroupID\" class=\"remove_bookmark brackets\" title=\"Unbookmark\" onclick=\"Unbookmark('torrent',$GroupID,'Bookmark');return false;\">Unbookmark</a>";
} else { } else {
echo "<a style = \"float: right;\" href=\"#\" id=\"bookmarklink_torrent_$GroupID\" class=\"add_bookmark brackets\" title=\"Bookmark\" onclick=\"Bookmark('torrent',$GroupID,'Unbookmark');return false;\">Bookmark</a>"; echo "<a style = \"float: right;\" href=\"#\" id=\"bookmarklink_torrent_$GroupID\" class=\"add_bookmark brackets\" title=\"Bookmark\" onclick=\"Bookmark('torrent',$GroupID,'Unbookmark');return false;\">Bookmark</a>";
} ?> }
<?Votes::vote_link($GroupID,$UserVotes[$GroupID]['Type']);?> echo "\n";
echo Votes::vote_link($GroupID, $UserVotes[$GroupID]['Type']); ?>
<div class="tags"><?=$TorrentTags->format()?></div> <div class="tags"><?=$TorrentTags->format()?></div>
</td> </td>
</tr> </tr>
@ -131,7 +133,7 @@
if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) { if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) {
$FirstUnknown = !isset($FirstUnknown); $FirstUnknown = !isset($FirstUnknown);
} }
$SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : ''; $SnatchedTorrentClass = ($Torrent['IsSnatched'] ? ' snatched_torrent' : '');
if ($Torrent['RemasterTitle'] != $LastRemasterTitle || $Torrent['RemasterYear'] != $LastRemasterYear || if ($Torrent['RemasterTitle'] != $LastRemasterTitle || $Torrent['RemasterYear'] != $LastRemasterYear ||
$Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $FirstUnknown || $Torrent['Media'] != $LastMedia) { $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $FirstUnknown || $Torrent['Media'] != $LastMedia) {
@ -161,7 +163,7 @@
</td> </td>
<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td> <td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
<td><?=number_format($Torrent['Snatched'])?></td> <td><?=number_format($Torrent['Snatched'])?></td>
<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td> <td<?=(($Torrent['Seeders'] == 0) ? ' class="r00"' : '')?>><?=number_format($Torrent['Seeders'])?></td>
<td><?=number_format($Torrent['Leechers'])?></td> <td><?=number_format($Torrent['Leechers'])?></td>
</tr> </tr>
<? <?
@ -183,7 +185,7 @@
} elseif ($Torrent['PersonalFL']) { } elseif ($Torrent['PersonalFL']) {
$DisplayName .= ' ' . Format::torrent_label('Personal Freeleech!'); $DisplayName .= ' ' . Format::torrent_label('Personal Freeleech!');
} }
$SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : ''; $SnatchedTorrentClass = ($Torrent['IsSnatched'] ? ' snatched_torrent' : '');
?> ?>
<tr class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>" id="group_<?=$GroupID?>"> <tr class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>" id="group_<?=$GroupID?>">
<td></td> <td></td>
@ -199,12 +201,13 @@
<? } ?> <? } ?>
| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a> | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a>
</span> </span>
<strong><?=$DisplayName?></strong> <?Votes::vote_link($GroupID,$UserVotes[$GroupID]['Type']);?> <strong><?=$DisplayName?></strong>
<? Votes::vote_link($GroupID, $UserVotes[$GroupID]['Type']); ?>
<div class="tags"><?=$TorrentTags->format()?></div> <div class="tags"><?=$TorrentTags->format()?></div>
</td> </td>
<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td> <td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
<td><?=number_format($Torrent['Snatched'])?></td> <td><?=number_format($Torrent['Snatched'])?></td>
<td<?=($Torrent['Seeders'] == 0) ? ' class="r00"' : '' ?>><?=number_format($Torrent['Seeders'])?></td> <td<?=(($Torrent['Seeders'] == 0) ? ' class="r00"' : '')?>><?=number_format($Torrent['Seeders'])?></td>
<td><?=number_format($Torrent['Leechers'])?></td> <td><?=number_format($Torrent['Leechers'])?></td>
</tr> </tr>
<? <?
@ -247,7 +250,7 @@
} }
// Silly hack for people who are on the old setting // Silly hack for people who are on the old setting
$CollageCovers = isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1)); $CollageCovers = (isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1)));
$CollagePages = array(); $CollagePages = array();
// Pad it out // Pad it out
@ -341,7 +344,7 @@
</li> </li>
<? } ?> <? } ?>
</ul> </ul>
<select id="formats" style="width:180px"> <select id="formats" style="width: 180px;">
<? <?
$OpenGroup = false; $OpenGroup = false;
$LastGroupID = -1; $LastGroupID = -1;

View File

@ -22,7 +22,7 @@
<div class="center pad"> <div class="center pad">
<?=Artists::display_artists($Artists, true, true)?><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>"><?=$FeaturedAlbum['Name']?></a> <?=Artists::display_artists($Artists, true, true)?><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>"><?=$FeaturedAlbum['Name']?></a>
</div> </div>
<div class="center"> <div class="center pad">
<a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>" title="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>"> <a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>" title="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>">
<img src="<?=ImageTools::process($FeaturedAlbum['WikiImage'], true)?>" alt="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>" width="100%" /> <img src="<?=ImageTools::process($FeaturedAlbum['WikiImage'], true)?>" alt="<?=Artists::display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>" width="100%" />
</a> </a>

View File

@ -19,7 +19,7 @@
<div class="head colhead_dark"> <div class="head colhead_dark">
<strong>Featured Product</strong> <strong>Featured Product</strong>
</div> </div>
<div class="center"> <div class="center pad">
<a href="http://anonym.to/?<?=$FeaturedMerchURL . $FeaturedMerch['ProductID']?>"><img src="<?=ImageTools::process($FeaturedMerch['Image'])?>" width="100%" alt="Featured Product Image" /></a> <a href="http://anonym.to/?<?=$FeaturedMerchURL . $FeaturedMerch['ProductID']?>"><img src="<?=ImageTools::process($FeaturedMerch['Image'])?>" width="100%" alt="Featured Product Image" /></a>
</div> </div>
<div class="center pad"> <div class="center pad">
@ -35,7 +35,7 @@
<div class="head colhead_dark"> <div class="head colhead_dark">
<strong>It's a mystery!</strong> <strong>It's a mystery!</strong>
</div> </div>
<div class="center"> <div class="center pad">
You may want to put an image here. You may want to put an image here.
</div> </div>
</div> </div>

View File

@ -161,9 +161,9 @@ function compare($X, $Y) {
$Index = 0; $Index = 0;
?> ?>
<div id="covers"> <div id="covers">
<div id="cover_div_<?=$Index?>"> <div id="cover_div_<?=$Index?>" class="pad">
<? if ($WikiImage != '') { ?> <? if ($WikiImage != '') { ?>
<p align="center"><img style="max-width: 220px;" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$AltName?>" onclick="lightbox.init('<?=ImageTools::process($WikiImage)?>',220);" /></p> <p align="center"><img width="100%" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$AltName?>" onclick="lightbox.init('<?=ImageTools::process($WikiImage)?>',220);" /></p>
<? } else { ?> <? } else { ?>
<p align="center"><img src="<?=STATIC_SERVER?>common/noartwork/<?=$CategoryIcons[$GroupCategoryID - 1]?>" alt="<?=$Categories[$GroupCategoryID - 1]?>" title="<?=$Categories[$GroupCategoryID - 1]?>" width="220" height="220" border="0" /></p> <p align="center"><img src="<?=STATIC_SERVER?>common/noartwork/<?=$CategoryIcons[$GroupCategoryID - 1]?>" alt="<?=$Categories[$GroupCategoryID - 1]?>" title="<?=$Categories[$GroupCategoryID - 1]?>" width="220" height="220" border="0" /></p>
<? <?
@ -174,7 +174,7 @@ function compare($X, $Y) {
<? foreach ($CoverArt as $Cover) { <? foreach ($CoverArt as $Cover) {
list($ImageID, $Image, $Summary, $AddedBy) = $Cover; list($ImageID, $Image, $Summary, $AddedBy) = $Cover;
?> ?>
<div id="cover_div_<?=$Index?>" <?=(empty($LoggedUser['ShowExtraCovers']) ? 'style="display: none;"' : '')?>> <div id="cover_div_<?=$Index?>" class="pad" <?=(empty($LoggedUser['ShowExtraCovers']) ? 'style="display: none;"' : '')?>>
<p align="center"> <p align="center">
<? if (empty($LoggedUser['ShowExtraCovers'])) { <? if (empty($LoggedUser['ShowExtraCovers'])) {
$Src = 'src="" data-gazelle-temp-src="' . ImageTools::process($Image, true) . '"'; $Src = 'src="" data-gazelle-temp-src="' . ImageTools::process($Image, true) . '"';
@ -182,7 +182,7 @@ function compare($X, $Y) {
$Src = 'src="' . ImageTools::process($Image, true) . '"'; $Src = 'src="' . ImageTools::process($Image, true) . '"';
} }
?> ?>
<img id="cover_<?=$Index?>" style="max-width: 220px;" <?=$Src?> alt="<?=$Summary?>" onclick="lightbox.init('<?=ImageTools::process($Image)?>',220);" /> <img id="cover_<?=$Index?>" width="100%" <?=$Src?> alt="<?=$Summary?>" onclick="lightbox.init('<?=ImageTools::process($Image)?>',220);" />
</p> </p>
<ul class="stats nobullet"> <ul class="stats nobullet">
<li> <li>

View File

@ -512,14 +512,15 @@ function header_link($SortKey,$DefaultWay="DESC") {
[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download">DL</a> [ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download">DL</a>
| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a> ] | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" title="Report">RP</a> ]
</span> </span>
<?=$DisplayName?> <?Votes::vote_link($GroupID,$UserVotes[$GroupID]['Type']);?> <? echo "$DisplayName\n"; ?>
<? Votes::vote_link($GroupID,$UserVotes[$GroupID]['Type']); ?>
<div class="tags"><?=$TorrentTags->format('torrents.php?type='.$Action.'&amp;userid='.$UserID.'&amp;tags=')?></div> <div class="tags"><?=$TorrentTags->format('torrents.php?type='.$Action.'&amp;userid='.$UserID.'&amp;tags=')?></div>
</div> </div>
</td> </td>
<td class="nobr"><?=time_diff($Time,1)?></td> <td class="nobr"><?=time_diff($Time,1)?></td>
<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td> <td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
<td><?=number_format($Torrent['Snatched'])?></td> <td><?=number_format($Torrent['Snatched'])?></td>
<td<?=($Torrent['Seeders'] == 0) ? ' class="r00"' : ''?>><?=number_format($Torrent['Seeders'])?></td> <td<?=(($Torrent['Seeders'] == 0) ? ' class="r00"' : '')?>><?=number_format($Torrent['Seeders'])?></td>
<td><?=number_format($Torrent['Leechers'])?></td> <td><?=number_format($Torrent['Leechers'])?></td>
</tr> </tr>
<? }?> <? }?>

View File

@ -475,6 +475,14 @@ p.min_padding {
padding: 1em; padding: 1em;
} }
.sidebar .pad {
padding: 4px;
}
#index .sidebar .pad {
padding: 9px;
}
.vertical_space { .vertical_space {
margin-bottom: 10px; margin-bottom: 10px;
} }

View File

@ -511,6 +511,10 @@ p.min_padding {
padding: 1em; padding: 1em;
} }
.sidebar .pad {
padding: 10px;
}
.vertical_space { .vertical_space {
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -535,10 +539,6 @@ p.min_padding {
margin: 0px 5px 10px 5px; margin: 0px 5px 10px 5px;
} }
.sidebar .box img {
margin: 10px 5px 10px 5px;
}
.body { .body {
padding: 3px 10px 10px 10px; padding: 3px 10px 10px 10px;
} }