From d1374e99eb168a9255144ed2edd6d5b7a74fcdd6 Mon Sep 17 00:00:00 2001
From: Baoshuo <i@baoshuo.ren>
Date: Fri, 7 Oct 2022 09:13:35 +0800
Subject: [PATCH] feat: move problem sidebar items

---
 web/app/controllers/problem.php               | 40 +++++++++++--------
 .../controllers/problem_managers_manage.php   |  9 +++++
 web/app/controllers/problem_solutions.php     | 29 +++-----------
 .../controllers/problem_statement_manage.php  |  9 +++++
 4 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/web/app/controllers/problem.php b/web/app/controllers/problem.php
index 4657685..a4ca1b1 100644
--- a/web/app/controllers/problem.php
+++ b/web/app/controllers/problem.php
@@ -378,6 +378,14 @@ $('#contest-countdown').countdown(<?= $contest['end_time']->getTimestamp() - UOJ
 			<?php endif ?>
 		</div>
 	</div>
+	<ul class="nav nav-pills nav-fill flex-column" role="tablist">
+		<li class="nav-item text-start">
+			<a class="nav-link" href="/contest/<?= $contest['id'] ?>" role="tab">
+				<i class="bi bi-arrow-90deg-left"></i>
+				<?= UOJLocale::get('contests::back to the contest') ?>
+			</a>
+		</li>
+	</ul>
 	<div class="card-footer bg-transparent">
 		比赛评价：<?= getClickZanBlock('C', $contest['id'], $contest['zan']) ?>
 	</div>
@@ -419,6 +427,18 @@ $('#contest-countdown').countdown(<?= $contest['end_time']->getTimestamp() - UOJ
 			</a>
 		</li>
 		<?php endif ?>
+		<li class="nav-item text-start">
+			<a class="nav-link"
+			<?php if ($contest): ?>
+				href="/contest/<?= $contest['id'] ?>/problem/<?= $problem['id'] ?>/statistics"
+			<?php else: ?>
+				href="/problem/<?= $problem['id'] ?>/statistics"
+			<?php endif ?>
+			>
+				<i class="bi bi-graph-up"></i>
+				<?= UOJLocale::get('problems::statistics') ?>
+			</a>
+		</li>
 		<?php if (hasProblemPermission($myUser, $problem)): ?>
 		<li class="nav-item text-start">
 			<a class="nav-link" href="/problem/<?= $problem['id'] ?>/manage/statement" role="tab">
@@ -427,15 +447,10 @@ $('#contest-countdown').countdown(<?= $contest['end_time']->getTimestamp() - UOJ
 			</a>
 		</li>
 		<?php endif ?>
-		<?php if ($contest): ?>
-		<li class="nav-item text-start">
-			<a class="nav-link" href="/contest/<?= $contest['id'] ?>" role="tab">
-				<i class="bi bi-arrow-90deg-left"></i>
-				<?= UOJLocale::get('contests::back to the contest') ?>
-			</a>
-		</li>
-		<?php endif ?>
 	</ul>
+	<div class="card-footer bg-transparent">
+		评价：<?= getClickZanBlock('P', $problem['id'], $problem['zan']) ?>
+	</div>
 </div>
 
 <div class="card card-default mb-2">
@@ -452,16 +467,7 @@ $('#contest-countdown').countdown(<?= $contest['end_time']->getTimestamp() - UOJ
 				附件下载
 			</a>
 		</li>
-		<li class="nav-item text-start">
-			<a class="nav-link" href="/problem/<?= $problem['id'] ?>/statistics">
-				<i class="bi bi-graph-up"></i>
-				<?= UOJLocale::get('problems::statistics') ?>
-			</a>
-		</li>
 	</ul>
-	<div class="card-footer bg-transparent">
-		评价：<?= getClickZanBlock('P', $problem['id'], $problem['zan']) ?>
-	</div>
 </div>
 
 <?php
diff --git a/web/app/controllers/problem_managers_manage.php b/web/app/controllers/problem_managers_manage.php
index 6951f1c..3c1735c 100644
--- a/web/app/controllers/problem_managers_manage.php
+++ b/web/app/controllers/problem_managers_manage.php
@@ -174,6 +174,12 @@ table-hover
 				<?= UOJLocale::get('problems::solutions') ?>
 			</a>
 		</li>
+		<li class="nav-item text-start">
+			<a class="nav-link" href="/problem/<?= $problem['id'] ?>/statistics">
+				<i class="bi bi-graph-up"></i>
+				<?= UOJLocale::get('problems::statistics') ?>
+			</a>
+		</li>
 		<li class="nav-item text-start">
 			<a class="nav-link active" href="#" role="tab">
 				<i class="bi bi-sliders"></i>
@@ -181,6 +187,9 @@ table-hover
 			</a>
 		</li>
 	</ul>
+	<div class="card-footer bg-transparent">
+		评价：<?= getClickZanBlock('P', $problem['id'], $problem['zan']) ?>
+	</div>
 </div>
 
 <?php uojIncludeView('sidebar', array()) ?>
diff --git a/web/app/controllers/problem_solutions.php b/web/app/controllers/problem_solutions.php
index 8251287..90591e1 100644
--- a/web/app/controllers/problem_solutions.php
+++ b/web/app/controllers/problem_solutions.php
@@ -230,6 +230,12 @@ EOD;
 				<?= UOJLocale::get('problems::solutions') ?>
 			</a>
 		</li>
+		<li class="nav-item text-start">
+			<a class="nav-link" href="/problem/<?= $problem['id'] ?>/statistics">
+				<i class="bi bi-graph-up"></i>
+				<?= UOJLocale::get('problems::statistics') ?>
+			</a>
+		</li>
 		<?php if (hasProblemPermission($myUser, $problem)): ?>
 		<li class="nav-item text-start">
 			<a class="nav-link" href="/problem/<?= $problem['id'] ?>/manage/statement" role="tab">
@@ -239,29 +245,6 @@ EOD;
 		</li>
 		<?php endif ?>
 	</ul>
-</div>
-
-<div class="card card-default mb-2">
-	<ul class="nav nav-fill flex-column">
-		<li class="nav-item text-start">
-			<a class="nav-link" href="<?= HTML::url("/download.php?type=problem&id={$problem['id']}") ?>">
-				<i class="bi bi-hdd-stack"></i>
-				测试数据
-			</a>
-		</li>
-		<li class="nav-item text-start">
-			<a class="nav-link" href="<?= HTML::url("/download.php?type=attachment&id={$problem['id']}") ?>">
-				<i class="bi bi-download"></i>
-				附件下载
-			</a>
-		</li>
-		<li class="nav-item text-start">
-			<a class="nav-link" href="/problem/<?= $problem['id'] ?>/statistics">
-				<i class="bi bi-graph-up"></i>
-				<?= UOJLocale::get('problems::statistics') ?>
-			</a>
-		</li>
-	</ul>
 	<div class="card-footer bg-transparent">
 		评价：<?= getClickZanBlock('P', $problem['id'], $problem['zan']) ?>
 	</div>
diff --git a/web/app/controllers/problem_statement_manage.php b/web/app/controllers/problem_statement_manage.php
index d0bf078..6176d93 100644
--- a/web/app/controllers/problem_statement_manage.php
+++ b/web/app/controllers/problem_statement_manage.php
@@ -150,6 +150,12 @@
 				<?= UOJLocale::get('problems::solutions') ?>
 			</a>
 		</li>
+		<li class="nav-item text-start">
+			<a class="nav-link" href="/problem/<?= $problem['id'] ?>/statistics">
+				<i class="bi bi-graph-up"></i>
+				<?= UOJLocale::get('problems::statistics') ?>
+			</a>
+		</li>
 		<li class="nav-item text-start">
 			<a class="nav-link active" href="#" role="tab">
 				<i class="bi bi-sliders"></i>
@@ -157,6 +163,9 @@
 			</a>
 		</li>
 	</ul>
+	<div class="card-footer bg-transparent">
+		评价：<?= getClickZanBlock('P', $problem['id'], $problem['zan']) ?>
+	</div>
 </div>
 
 <?php uojIncludeView('sidebar', array()) ?>