baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-22 13:28:41 +00:00
Code Issues Actions Packages Releases Activity

refactor: problem_set with bs5
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Baoshuo Ren 2022-09-24 10:18:55 +08:00
parent ebb418caf6
commit e334a2ad8a
Signed by: baoshuo
GPG Key ID: 00CB9680AB29F51A
7 changed files with 144 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/controllers/index.php
View File

@ -3,7 +3,7 @@
$countdowns = DB::selectAll("select * from countdowns order by endtime asc");
$friend_links = DB::selectAll("select * from friend_links order by level desc, id asc");
if (!isset($_COOKIE['bootstrap4'])){
if (!isset($_COOKIE['bootstrap4'])) {
$REQUIRE_LIB['bootstrap5'] = '';
}
?>

112
web/app/controllers/problem_set.php
View File

@ -11,6 +11,10 @@
become403Page();
}
if (!isset($_COOKIE['bootstrap4'])) {
$REQUIRE_LIB['bootstrap5'] = '';
}
if (isSuperUser($myUser) || isProblemManager($myUser) || isProblemUploader($myUser)) {
$new_problem_form = new UOJForm('new_problem');
$new_problem_form->handle = function() {
@ -30,7 +34,8 @@
}
function echoProblem($problem) {
global $myUser;
global $myUser, $REQUIRE_LIB;
if (isProblemVisibleToUser($problem, $myUser)) {
echo '<tr class="text-center">';
if ($problem['submission_id']) {
@ -39,27 +44,47 @@
echo '<td>';
}
echo '#', $problem['id'], '</td>';
echo '<td class="text-left">';
if (isset($REQUIRE_LIB['bootstrap5'])) {
echo '<td class="text-start">';
} else {
echo '<td class="text-left">';
}
if ($problem['is_hidden']) {
echo ' <span class="text-danger">[隐藏]</span> ';
}
if ($problem['uploader'] == $myUser['username']) {
echo ' <span class="text-info">[我的题目]</span> ';
}
echo '<a href="/problem/', $problem['id'], '">', $problem['title'], '</a>';
echo '<a ';
if (isset($REQUIRE_LIB['bootstrap5'])) {
echo ' class="text-decoration-none" ';
}
echo ' href="/problem/', $problem['id'], '">', $problem['title'], '</a>';
if (isset($_COOKIE['show_tags_mode'])) {
echo ' <span class="text-info" style="font-size: 10px">' . $problem["uploader"] . '</span> ';
foreach (queryProblemTags($problem['id']) as $tag) {
echo '<a class="uoj-problem-tag">', '<span class="badge badge-pill badge-secondary">', HTML::escape($tag), '</span>', '</a>';
if (isset($REQUIRE_LIB['bootstrap5'])) {
echo '<a class="uoj-problem-tag my-1">';
echo '<span class="badge bg-secondary">';
} else {
echo '<a class="uoj-problem-tag">';
echo '<span class="badge badge-pill badge-secondary">';
}
echo HTML::escape($tag), '</span>';
echo '</a> ';
}
}
echo '</td>';
if (isset($_COOKIE['show_submit_mode'])) {
$a_class = '';
if (isset($REQUIRE_LIB['bootstrap5'])) {
$a_class .= ' text-decoration-none ';
}
$perc = $problem['submit_num'] > 0 ? round(100 * $problem['ac_num'] / $problem['submit_num']) : 0;
echo <<<EOD
<td><a href="/submissions?problem_id={$problem['id']}&min_score=100&max_score=100">&times;{$problem['ac_num']}</a></td>
<td><a href="/submissions?problem_id={$problem['id']}">&times;{$problem['submit_num']}</a></td>
<td><a class="{$a_class}" href="/submissions?problem_id={$problem['id']}&min_score=100&max_score=100">&times;{$problem['ac_num']}</a></td>
<td><a class="{$a_class}" href="/submissions?problem_id={$problem['id']}">&times;{$problem['submit_num']}</a></td>
<td>
<div class="progress bot-buffer-no">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="$perc" aria-valuemin="0" aria-valuemax="100" style="width: $perc%; min-width: 20px;">{$perc}%</div>
@ -125,24 +150,77 @@ EOD;
$pag_config['tail'] = "order by id asc";
$pag = new Paginator($pag_config);
$div_classes = array('table-responsive');
$table_classes = array('table', 'table-bordered', 'table-hover', 'table-striped');
$div_classes = isset($REQUIRE_LIB['bootstrap5'])
? array('card', 'mb-3')
: array('table-responsive');
$table_classes = isset($REQUIRE_LIB['bootstrap5'])
? array('table', 'uoj-problem-list-table', 'mb-0')
: array('table', 'table-bordered', 'table-hover', 'table-striped');
?>
<?php echoUOJPageHeader(UOJLocale::get('problems')) ?>
<?php
if (isSuperUser($myUser) || isProblemManager($myUser) || isProblemUploader($myUser)) {
$new_problem_form->printHTML();
}
?>
<?php if (isSuperUser($myUser) || isProblemManager($myUser) || isProblemUploader($myUser)): ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<div class="text-end">
<?php endif ?>
<?php $new_problem_form->printHTML(); ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div>
<?php endif ?>
<?php endif ?>
<div class="row">
<div class="col-sm-4">
<?= HTML::tablist($tabs_info, $cur_tab, 'nav-pills') ?>
</div>
<div class="col-sm-4 order-sm-9 checkbox text-right">
<label class="checkbox-inline" for="input-show_tags_mode"><input type="checkbox" id="input-show_tags_mode" <?= isset($_COOKIE['show_tags_mode']) ? 'checked="checked" ': ''?>/> <?= UOJLocale::get('problems::show tags') ?></label>
<label class="checkbox-inline" for="input-show_submit_mode"><input type="checkbox" id="input-show_submit_mode" <?= isset($_COOKIE['show_submit_mode']) ? 'checked="checked" ': ''?>/> <?= UOJLocale::get('problems::show statistics') ?></label>
<div class="col-sm-4 order-sm-5
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
text-end p-2
<?php else: ?>
text-right checkbox
<?php endif ?>
">
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<div class="form-check d-inline-block me-2">
<?php else: ?>
<label class="checkbox-inline" for="input-show_tags_mode">
<?php endif ?>
<input type="checkbox" id="input-show_tags_mode"
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
class="form-check-input"
<?php endif ?>
<?= isset($_COOKIE['show_tags_mode']) ? 'checked="checked" ': ''?>
/>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<label class="form-check-label" for="input-show_tags_mode">
<?php endif ?>
<?= UOJLocale::get('problems::show tags') ?>
</label>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div>
<?php endif ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<div class="form-check d-inline-block">
<?php else: ?>
<label class="checkbox-inline" for="input-show_submit_mode">
<?php endif ?>
<input type="checkbox" id="input-show_submit_mode"
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
class="form-check-input"
<?php endif ?>
<?= isset($_COOKIE['show_submit_mode']) ? 'checked="checked" ': ''?>
/>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<label class="form-check-label" for="input-show_submit_mode">
<?php endif ?>
<?= UOJLocale::get('problems::show statistics') ?>
</label>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div>
<?php endif ?>
</div>
<div class="col-sm-4 order-sm-5">
<div class="col-sm-4 order-sm-3">
<?php echo $pag->pagination(); ?>
</div>
</div>

2
web/app/controllers/submissions_list.php
View File

@ -39,7 +39,7 @@
}
if (!isset($_COOKIE['bootstrap4'])){
if (!isset($_COOKIE['bootstrap4'])) {
$REQUIRE_LIB['bootstrap5'] = '';
}
?>

2
web/app/libs/uoj-html-lib.php
View File

@ -63,7 +63,7 @@ function becomeMsgPage($msg, $title = '消息') {
if (UOJContext::isAjax()) {
die($msg);
} else {
if (!isset($_COOKIE['bootstrap4'])){
if (!isset($_COOKIE['bootstrap4'])) {
$REQUIRE_LIB['bootstrap5'] = '';
}

1
web/app/views/page-header.php
View File

@ -91,6 +91,7 @@
<?= HTML::js_src('/js/popper.min.js?v=2019.5.31') ?>
<?= HTML::js_src('/js/bootstrap.min.js?v=2019.5.31') ?>
<?php endif ?>
<script>var isBootstrap5Page = Boolean(<?= isset($REQUIRE_LIB['bootstrap5']) ? 'true' : 'false' ?>);</script>
<!-- Color converter -->
<?= HTML::js_src('/js/color-converter.min.js') ?>

34
web/css/uoj-bs5.css
View File

@ -43,6 +43,40 @@ label {
float: right;
}
.uoj-problem-list-table > tbody > tr:last-child,
.uoj-submissions-table > tbody > tr:last-child {
border-bottom-color: transparent;
}
.uoj-click-zan-block {
display: inline-block;
min-width: 140px;
text-align: left;
}
.uoj-click-zan-up, .uoj-click-zan-down, .uoj-click-zan-cnt {
margin-left: 5px;
margin-right: 5px;
}
.uoj-click-zan-block-cur-up .uoj-click-zan-up {
color: green;
font-weight: 700;
}
.uoj-click-zan-block-cur-down .uoj-click-zan-down {
color: red;
font-weight: 700;
}
.uoj-click-zan-block-cur-down .uoj-click-zan-up, .uoj-click-zan-block-cur-up .uoj-click-zan-down {
color: gray;
}
.uoj-click-zan-block-positive .uoj-click-zan-cnt {
color: green;
}
.uoj-click-zan-block-neutral .uoj-click-zan-cnt {
color: gray;
}
.uoj-click-zan-block-negative .uoj-click-zan-cnt {
color: red;
}

15
web/js/uoj.js
View File

@ -297,15 +297,22 @@ $.fn.click_zan_block = function() {
$(this).addClass('uoj-click-zan-block-negative');
}
var up_icon_html = isBootstrap5Page
? '<i class="bi bi-hand-thumbs-up"></i>'
: '<span class="glyphicon glyphicon-thumbs-up"></span>';
var down_icon_html = isBootstrap5Page
? '<i class="bi bi-hand-thumbs-down"></i>'
: '<span class="glyphicon glyphicon-thumbs-down"></span>';
var node = this;
var up_node = $('<a href="#" class="uoj-click-zan-up"><span class="glyphicon glyphicon-thumbs-up"></span>'+uojLocale('click-zan::good')+'</a>').click(function(e) {
var up_node = $('<a href="#" class="uoj-click-zan-up">'+up_icon_html+uojLocale('click-zan::good')+'</a>').click(function(e) {
e.preventDefault();
click_zan(id, type, 1, node);
});
var down_node = $('<a href="#" class="uoj-click-zan-down"><span class="glyphicon glyphicon-thumbs-down"></span>'+uojLocale('click-zan::bad')+'</a>').click(function(e) {
}).addClass(isBootstrap5Page ? 'text-decoration-none' : '');
var down_node = $('<a href="#" class="uoj-click-zan-down">'+down_icon_html+uojLocale('click-zan::bad')+'</a>').click(function(e) {
e.preventDefault();
click_zan(id, type, -1, node);
});
}).addClass(isBootstrap5Page ? 'text-decoration-none' : '');
$(this)
.append(up_node)