baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2025-02-18 11:56:41 +00:00
Code Issues Actions Packages Releases Activity

fix(web): right column width

Browse Source
This commit is contained in:
Baoshuo Ren 2022-10-19 11:57:06 +08:00
parent 54b8415cf5
commit 318e618499
Signed by: baoshuo
GPG Key ID: 00CB9680AB29F51A
16 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/app/controllers/add_contest.php
View File

@ -7,10 +7,7 @@
become403Page(); become403Page();
} }
if (!isset($_COOKIE['bootstrap4'])) { requireLib('bootstrap5');
$REQUIRE_LIB['bootstrap5'] = '';
}
requirePHPLib('form'); requirePHPLib('form');
if (!isSuperUser($myUser)) { if (!isSuperUser($myUser)) {
@ -59,39 +56,28 @@
?> ?>
<?php echoUOJPageHeader('添加比赛') ?> <?php echoUOJPageHeader('添加比赛') ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<div class="row"> <div class="row">
<div class="col-lg-9"> <div class="col-lg-9">
<?php endif ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<div class="card card-default mb-2"> <div class="card card-default mb-2">
<div class="card-body"> <div class="card-body">
<?php endif ?>
<h1 class="page-header <h1 class="h2 card-title">添加比赛</h1>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
h2 card-title
<?php endif ?>
">添加比赛</h1>
<div class="w-full" style="max-width: 400px"> <div class="w-full" style="max-width: 400px">
<?php $time_form->printHTML(); ?> <?php $time_form->printHTML(); ?>
</div> </div>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div> </div>
</div> </div>
<?php endif ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div>
<aside class="col mt-3 mt-lg-0"> </div>
<!-- right col -->
<aside class="col-lg-3 mt-3 mt-lg-0">
<?php uojIncludeView('sidebar', array()) ?> <?php uojIncludeView('sidebar', array()) ?>
</aside> </aside>
</div> </div>
<?php endif ?>
<?php echoUOJPageFooter() ?> <?php echoUOJPageFooter() ?>

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

@ -73,7 +73,7 @@ EOD;
<!-- end left col --> <!-- end left col -->
<!-- right col --> <!-- right col -->
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<?php uojIncludeView('sidebar', array()) ?> <?php uojIncludeView('sidebar', array()) ?>
</aside> </aside>
<!-- end right col --> <!-- end right col -->

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

@ -88,7 +88,7 @@ EOD;
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?> <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div> </div>
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<?php uojIncludeView('sidebar', array()) ?> <?php uojIncludeView('sidebar', array()) ?>
</aside> </aside>

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

@ -178,7 +178,7 @@
?> ?>
<?php echoUOJPageHeader(HTML::stripTags($contest['name']) . ' - ' . UOJLocale::get('contests::contest registrants')) ?> <?php echoUOJPageHeader(HTML::stripTags($contest['name']) . ' - ' . UOJLocale::get('contests::contest registrants')) ?>
<h1 class="text-center"><?= $contest['name'] ?></h1> <h1 class="h2 text-center"><?= $contest['name'] ?></h1>
<?php if ($contest['cur_progress'] == CONTEST_NOT_STARTED): ?> <?php if ($contest['cur_progress'] == CONTEST_NOT_STARTED): ?>
<?php if ($iHasRegistered): ?> <?php if ($iHasRegistered): ?>
<div class="row"> <div class="row">

21
web/app/controllers/faq.php
View File

@ -1,10 +1,15 @@
<?php <?php
requireLib('shjs'); requireLib('bootstrap5');
requireLib('hljs');
requireLib('mathjax'); requireLib('mathjax');
$REQUIRE_LIB['bootstrap5'] = '';
?> ?>
<?php echoUOJPageHeader(UOJLocale::get('help')) ?> <?php echoUOJPageHeader(UOJLocale::get('help')) ?>
<div class="row">
<!-- left col -->
<div class="col-lg-9">
<div class="card card-default"> <div class="card card-default">
<article class="card-body"> <article class="card-body">
<h1 class="h3 card-title mb-3">常见问题及其解答 (FAQ)</h1> <h1 class="h3 card-title mb-3">常见问题及其解答 (FAQ)</h1>
@ -102,4 +107,14 @@
</article> </article>
</div> </div>
<!-- end left col -->
</div>
<!-- right col -->
<aside class="col-lg-3 mt-3 mt-lg-0">
<?php uojIncludeView('sidebar', array()) ?>
</aside>
</div>
<?php echoUOJPageFooter() ?> <?php echoUOJPageFooter() ?>

5
web/app/controllers/group.php
View File

@ -178,10 +178,11 @@
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?> <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<!-- end left col -->
</div> </div>
<aside class="col mt-3 mt-lg-0"> <!-- right col -->
<aside class="col-lg-3 mt-3 mt-lg-0">
<?php uojIncludeView('sidebar', array()); ?> <?php uojIncludeView('sidebar', array()); ?>
</aside> </aside>

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

@ -120,7 +120,7 @@
<!-- end left col --> <!-- end left col -->
</div> </div>
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<!-- right col --> <!-- right col -->
<?php uojIncludeView('sidebar', ['assignments_hidden' => true]); ?> <?php uojIncludeView('sidebar', ['assignments_hidden' => true]); ?>

8
web/app/controllers/groups.php
View File

@ -120,12 +120,12 @@ EOD;
?> ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?> <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<!-- end left col -->
</div> </div>
<aside class="col mt-3 mt-lg-0"> <!-- right col -->
<?php <aside class="col-lg-3 mt-3 mt-lg-0">
uojIncludeView('sidebar', array()); <?php uojIncludeView('sidebar', array()); ?>
?>
</aside> </aside>
</div> </div>

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

@ -411,7 +411,7 @@ $('#contest-countdown').countdown(<?= $contest['end_time']->getTimestamp() - UOJ
</div> </div>
<!-- End left col --> <!-- End left col -->
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<!-- Right col --> <!-- Right col -->
<?php if ($contest): ?> <?php if ($contest): ?>

5
web/app/controllers/problem_list.php
View File

@ -305,9 +305,8 @@ $('#input-show_difficulty').click(function() {
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?> <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div> </div>
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<?php uojIncludeView('sidebar'); ?>
<?php uojIncludeView('sidebar', array()); ?>
</aside> </aside>
</div> </div>

6
web/app/controllers/problem_lists.php
View File

@ -155,10 +155,8 @@ EOD;
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?> <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
</div> </div>
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<?php <?php uojIncludeView('sidebar', array()) ?>
uojIncludeView('sidebar', array());
?>
</aside> </aside>
</div> </div>

4
web/app/controllers/problem_managers_manage.php
View File

@ -152,9 +152,11 @@ table-hover
<?php endif ?> <?php endif ?>
<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?> <?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
<!-- end left col -->
</div> </div>
<aside class="col mt-3 mt-lg-0"> <!-- right col -->
<aside class="col-lg-3 mt-3 mt-lg-0">
<div class="card card-default mb-2"> <div class="card card-default mb-2">
<ul class="nav nav-pills nav-fill flex-column" role="tablist"> <ul class="nav nav-pills nav-fill flex-column" role="tablist">

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

@ -273,7 +273,7 @@ $('#input-show_difficulty').click(function() {
<!-- end left col --> <!-- end left col -->
<!-- right col --> <!-- right col -->
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<!-- search bar --> <!-- search bar -->
<form method="get" class="mb-3" id="form-problem_search"> <form method="get" class="mb-3" id="form-problem_search">

9
web/app/controllers/problem_solutions.php
View File

@ -1,9 +1,8 @@
<?php <?php
requireLib('bootstrap5');
requirePHPLib('form'); requirePHPLib('form');
requirePHPLib('judger'); requirePHPLib('judger');
$REQUIRE_LIB['bootstrap5'] = '';
if (!Auth::check() && UOJConfig::$data['switch']['force-login']) { if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
redirectToLogin(); redirectToLogin();
} }
@ -237,15 +236,13 @@ EOD;
</div> </div>
<!-- Pagination --> <!-- Pagination -->
<div class="text-center"> <?= $pag->pagination() ?>
<?= $pag->pagination(); ?>
</div>
<!-- End left col --> <!-- End left col -->
</div> </div>
<!-- Right col --> <!-- Right col -->
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<div class="card card-default mb-2"> <div class="card card-default mb-2">
<ul class="nav nav-pills nav-fill flex-column" role="tablist"> <ul class="nav nav-pills nav-fill flex-column" role="tablist">

5
web/app/controllers/problem_statement_manage.php
View File

@ -1,4 +1,5 @@
<?php <?php
requireLib('bootstrap5');
requirePHPLib('form'); requirePHPLib('form');
if (!Auth::check() && UOJConfig::$data['switch']['force-login']) { if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
@ -12,8 +13,6 @@
become403Page(); become403Page();
} }
requireLib('bootstrap5');
$problem_content = queryProblemContent($problem['id']); $problem_content = queryProblemContent($problem['id']);
$problem_tags = queryProblemTags($problem['id']); $problem_tags = queryProblemTags($problem['id']);
@ -104,7 +103,7 @@
</div> </div>
<!-- right col --> <!-- right col -->
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<div class="card card-default mb-2"> <div class="card card-default mb-2">
<ul class="nav nav-pills nav-fill flex-column" role="tablist"> <ul class="nav nav-pills nav-fill flex-column" role="tablist">

13
web/app/controllers/problem_statistics.php
View File

@ -1,4 +1,7 @@
<?php <?php
requireLib('bootstrap5');
requireLib('morris');
if (!Auth::check() && UOJConfig::$data['switch']['force-login']) { if (!Auth::check() && UOJConfig::$data['switch']['force-login']) {
redirectToLogin(); redirectToLogin();
} }
@ -7,8 +10,6 @@
become404Page(); become404Page();
} }
requireLib('bootstrap5');
$contest = validateUInt($_GET['contest_id']) ? queryContest($_GET['contest_id']) : null; $contest = validateUInt($_GET['contest_id']) ? queryContest($_GET['contest_id']) : null;
if ($contest != null) { if ($contest != null) {
genMoreContestInfo($contest); genMoreContestInfo($contest);
@ -71,12 +72,12 @@
$submissions_sort_by_choice = !isset($_COOKIE['submissions-sort-by-code-length']) ? 'time' : 'tot_size'; $submissions_sort_by_choice = !isset($_COOKIE['submissions-sort-by-code-length']) ? 'time' : 'tot_size';
?> ?>
<?php
$REQUIRE_LIB['morris'] = "";
?>
<?php echoUOJPageHeader(HTML::stripTags($problem['title']) . ' - ' . UOJLocale::get('problems::statistics')) ?> <?php echoUOJPageHeader(HTML::stripTags($problem['title']) . ' - ' . UOJLocale::get('problems::statistics')) ?>
<div class="row"> <div class="row">
<!-- left col -->
<div class="col-lg-9"> <div class="col-lg-9">
<?php if ($contest): ?> <?php if ($contest): ?>
@ -263,7 +264,7 @@ new Morris.Line({
</div> </div>
<!-- Right col --> <!-- Right col -->
<aside class="col mt-3 mt-lg-0"> <aside class="col-lg-3 mt-3 mt-lg-0">
<?php if ($contest): ?> <?php if ($contest): ?>
<!-- Contest card --> <!-- Contest card -->