Empty commit

This commit is contained in:
Git 2013-10-09 08:01:03 +00:00
parent f9da7e3cd2
commit 59df8f7927
15 changed files with 89 additions and 48 deletions

View File

@ -452,7 +452,7 @@ public function constant_table($Constants = false) {
<tr> <tr>
<td align="left" class="debug_data debug_constants_data"> <td align="left" class="debug_data debug_constants_data">
<pre> <pre>
<?= display_str(print_r($Constants, true)); echo "\n"; ?> <?= display_str(print_r($Constants, true))?>
</pre> </pre>
</td> </td>
</tr> </tr>
@ -486,7 +486,7 @@ public function cache_table($CacheKeys = false) {
</td> </td>
<td align="left" class="debug_data debug_cache_data"> <td align="left" class="debug_data debug_cache_data">
<pre id="debug_cache_<?=$Key?>" class="hidden"> <pre id="debug_cache_<?=$Key?>" class="hidden">
<?= display_str(print_r(G::$Cache->get_value($Key, true), true)); echo "\n"; ?> <?= display_str(print_r(G::$Cache->get_value($Key, true), true))?>
</pre> </pre>
</td> </td>
</tr> </tr>
@ -622,7 +622,7 @@ public function vars_table($Vars = false) {
</td> </td>
<td class="debug_data debug_loggedvars_data" align="left"> <td class="debug_data debug_loggedvars_data" align="left">
<pre id="debug_loggedvars_<?=$ID?>" class="hidden"> <pre id="debug_loggedvars_<?=$ID?>" class="hidden">
<?= display_str(print_r($Data['data'], true)); echo "\n"; ?> <?= display_str(print_r($Data['data'], true))?>
</pre> </pre>
</td> </td>
</tr> </tr>

View File

@ -5,7 +5,7 @@ class Top10View {
public static function render_linkbox($Selected) { ?> public static function render_linkbox($Selected) { ?>
<div class="linkbox"> <div class="linkbox">
<a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected == "torrents")?></a> <a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected == "torrents")?></a>
<a href="top10.php?type=artists" class="brackets"><?=self::get_selected_link("Artists", $Selected == "artists")?></a> <a href="top10.php?type=lastfm" class="brackets"><?=self::get_selected_link("Last.fm", $Selected == "lastfm")?></a>
<a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected == "users")?></a> <a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected == "users")?></a>
<a href="top10.php?type=tags" class="brackets"><?=self::get_selected_link("Tags", $Selected == "tags")?></a> <a href="top10.php?type=tags" class="brackets"><?=self::get_selected_link("Tags", $Selected == "tags")?></a>
<a href="top10.php?type=votes" class="brackets"><?=self::get_selected_link("Favorites", $Selected == "votes")?></a> <a href="top10.php?type=votes" class="brackets"><?=self::get_selected_link("Favorites", $Selected == "votes")?></a>
@ -15,16 +15,16 @@ public static function render_linkbox($Selected) { ?>
public static function render_artist_links($Selected, $View) { ?> public static function render_artist_links($Selected, $View) { ?>
<div class="center"> <div class="center">
<a href="top10.php?type=artists&amp;category=weekly&amp;view=<?=$View?>" class="brackets"><?=self::get_selected_link("Weekly", $Selected == "weekly")?></a> <a href="top10.php?type=lastfm&amp;category=weekly&amp;view=<?=$View?>" class="brackets tooltip" title="These are the artists with the most Last.fm listeners this week"><?=self::get_selected_link("Weekly Artists", $Selected == "weekly")?></a>
<a href="top10.php?type=artists&amp;category=hyped&amp;view=<?=$View?>" class="brackets"><?=self::get_selected_link("Hyped", $Selected == "hyped")?></a> <a href="top10.php?type=lastfm&amp;category=hyped&amp;view=<?=$View?>" class="brackets tooltip" title="These are the the fastest rising artists on Last.fm this week"><?=self::get_selected_link("Hyped Artists", $Selected == "hyped")?></a>
</div> </div>
<? } <? }
public static function render_artist_controls($Selected, $View) { ?> public static function render_artist_controls($Selected, $View) { ?>
<div class="center"> <div class="center">
<a href="top10.php?type=artists&amp;category=<?=$Selected?>&amp;view=tiles" class="brackets"><?=self::get_selected_link("Tiles", $View == "tiles")?></a> <a href="top10.php?type=lastfm&amp;category=<?=$Selected?>&amp;view=tiles" class="brackets"><?=self::get_selected_link("Tiles", $View == "tiles")?></a>
<a href="top10.php?type=artists&amp;category=<?=$Selected?>&amp;view=list" class="brackets"><?=self::get_selected_link("List", $View == "list")?></a> <a href="top10.php?type=lastfm&amp;category=<?=$Selected?>&amp;view=list" class="brackets"><?=self::get_selected_link("List", $View == "list")?></a>
</div> </div>
<? } <? }

View File

@ -15,10 +15,10 @@ public static function vote_link($GroupID, $Vote = '') {
if (!G::$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?> if (!G::$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?>
<span class="votespan brackets" style="white-space: nowrap;"> <span class="votespan brackets" style="white-space: nowrap;">
Vote: Vote:
<a href="#" onclick="UpVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_upvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="color: green; font-weight: bolder;" title="Upvote">&and;</a> <a href="#" onclick="UpVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_upvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvote">&and;</a>
<span class="tooltip voted_type small_upvoted voted_up_<?=$GroupID?><?=(($Vote == 'Down' || empty($Vote)) ? ' hidden' : '')?>" style="color: green; font-weight: bolder;" title="Upvoted">&and;</span> <span class="tooltip voted_type small_upvoted voted_up_<?=$GroupID?><?=(($Vote == 'Down' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Upvoted">&and;</span>
<a href="#" onclick="DownVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_downvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="color: red; font-weight: bolder;" title="Downvote">&or;</a> <a href="#" onclick="DownVoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_downvote vote_link_<?=$GroupID?><?=(!empty($Vote) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvote">&or;</a>
<span class="tooltip voted_type small_downvoted voted_down_<?=$GroupID?><?=(($Vote == 'Up' || empty($Vote)) ? ' hidden' : '')?>" style="color: red; font-weight: bolder;" title="Downvoted">&or;</span> <span class="tooltip voted_type small_downvoted voted_down_<?=$GroupID?><?=(($Vote == 'Up' || empty($Vote)) ? ' hidden' : '')?>" style="font-weight: bolder;" title="Downvoted">&or;</span>
<a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_clearvote vote_clear_<?=$GroupID?><?=(empty($Vote) ? ' hidden' : '')?>" title="Clear your vote">x</a> <a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=G::$LoggedUser['AuthKey']?>'); return false;" class="tooltip small_clearvote vote_clear_<?=$GroupID?><?=(empty($Vote) ? ' hidden' : '')?>" title="Clear your vote">x</a>
</span> </span>
<? } <? }

View File

@ -24,11 +24,11 @@
?> ?>
<div class="header"> <div class="header">
<h2>Reports v2 Information!</h2> <h2>Reports v2 Information!</h2>
<? include('header.php'); ?> <? include('header.php'); ?>
</div> </div>
<br /> <br />
<div class="box pad thin" style="padding: 0px 0px 0px 20px; width: 70%; margin-left: auto; margin-right: auto;"> <div class="box pad thin reportsv2_views_container">
<table class="layout"><tr><td style="width: 50%;"> <table class="noborder"><tr><td class="noborder" style="width: 50%;">
<? <?
$DB->query(" $DB->query("
SELECT SELECT
@ -42,8 +42,8 @@
ORDER BY Reports DESC"); ORDER BY Reports DESC");
$Results = $DB->to_array(); $Results = $DB->to_array();
?> ?>
<strong>Reports resolved in the last 24 hours</strong> <h3>Reports resolved in the last 24 hours</h3>
<table class="border"> <table class="border reportsv2_views_table">
<tr> <tr>
<td class="head colhead_dark">Username</td> <td class="head colhead_dark">Username</td>
<td class="head colhead_dark">Reports</td> <td class="head colhead_dark">Reports</td>
@ -71,8 +71,8 @@
ORDER BY Reports DESC"); ORDER BY Reports DESC");
$Results = $DB->to_array(); $Results = $DB->to_array();
?> ?>
<strong>Reports resolved in the last week</strong> <h3>Reports resolved in the last week</h3>
<table class="border"> <table class="border reportsv2_views_table">
<tr> <tr>
<td class="head colhead_dark">Username</td> <td class="head colhead_dark">Username</td>
<td class="head colhead_dark">Reports</td> <td class="head colhead_dark">Reports</td>
@ -100,8 +100,8 @@
ORDER BY Reports DESC"); ORDER BY Reports DESC");
$Results = $DB->to_array(); $Results = $DB->to_array();
?> ?>
<strong>Reports resolved in the last month</strong> <h3>Reports resolved in the last month</h3>
<table class="border"> <table class="border reportsv2_views_table">
<tr> <tr>
<td class="head colhead_dark">Username</td> <td class="head colhead_dark">Username</td>
<td class="head colhead_dark">Reports</td> <td class="head colhead_dark">Reports</td>
@ -128,8 +128,8 @@
ORDER BY Reports DESC"); ORDER BY Reports DESC");
$Results = $DB->to_array(); $Results = $DB->to_array();
?> ?>
<strong>Reports resolved since Reports v2 (2009-07-27)</strong> <h3>Reports resolved since Reports v2 (2009-07-27)</h3>
<table class="border"> <table class="border reportsv2_views_table">
<tr> <tr>
<td class="head colhead_dark">Username</td> <td class="head colhead_dark">Username</td>
<td class="head colhead_dark">Reports</td> <td class="head colhead_dark">Reports</td>
@ -208,7 +208,7 @@
<br /><br /> <br /><br />
<strong>For browsing anything more complicated than these, use the search feature.</strong> <strong>For browsing anything more complicated than these, use the search feature.</strong>
</td> </td>
<td style="vertical-align: top;"> <td class="noborder" style="vertical-align: top;">
<? <?
$DB->query(" $DB->query("
SELECT SELECT
@ -222,10 +222,10 @@
$Staff = $DB->to_array(); $Staff = $DB->to_array();
?> ?>
<strong>Currently assigned reports by staff member</strong> <h3>Currently assigned reports by staff member</h3>
<table> <table class="border reportsv2_views_table">
<tr class="colhead"> <tr class="colhead">
<td>Staff member</td> <td>Staff Member</td>
<td>Current Count</td> <td>Current Count</td>
</tr> </tr>
<? <?
@ -252,7 +252,7 @@
$Current = $DB->to_array(); $Current = $DB->to_array();
if (!empty($Current)) { if (!empty($Current)) {
?> ?>
<table> <table class="border reportsv2_views_table">
<tr class="colhead"> <tr class="colhead">
<td>Type</td> <td>Type</td>
<td>Current Count</td> <td>Current Count</td>

View File

@ -32,8 +32,8 @@
case 'donors': case 'donors':
include(SERVER_ROOT.'/sections/top10/donors.php'); include(SERVER_ROOT.'/sections/top10/donors.php');
break; break;
case 'artists': case 'lastfm':
include(SERVER_ROOT.'/sections/top10/artists.php'); include(SERVER_ROOT.'/sections/top10/lastfm.php');
break; break;
default: default:
error(404); error(404);

View File

@ -23,12 +23,12 @@
break; break;
} }
View::show_header("Top Artists", "jquery.imagesloaded,jquery.wookmark,top10", "tiles"); View::show_header("Last.fm", "jquery.imagesloaded,jquery.wookmark,top10", "tiles");
?> ?>
<div class="thin"> <div class="thin">
<div class="header"> <div class="header">
<h2>Top <?=LIMIT?> Artists</h2> <h2>Last.fm</h2>
<? Top10View::render_linkbox("artists"); ?> <? Top10View::render_linkbox("lastfm"); ?>
</div> </div>
<? Top10View::render_artist_links($Category, $View); ?> <? Top10View::render_artist_links($Category, $View); ?>
<? Top10View::render_artist_controls($Category, $View); ?> <? Top10View::render_artist_controls($Category, $View); ?>

View File

@ -851,14 +851,18 @@ div[class~=tooltipster-content] > a {
font-weight: normal; font-weight: normal;
} }
.vote_tag_up, .vote_artist_up, .vote_album_up { .vote_tag_up, .vote_artist_up, .vote_album_up, .small_upvote, .small_upvoted {
color: green; color: green;
} }
.vote_tag_down, .vote_artist_down, .vote_album_down { .vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
color: red; color: red;
} }
.colhead_dark .time { .colhead_dark .time {
font-weight: normal; font-weight: normal;
} }
.reportsv2_views_container {
width: 100%;
}

View File

@ -619,3 +619,13 @@ tr.torrent .bookmark>a:after {
.vote_tag_down, .vote_artist_down, .vote_album_down { .vote_tag_down, .vote_artist_down, .vote_album_down {
font-weight: bolder; font-weight: bolder;
} }
.reportsv2_views_table {
width: 70%;
}
.reportsv2_views_container {
margin-left: auto;
margin-right: auto;
padding: 10px 20px 20px 20px;
}

View File

@ -931,10 +931,14 @@ tr.torrent .bookmark > a:after { color:#999; }
font-weight: normal; font-weight: normal;
} }
.vote_tag_up, .vote_artist_up, .vote_album_up { .vote_tag_up, .vote_artist_up, .vote_album_up, .small_upvote, .small_upvoted {
color: green; color: green;
} }
.vote_tag_down, .vote_artist_down, .vote_album_down { .vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
color: red; color: red;
} }
.reportsv2_views_container {
width: 100%;
}

View File

@ -808,10 +808,14 @@ div[class~=tooltipster-content] > a {
font-weight: normal; font-weight: normal;
} }
.vote_tag_up, .vote_artist_up, .vote_album_up { .vote_tag_up, .vote_artist_up, .vote_album_up, .small_upvote, .small_upvoted {
color: green; color: green;
} }
.vote_tag_down, .vote_artist_down, .vote_album_down { .vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
color: red; color: red;
} }
.reportsv2_views_container {
width: 100%;
}

View File

@ -580,3 +580,7 @@ tr.torrent .bookmark > a:after { content: ""; }
.permission_container:first-child { .permission_container:first-child {
margin-left: 0; margin-left: 0;
} }
.reportsv2_views_container {
width: 100%;
}

View File

@ -1504,3 +1504,7 @@ ul.collage_images {
.top10_quantity_links .brackets:after { .top10_quantity_links .brackets:after {
color: #F1F1F1; color: #F1F1F1;
} }
.reportsv2_views_container {
width: 100%;
}

View File

@ -1105,10 +1105,18 @@ div[class~=tooltipster-content] > a {
margin: 3px 0; margin: 3px 0;
} }
.vote_tag_up, .vote_artist_up, .vote_album_up { .vote_tag_up, .vote_artist_up, .vote_album_up, .small_upvote, .small_upvoted {
color: green; color: green;
} }
.vote_tag_down, .vote_artist_down, .vote_album_down { .vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
color: red; color: red;
} }
.reportsv2_views_table {
width: 100%;
}
.reportsv2_views_container {
width: 100%;
}

View File

@ -4,7 +4,7 @@
} }
html, body { html, body {
height:100%; height: 100%;
} }
body { body {
@ -19,7 +19,7 @@ table {
} }
a { a {
color:#757575; color: #757575;
text-decoration: none; text-decoration: none;
} }
@ -28,11 +28,10 @@ a:hover {
} }
input[type="text"], input[type="password"] { input[type="text"], input[type="password"] {
padding:1px 3px 0px 3px; padding: 1px 3px 0px 3px;
font-family: "tahoma", "arial", "helvetica", "sans-serif"; font-family: "tahoma", "arial", "helvetica", "sans-serif";
font-size: 8pt; font-size: 8pt;
color: #000000; width: 200px;
width:200px;
} }
input[type="text"]:valid, input[type="password"]:valid { input[type="text"]:valid, input[type="password"]:valid {
@ -70,8 +69,8 @@ input[type="text"]:invalid, input[type="password"]:invalid {
} }
#maincontent { #maincontent {
width:100%; width: 100%;
height:88%; height: 88%;
} }
#logo { #logo {

View File

@ -825,3 +825,7 @@ div[class~=tooltipster-base] {
.permission_container:first-child { .permission_container:first-child {
margin-left: 0; margin-left: 0;
} }
.reportsv2_views_container {
width: 90%;
}