Skip to content

Commit a408517

Browse files
zhbluezhblue
authored
Merge pull request #541 from melongist/master
Some fix status.php ... +
2 parents 00633cf + 06946dc commit a408517

File tree

10 files changed

+44
-44
lines changed

10 files changed

+44
-44
lines changed

‎trunk/web/status-ajax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
if(isset($_GET['t'])&&"json"==$_GET['t']){
6161
echo json_encode($row);
6262
}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);
6464
}
6565
}
6666
}

‎trunk/web/status.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@
311311

312312

313313
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>";
316316
//echo "=========".$row['memory']."========";
317317
}else{
318318
$view_status[$i][4]= "---";
@@ -333,7 +333,7 @@
333333
}
334334
}
335335
}
336-
$view_status[$i][7]= $row['code_length']." B";
336+
$view_status[$i][7]= $row['code_length']." bytes";
337337

338338
}else
339339
{

‎trunk/web/template/ace/status.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
<thead>
104104
<tr class='toprow' >
105105
<th ><?php echo $MSG_RUNID?>
106-
<th ><?php echo $MSG_USER?>
107-
<th ><?php echo $MSG_PROBLEM?>
106+
<th ><?php echo $MSG_USER."ID"?>
107+
<th ><?php echo $MSG_PROBLEM."ID"?>
108108
<th ><?php echo $MSG_RESULT?>
109109
<th class='hidden-xs' ><?php echo $MSG_MEMORY?>
110110
<th class='hidden-xs' ><?php echo $MSG_TIME?>

‎trunk/web/template/bs/status.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
<thead>
9393
<tr class='success toprow' >
9494
<th ><?php echo $MSG_RUNID?>
95-
<th ><?php echo $MSG_USER?>
96-
<th ><?php echo $MSG_PROBLEM?>
95+
<th ><?php echo $MSG_USER."ID"?>
96+
<th ><?php echo $MSG_PROBLEM."ID"?>
9797
<th ><?php echo $MSG_RESULT?>
9898
<th ><?php echo $MSG_MEMORY?>
9999
<th ><?php echo $MSG_TIME?>

‎trunk/web/template/bs3/status.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,34 +106,34 @@
106106
<table id=result-tab class="table table-striped content-box-header" align=center width=80%>
107107
<thead>
108108
<tr class='toprow'>
109-
<th>
109+
<th class="text-center">
110110
<?php echo $MSG_RUNID?>
111111
</th>
112-
<th>
113-
<?php echo $MSG_USER?>
112+
<th class="text-center">
113+
<?php echo $MSG_USER."ID"?>
114114
</th>
115-
<th>
116-
<?php echo $MSG_PROBLEM?>
115+
<th class="text-center">
116+
<?php echo $MSG_PROBLEM."ID"?>
117117
</th>
118-
<th>
118+
<th class="text-center">
119119
<?php echo $MSG_RESULT?>
120120
</th>
121-
<th class='hidden-xs'>
122-
<?php echo $MSG_MEMORY."(KB)"?>
121+
<th class="text-center">
122+
<?php echo $MSG_MEMORY?>
123123
</th>
124-
<th class='hidden-xs'>
125-
<?php echo $MSG_TIME."(MS)"?>
124+
<th class="text-center">
125+
<?php echo $MSG_TIME?>
126126
</th>
127-
<th>
127+
<th class="text-center">
128128
<?php echo $MSG_LANG?>
129129
</th>
130-
<th class='hidden-xs'>
130+
<th class="text-center">
131131
<?php echo $MSG_CODE_LENGTH?>
132132
</th>
133-
<th>
133+
<th class="text-center">
134134
<?php echo $MSG_SUBMIT_TIME?>
135135
</th>
136-
<th class='hidden-xs'>
136+
<th class="text-center">
137137
<?php echo $MSG_JUDGER?>
138138
</th>
139139
</tr>
@@ -148,8 +148,8 @@
148148
echo "<tr class='evenrow'>";
149149
$i = 0;
150150
foreach ( $row as $table_cell ) {
151-
if ( $i > 3 && $i != 8 && $i!=6)
152-
echo "<td class='hidden-xs'>";
151+
if ( $i==0 || $i==4 || $i==5 || $i==6 || $i==7)
152+
echo "<td class='text-right'>";
153153
else
154154
echo "<td>";
155155
echo $table_cell;

‎trunk/web/template/bs3/submitpage.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,18 @@
3434
<script src="include/checksource.js"></script>
3535
<form id=frmSolution action="submit.php" method="post" onsubmit='do_submit()'>
3636
<?php if (isset($id)){?>
37-
Problem <span class=blue><b><?php echo $id?></b></span>
37+
<b><br><?php echo $MSG_PROBLEM."ID : "?> <span class=blue><?php echo $id?></b><br></span>
3838
<input id=problem_id type='hidden' value='<?php echo $id?>' name="id" ><br>
3939
<?php }else{
4040
//$PID="ABCDEFGHIJKLMNOPQRSTUVWXYZ";
4141
//if ($pid>25) $pid=25;
4242
?>
43-
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>
43+
<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>
4444
<input id="cid" type='hidden' value='<?php echo $cid?>' name="cid">
4545
<input id="pid" type='hidden' value='<?php echo $pid?>' name="pid">
4646
<?php }?>
47-
<span id="language_span">Language:
47+
48+
<span id="language_span"><?php echo $MSG_LANG?>:
4849
<select id="language" name="language" onChange="reloadtemplate($(this).val());" >
4950
<?php
5051
$lang_count=count($language_ext);
@@ -63,18 +64,13 @@
6364
}
6465
?>
6566
</select>
66-
<?php if($OJ_VCODE){?>
67-
<?php echo $MSG_VCODE?>:
68-
<input name="vcode" size=4 type=text><img id="vcode" alt="click to change" onclick="this.src='vcode.php?'+Math.random()">
69-
<?php }?>
70-
71-
<br>
7267
</span>
68+
7369
<?php if($OJ_ACE_EDITOR){ ?>
74-
<pre style="width:80%;height:600" cols=180 rows=20 id="source"><?php echo htmlentities($view_src,ENT_QUOTES,"UTF-8")?></pre><br>
70+
<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>
7571
<input type=hidden id="hide_source" name="source" value=""/>
7672
<?php }else{ ?>
77-
<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>
73+
<textarea style="width:80%;height:600" cols=180 rows=20 id="source" name="source"><?php echo htmlentities($view_src,ENT_QUOTES,"UTF-8")?></textarea>
7874
<?php }?>
7975

8076
<?php if (isset($OJ_TEST_RUN)&&$OJ_TEST_RUN){?>
@@ -83,8 +79,12 @@
8379
<textarea style="width:30%" cols=10 rows=5 id="out" name="out" disabled="true" >SHOULD BE:
8480
<?php echo $view_sample_output?>
8581
</textarea>
86-
<br>
8782
<?php } ?>
83+
<?php if($OJ_VCODE){?>
84+
<?php echo $MSG_VCODE?>:
85+
<input name="vcode" size=4 type=text> <img id="vcode" alt="click to change" onclick="this.src='vcode.php?'+Math.random()">*
86+
<?php }?>
87+
<br><br>
8888
<input id="Submit" class="btn btn-info" type=button value="<?php echo $MSG_SUBMIT?>" onclick="do_submit();" >
8989
<?php if (isset($OJ_ENCODE_SUBMIT)&&$OJ_ENCODE_SUBMIT){?>
9090
<input class="btn btn-success" title="WAF gives you reset ? try this." type=button value="Encoded <?php echo $MSG_SUBMIT?>" onclick="encoded_submit();">

‎trunk/web/template/classic/status.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
<table id=result-tab class=content-box-header align=center width=80%>
9292
<tr class='toprow'>
9393
<td ><?php echo $MSG_RUNID?>
94-
<td ><?php echo $MSG_USER?>
95-
<td ><?php echo $MSG_PROBLEM?>
94+
<td ><?php echo $MSG_USER."ID"?>
95+
<td ><?php echo $MSG_PROBLEM."ID"?>
9696
<td ><?php echo $MSG_RESULT?>
9797
<td ><?php echo $MSG_MEMORY?>
9898
<td ><?php echo $MSG_TIME?>

‎trunk/web/template/ie/status.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@
110110
<?php echo $MSG_RUNID?>
111111
</th>
112112
<th>
113-
<?php echo $MSG_USER?>
113+
<?php echo $MSG_USER."ID"?>
114114
</th>
115115
<th>
116-
<?php echo $MSG_PROBLEM?>
116+
<?php echo $MSG_PROBLEM."ID"?>
117117
</th>
118118
<th>
119119
<?php echo $MSG_RESULT?>

‎trunk/web/template/sae/status.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
<thead>
9393
<tr class='success toprow' >
9494
<th ><?php echo $MSG_RUNID?>
95-
<th ><?php echo $MSG_USER?>
96-
<th ><?php echo $MSG_PROBLEM?>
95+
<th ><?php echo $MSG_USER."ID"?>
96+
<th ><?php echo $MSG_PROBLEM."ID"?>
9797
<th ><?php echo $MSG_RESULT?>
9898
<th ><?php echo $MSG_MEMORY?>
9999
<th ><?php echo $MSG_TIME?>

‎trunk/web/template/sweet/status.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
<thead>
104104
<tr class='toprow' >
105105
<th lay-data="{field:'u1',}" ><?php echo $MSG_RUNID?>
106-
<th lay-data="{field:'u2',}" ><?php echo $MSG_USER?>
107-
<th lay-data="{field:'u3',}" ><?php echo $MSG_PROBLEM?>
106+
<th lay-data="{field:'u2',}" ><?php echo $MSG_USER."ID"?>
107+
<th lay-data="{field:'u3',}" ><?php echo $MSG_PROBLEM."ID"?>
108108
<th lay-data="{field:'u4',}"><?php echo $MSG_RESULT?>
109109
<th lay-data="{field:'u5',}" class='hidden-xs' ><?php echo $MSG_MEMORY?>
110110
<th lay-data="{field:'u6',}" class='hidden-xs' ><?php echo $MSG_TIME?>

0 commit comments

Comments
 (0)