JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #89 from delta24/master 

Fixed time rendering in the team page (admin view)
selenium-screenshot-testing
Kevin Chung 2016-02-16 01:49:56 -05:00
parent 0fedb814a5 3f13b15513
commit 49180438c3
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CTFd/static/admin/js/team.js
View File

@ -41,14 +41,6 @@ function scoregraph () {
});
}
function adjust_times () {
$.each($(".solve-time"), function(i, e){
$(e).text( moment(parseInt(e.innerText)).local().format('LLL') )
})
$(".solve-time").css('color', "#222")
}
function keys_percentage_graph(){
// Solves and Fails pie chart
$.get('/admin/fails/'+teamid(), function(data){
@ -125,4 +117,4 @@ function category_breakdown_graph(){
category_breakdown_graph();
keys_percentage_graph();
adjust_times();
scoregraph();
scoregraph();

6
CTFd/templates/admin/team.html
View File

@ -66,7 +66,7 @@
{% for addr in addrs %}
<tr>
<td class="text-center">{{ addr.ip|long2ip }}</td>
<td class="text-center solve-time">{{ addr.date|unix_time_millis }}</td>
<td class="text-center solve-time"><script>document.write( moment({{ addr.date|unix_time_millis }}).local().format('MMMM Do, h:mm:ss A'))</script></td>
</tr>
{% endfor %}
</tbody>
@ -91,7 +91,7 @@
<td class="text-center">{{ solve.flag }}</td>
<td class="text-center">{{ solve.chal.category }}</td>
<td class="text-center">{{ solve.chal.value }}</td>
<td class="text-center solve-time">{{ solve.date|unix_time_millis }}</td>
<td class="text-center solve-time"><script>document.write( moment({{ solve.date|unix_time_millis }}).local().format('MMMM Do, h:mm:ss A'))</script></td>
<td class="text-center"><i class="fa fa-times"></i></td>
</tr>
{% endfor %}
@ -135,7 +135,7 @@
<tr class="chal-wrong">
<td class="text-center chal" id="{{ wrong_key.chalid }}">{{ wrong_key.chal.name }}</td>
<td class="text-center">{{ wrong_key.flag }}</td>
<td class="text-center solve-time">{{ wrong_key.date|unix_time_millis }}</td>
<td class="text-center solve-time"><script>document.write( moment({{ wrong_key.date|unix_time_millis }}).local().format('MMMM Do, h:mm:ss A'))</script></td>
<td class="text-center"><i class="fa fa-times"></i></td>
</tr>
{% endfor %}