Some fix status.php ... +

melongist · melongist · commit 06946dc0d017 · 2020-01-23T21:47:18.000+09:00
fix status view...
+
submitpage realign.

Thank you :)
diff --git a/trunk/web/status-ajax.php b/trunk/web/status-ajax.php
@@ -60,7 +60,7 @@
 			if(isset($_GET['t'])&&"json"==$_GET['t']){
 				echo json_encode($row);
 			}else{
-				echo $row['result'].",".$row['memory'].",".$row['time'].",".$row['judger'].",".($row['pass_rate']*100);
+				echo $row['result'].",".$row['memory']." KB,".$row['time']." ms,".$row['judger'].",".($row['pass_rate']*100);
 			}
 		    }
 		}
diff --git a/trunk/web/status.php b/trunk/web/status.php
@@ -311,8 +311,8 @@
 
 
                 if ($row['result']>=4){
-                        $view_status[$i][4]= "<div id=center class=red>".$row['memory']."</div>";
-                        $view_status[$i][5]= "<div id=center class=red>".$row['time']."</div>";
+                        $view_status[$i][4]= "<div id=center class=red>".$row['memory']." KB</div>";
+                        $view_status[$i][5]= "<div id=center class=red>".$row['time']." ms</div>";
 						//echo "=========".$row['memory']."========";
                 }else{
                         $view_status[$i][4]= "---";
@@ -333,7 +333,7 @@
                         	}
 			}
                 }
-                $view_status[$i][7]= $row['code_length']." B";
+                $view_status[$i][7]= $row['code_length']." bytes";
 				
         }else
 		{
diff --git a/trunk/web/template/ace/status.php b/trunk/web/template/ace/status.php
@@ -103,8 +103,8 @@
 <thead>
 <tr class='toprow' >
 <th ><?php echo $MSG_RUNID?>
-<th ><?php echo $MSG_USER?>
-<th ><?php echo $MSG_PROBLEM?>
+<th ><?php echo $MSG_USER."ID"?>
+<th ><?php echo $MSG_PROBLEM."ID"?>
 <th ><?php echo $MSG_RESULT?>
 <th class='hidden-xs' ><?php echo $MSG_MEMORY?>
 <th class='hidden-xs' ><?php echo $MSG_TIME?>
diff --git a/trunk/web/template/bs/status.php b/trunk/web/template/bs/status.php
@@ -92,8 +92,8 @@
 <thead>
 <tr  class='success toprow' >
 <th ><?php echo $MSG_RUNID?>
-<th ><?php echo $MSG_USER?>
-<th ><?php echo $MSG_PROBLEM?>
+<th ><?php echo $MSG_USER."ID"?>
+<th ><?php echo $MSG_PROBLEM."ID"?>
 <th ><?php echo $MSG_RESULT?>
 <th ><?php echo $MSG_MEMORY?>
 <th ><?php echo $MSG_TIME?>
diff --git a/trunk/web/template/bs3/status.php b/trunk/web/template/bs3/status.php
@@ -106,34 +106,34 @@
 				<table id=result-tab class="table table-striped content-box-header" align=center width=80%>
 					<thead>
 						<tr class='toprow'>
-							<th>
+							<th class="text-center">
 								<?php echo $MSG_RUNID?>
 							</th>
-							<th>
-								<?php echo $MSG_USER?>
+							<th class="text-center">
+								<?php echo $MSG_USER."ID"?>
 							</th>
-							<th>
-								<?php echo $MSG_PROBLEM?>
+							<th class="text-center">
+								<?php echo $MSG_PROBLEM."ID"?>
 							</th>
-							<th>
+							<th class="text-center">
 								<?php echo $MSG_RESULT?>
 							</th>
-							<th class='hidden-xs'>
-								<?php echo $MSG_MEMORY."(KB)"?>
+							<th class="text-center">
+								<?php echo $MSG_MEMORY?>
 							</th>
-							<th class='hidden-xs'>
-								<?php echo $MSG_TIME."(MS)"?>
+							<th class="text-center">
+								<?php echo $MSG_TIME?>
 							</th>
-							<th> 
+							<th class="text-center"> 
 								<?php echo $MSG_LANG?>
 							</th>
-							<th class='hidden-xs'>
+							<th class="text-center">
 								<?php echo $MSG_CODE_LENGTH?>
 							</th>
-							<th>
+							<th class="text-center">
 								<?php echo $MSG_SUBMIT_TIME?>
 							</th>
-							<th class='hidden-xs'>
+							<th class="text-center">
 								<?php echo $MSG_JUDGER?>
 							</th>
 						</tr>
@@ -148,8 +148,8 @@
 								echo "<tr class='evenrow'>";
 							$i = 0;
 							foreach ( $row as $table_cell ) {
-								if ( $i > 3 && $i != 8 && $i!=6)
-									echo "<td class='hidden-xs'>";
+								if ( $i==0 || $i==4 || $i==5 || $i==6 || $i==7)
+									echo "<td class='text-right'>";
 								else
 									echo "<td>";
 								echo $table_cell;
diff --git a/trunk/web/template/bs3/submitpage.php b/trunk/web/template/bs3/submitpage.php
@@ -34,17 +34,18 @@
 <script src="include/checksource.js"></script>
 <form id=frmSolution action="submit.php" method="post" onsubmit='do_submit()'>
 <?php if (isset($id)){?>
-Problem <span class=blue><b><?php echo $id?></b></span>
+<b><br><?php echo $MSG_PROBLEM."ID : "?> <span class=blue><?php echo $id?></b><br></span>
 <input id=problem_id type='hidden' value='<?php echo $id?>' name="id" ><br>
 <?php }else{
 //$PID="ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 //if ($pid>25) $pid=25;
 ?>
-Problem <span class=blue><b><?php echo chr($pid+ord('A'))?></b></span> of Contest <span class=blue><b><?php echo $cid?></b></span><br>
+<b><br><?php echo $MSG_PROBLEM."ID : "?> <span class=blue><b><?php echo chr($pid+ord('A'))?></b><br></span> of Contest <span class=blue><b><?php echo $cid?></b></span><br>
 <input id="cid" type='hidden' value='<?php echo $cid?>' name="cid">
 <input id="pid" type='hidden' value='<?php echo $pid?>' name="pid">
 <?php }?>
-<span id="language_span">Language:
+
+<span id="language_span"><?php echo $MSG_LANG?>:
 <select id="language" name="language" onChange="reloadtemplate($(this).val());" >
 <?php
 $lang_count=count($language_ext);
@@ -63,18 +64,13 @@
 }
 ?>
 </select>
-<?php if($OJ_VCODE){?>
-<?php echo $MSG_VCODE?>:
-<input name="vcode" size=4 type=text><img id="vcode" alt="click to change" onclick="this.src='vcode.php?'+Math.random()">
-<?php }?>
-
-<br>
 </span>
+
 <?php if($OJ_ACE_EDITOR){ ?>
-	<pre style="width:80%;height:600" cols=180 rows=20 id="source"><?php echo htmlentities($view_src,ENT_QUOTES,"UTF-8")?></pre><br>
+	<pre style="width:80%;height:600;font-size:13pt" cols=180 rows=20 id="source"><?php echo htmlentities($view_src,ENT_QUOTES,"UTF-8")?></pre>
 	<input type=hidden id="hide_source" name="source" value=""/>
 <?php }else{ ?>
-	<textarea style="width:80%;height:600" cols=180 rows=20 id="source" name="source"><?php echo htmlentities($view_src,ENT_QUOTES,"UTF-8")?></textarea><br>
+	<textarea style="width:80%;height:600" cols=180 rows=20 id="source" name="source"><?php echo htmlentities($view_src,ENT_QUOTES,"UTF-8")?></textarea>
 <?php }?>
 
 <?php if (isset($OJ_TEST_RUN)&&$OJ_TEST_RUN){?>
@@ -83,8 +79,12 @@
 <textarea style="width:30%" cols=10 rows=5 id="out" name="out" disabled="true" >SHOULD BE:
 <?php echo $view_sample_output?>
 </textarea>
-<br>
 <?php } ?>
+<?php if($OJ_VCODE){?>
+<?php echo $MSG_VCODE?>:
+<input name="vcode" size=4 type=text> <img id="vcode" alt="click to change" onclick="this.src='vcode.php?'+Math.random()">*
+<?php }?>
+<br><br>
 <input id="Submit" class="btn btn-info" type=button value="<?php echo $MSG_SUBMIT?>" onclick="do_submit();" >
 <?php if (isset($OJ_ENCODE_SUBMIT)&&$OJ_ENCODE_SUBMIT){?>
 <input class="btn btn-success" title="WAF gives you reset ? try this." type=button value="Encoded <?php echo $MSG_SUBMIT?>"  onclick="encoded_submit();">
diff --git a/trunk/web/template/classic/status.php b/trunk/web/template/classic/status.php
@@ -91,8 +91,8 @@
 <table id=result-tab class=content-box-header align=center width=80%>
 <tr  class='toprow'>
 <td ><?php echo $MSG_RUNID?>
-<td ><?php echo $MSG_USER?>
-<td ><?php echo $MSG_PROBLEM?>
+<td ><?php echo $MSG_USER."ID"?>
+<td ><?php echo $MSG_PROBLEM."ID"?>
 <td ><?php echo $MSG_RESULT?>
 <td ><?php echo $MSG_MEMORY?>
 <td ><?php echo $MSG_TIME?>
diff --git a/trunk/web/template/ie/status.php b/trunk/web/template/ie/status.php
@@ -110,10 +110,10 @@
 								<?php echo $MSG_RUNID?>
 							</th>
 							<th>
-								<?php echo $MSG_USER?>
+								<?php echo $MSG_USER."ID"?>
 							</th>
 							<th>
-								<?php echo $MSG_PROBLEM?>
+								<?php echo $MSG_PROBLEM."ID"?>
 							</th>
 							<th>
 								<?php echo $MSG_RESULT?>
diff --git a/trunk/web/template/sae/status.php b/trunk/web/template/sae/status.php
@@ -92,8 +92,8 @@
 <thead>
 <tr  class='success toprow' >
 <th ><?php echo $MSG_RUNID?>
-<th ><?php echo $MSG_USER?>
-<th ><?php echo $MSG_PROBLEM?>
+<th ><?php echo $MSG_USER."ID"?>
+<th ><?php echo $MSG_PROBLEM."ID"?>
 <th ><?php echo $MSG_RESULT?>
 <th ><?php echo $MSG_MEMORY?>
 <th ><?php echo $MSG_TIME?>
diff --git a/trunk/web/template/sweet/status.php b/trunk/web/template/sweet/status.php
@@ -103,8 +103,8 @@
 <thead>
 <tr class='toprow' >
 <th lay-data="{field:'u1',}" ><?php echo $MSG_RUNID?>
-<th lay-data="{field:'u2',}" ><?php echo $MSG_USER?>
-<th lay-data="{field:'u3',}" ><?php echo $MSG_PROBLEM?>
+<th lay-data="{field:'u2',}" ><?php echo $MSG_USER."ID"?>
+<th lay-data="{field:'u3',}" ><?php echo $MSG_PROBLEM."ID"?>
 <th lay-data="{field:'u4',}"><?php echo $MSG_RESULT?>
 <th lay-data="{field:'u5',}" class='hidden-xs' ><?php echo $MSG_MEMORY?>
 <th lay-data="{field:'u6',}" class='hidden-xs' ><?php echo $MSG_TIME?>

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@`
`60`	`60`	`if(isset($_GET['t'])&&"json"==$_GET['t']){`
`61`	`61`	`echo json_encode($row);`
`62`	`62`	`}else{`
`63`		`- echo $row['result'].",".$row['memory'].",".$row['time'].",".$row['judger'].",".($row['pass_rate']*100);`
	`63`	`+ echo $row['result'].",".$row['memory']." KB,".$row['time']." ms,".$row['judger'].",".($row['pass_rate']*100);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,8 @@`
`311`	`311`
`312`	`312`
`313`	`313`	`if ($row['result']>=4){`
`314`		`- $view_status[$i][4]= "<div id=center class=red>".$row['memory']."</div>";`
`315`		`- $view_status[$i][5]= "<div id=center class=red>".$row['time']."</div>";`
	`314`	`+ $view_status[$i][4]= "<div id=center class=red>".$row['memory']." KB</div>";`
	`315`	`+ $view_status[$i][5]= "<div id=center class=red>".$row['time']." ms</div>";`
`316`	`316`	`//echo "=========".$row['memory']."========";`
`317`	`317`	`}else{`
`318`	`318`	`$view_status[$i][4]= "---";`
`@@ -333,7 +333,7 @@`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`	`}`
`336`		`- $view_status[$i][7]= $row['code_length']." B";`
	`336`	`+ $view_status[$i][7]= $row['code_length']." bytes";`
`337`	`337`
`338`	`338`	`}else`
`339`	`339`	`{`