Merge branch 'indexpage' of github.com:ZeusWPI/zeus.ugent.be into indexpage

This commit is contained in:
Eloïse Piret 2016-10-03 15:25:38 +02:00
commit 54077996cf
2 changed files with 35 additions and 44 deletions

View file

@ -0,0 +1,8 @@
$ ->
$.getJSON 'https://zeus.ugent.be/game/top4/show.json', (data) ->
str = "<ol>"
for x in data
str += "<li><a href=\"#{x.github_url}\">#{x.github_name}</a> (#{x.score} Z$)</li>"
str += "</ol>"
$('#gamification-coders').html(str)

View file

@ -19,38 +19,38 @@
</div>
</div>
<div class="tile is-vertical is-2">
<a class="tile" href="https://zeus.ugent.be/wiki">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered" >
<a href="https://zeus.ugent.be/wiki">
<%= fa 'wikipedia-w' %>
</div>
</div>
</a>
</div>
</div>
<a class="tile" href="/cammie">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered">
<a href="/cammie">
<%= fa 'video-camera' %>
</div>
</div>
</a>
</div>
</div>
</div>
<div class="tile is-vertical is-2">
<a class="tile" href="https://github.com/ZeusWPI">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered">
<a href="https://github.com/ZeusWPI">
<%= fa 'github' %>
</div>
</div>
</a>
</div>
</div>
<a class="tile" href="https://www.facebook.com/zeus.wpi/?fref=ts">
<div class="tile is-parent">
<div class="tile is-child box has-text-centered">
<a href="https://www.facebook.com/zeus.wpi/?fref=ts">
<%= fa 'facebook-official' %>
</div>
</div>
</a>
</div>
</div>
</div>
</div>
<div class="tile">
<div class="tile is-4 is-parent">
<%= render '/partials/_tile.*', article: sorted_articles.first %>
@ -58,29 +58,10 @@
<div class="tile is-vertical">
<div class="tile is-parent">
<div class="tile is-child box">
<p>
Numero uno: @werthen
</p>
<p>
Numero dos: @myncke
</p>
<p>
Numero tres: @iepoev
</p>
<p>
Numero quatro: @becousae
</p>
</div>
</div>
<div class="tile">
<div class="tile is-6 is-parent">
<div class="tile is-child box">
GITHUB
</div>
</div>
<div class="tile is-6 is-parent">
<div class="tile is-child box">
GITHUB
<div class="content">
<h1><a href="https://zeus.ugent.be/game">Top Zeus WPI coders this week</a></h1>
<div id="gamification-coders">
<!-- EMPTY -->
</div>
</div>
</div>
@ -88,3 +69,5 @@
</div>
</div>
</div>
</div>
<%= asset :js, :gamification %>