diff --git a/static/css/ranking.css b/static/css/ranking.css index b9a5e63..a9251b8 100644 --- a/static/css/ranking.css +++ b/static/css/ranking.css @@ -3,12 +3,6 @@ height: auto; } -tr > td > label > input.radioTrophy { - margin: auto; - margin-bottom: 5px; - display: block; -} - .successCell { background-color: #dff0d8 !important } @@ -23,10 +17,10 @@ tr > td > label > input.radioTrophy { } .circleBadgeSmall { - width: 40px; - height: 40px; + width: 73px; + height: 73px; text-align: center; - border-radius: 25px; + border-radius: 38px; background-color: #e1e1e1; border: 1px solid #caccce; vertical-align: middle; @@ -35,7 +29,7 @@ tr > td > label > input.radioTrophy { } -.grayscale { filter: grayscale(100%); } +.circlBadgeNotAcquired { filter: grayscale(100%); } .circlBadgeAcquired { /*box-shadow: 0px 0px 15px #0000ff*/ @@ -81,7 +75,7 @@ tr > td > label > input.radioTrophy { font-size: x-large; } -.popover-content { +.popoverNoPadding { padding: 3px } diff --git a/static/js/contrib.js b/static/js/contrib.js index ba27b31..256a02a 100644 --- a/static/js/contrib.js +++ b/static/js/contrib.js @@ -14,7 +14,8 @@ var popOverOption = { trigger: "hover", html: true, placement: 'bottom', - content: generateRankingSheet() + content: generateRankingSheet(), + template: '' } var optionsLineChart = { series: { @@ -466,6 +467,7 @@ function updateProgressHeader(org) { source = url_baseTrophyLogo+rank+'.png' $('#trophy_'+categ).attr('src', source); $('#trophy_'+categ).attr('title', trophy_title[rank]); + $('#trophy_'+categ).popover({title: trophy_title[rank], content: rank, trigger: "hover", placement: "bottom"}); } }); @@ -582,10 +584,6 @@ $(document).ready(function() { //FIXME: timeout used to wait that all datatables are draw. setTimeout( function() { updateProgressHeader(currOrg); }, 500); - $('#trophyForm input').on('change', function() { - alert($('input[name=radioTrophyName]:checked', '#trophyForm').val()); - }); - source_lastContrib = new EventSource(url_eventStreamLastContributor); source_lastContrib.onmessage = function(event) { var json = jQuery.parseJSON( event.data ); diff --git a/templates/contrib.html b/templates/contrib.html index f42da69..090d463 100644 --- a/templates/contrib.html +++ b/templates/contrib.html @@ -188,7 +188,7 @@
- +
{{ item[1] }} @@ -208,18 +208,13 @@ -
- - {% for categ in trophy_categ_list_id %} - - - - {% endfor %} + + {% for categ in trophy_categ_list_id %} + + + + {% endfor %} -