Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Revert "Web: paginate user/team lists ordered by per-app credit" 

This reverts commit ee3f8f1aa2.
This commit is contained in:
Christian Beer 2017-04-28 07:46:17 +02:00
parent 40b7eb90c5
commit 96109b6f1b
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
html/inc/bootstrap.inc
View File

@ -163,11 +163,9 @@ function sample_navbar(
if (defined('NO_COMPUTING')) { if (defined('NO_COMPUTING')) {
// this is for projects that don't do computing, e.g. BOSSA-based // this is for projects that don't do computing, e.g. BOSSA-based
// //
if (defined('BOSSA')) { navbar_menu(tra("Participate"), array(
navbar_menu(tra("Participate"), array( array(tra("Do work"), $url_prefix."bossa_apps.php"),
array(tra("Do work"), $url_prefix."bossa_apps.php"), ));
));
}
} else { } else {
$x = array( $x = array(
array(tra("Server status"), $url_prefix."server_status.php"), array(tra("Server status"), $url_prefix."server_status.php"),

28
html/user/per_app_list.php
View File

@ -26,8 +26,6 @@
require_once("../inc/util.inc"); require_once("../inc/util.inc");
require_once("../inc/team.inc"); require_once("../inc/team.inc");
$items_per_page = 20;
// return a column title (Average or Total), // return a column title (Average or Total),
// hyperlinked if this is not the current sort column // hyperlinked if this is not the current sort column
// //
@ -46,7 +44,7 @@ function col_title($is_team, $app, $appid, $is_total, $i) {
function show_header($is_team, $apps, $appid, $is_total) { function show_header($is_team, $apps, $appid, $is_total) {
echo "<tr><th colspan=2>&nbsp;</th>"; echo "<tr><th colspan=2>&nbsp;</th>";
foreach ($apps as $app) { foreach ($apps as $app) {
echo "<th colspan=2 class=\"text-center\">$app->name</th>\n"; echo "<th colspan=2>$app->name</th>\n";
} }
echo "</tr>"; echo "</tr>";
@ -55,7 +53,7 @@ function show_header($is_team, $apps, $appid, $is_total) {
foreach ($apps as $app) { foreach ($apps as $app) {
for ($i=0; $i<2; $i++) { for ($i=0; $i<2; $i++) {
$x = col_title($is_team, $app, $appid, $is_total, $i); $x = col_title($is_team, $app, $appid, $is_total, $i);
echo "<th class=\"text-right\">$x</th>\n"; echo "<th>$x</th>\n";
} }
} }
echo "</tr>"; echo "</tr>";
@ -98,8 +96,7 @@ function show_row($item, $apps, $is_team, $i) {
echo "</tr>\n"; echo "</tr>\n";
} }
function show_list($is_team, $appid, $is_total, $offset) { function show_list($is_team, $appid, $is_total) {
global $items_per_page;
$x = $is_team?"teams":"participants"; $x = $is_team?"teams":"participants";
page_head("Top $x by application"); page_head("Top $x by application");
$apps = BoincApp::enum("deprecated=0"); $apps = BoincApp::enum("deprecated=0");
@ -110,34 +107,23 @@ function show_list($is_team, $appid, $is_total, $offset) {
show_header($is_team, $apps, $appid, $is_total); show_header($is_team, $apps, $appid, $is_total);
$x = $is_total?"total":"expavg"; $x = $is_total?"total":"expavg";
if ($is_team) { if ($is_team) {
$items = BoincCreditTeam::enum("appid=$appid order by $x desc limit $offset,$items_per_page"); $items = BoincCreditTeam::enum("appid=$appid order by $x desc");
} else { } else {
$items = BoincCreditUser::enum("appid=$appid order by $x desc limit $offset,$items_per_page"); $items = BoincCreditUser::enum("appid=$appid order by $x desc");
} }
$i = $offset+1; $i = 0;
foreach ($items as $item) { foreach ($items as $item) {
show_row($item, $apps, $is_team, $i); show_row($item, $apps, $is_team, $i);
$i++; $i++;
} }
end_table(); end_table();
if ($offset) {
$n = $offset - $items_per_page;
echo "<a href=\"per_app_list.php?is_team=$is_team&is_total=$is_total&offset=$n\">Previous $items_per_page</a>
&middot;
";
}
$n = $offset + $items_per_page;
echo "<a href=\"per_app_list.php?is_team=$is_team&is_total=$is_total&offset=$n\">Next $items_per_page</a>
";
page_tail(); page_tail();
} }
$is_team = get_int('is_team', true); $is_team = get_int('is_team', true);
$appid = get_int('appid', true); $appid = get_int('appid', true);
$is_total = get_int('is_total', true); $is_total = get_int('is_total', true);
$offset = get_int('offset', true);
if ($offset == null) $offset = 0;
show_list($is_team, $appid, $is_total, $offset); show_list($is_team, $appid, $is_total);
?> ?>