diff --git a/symposion/reviews/views.py b/symposion/reviews/views.py index f22255e9..700d7cf8 100644 --- a/symposion/reviews/views.py +++ b/symposion/reviews/views.py @@ -53,9 +53,11 @@ def proposals_generator(request, queryset, user_pk=None, check_speaker=True): lookup_params["user"] = request.user try: - obj.latest_vote = LatestVote.objects.get(**lookup_params).css_class() + obj.user_vote = LatestVote.objects.get(**lookup_params).vote + obj.user_vote_css = LatestVote.objects.get(**lookup_params).css_class() except LatestVote.DoesNotExist: - obj.latest_vote = "no-vote" + obj.user_vote = None + obj.user_vote_css = "no-vote" yield obj diff --git a/symposion/templates/reviews/_review_table.html b/symposion/templates/reviews/_review_table.html index adc68950..9c1804b7 100644 --- a/symposion/templates/reviews/_review_table.html +++ b/symposion/templates/reviews/_review_table.html @@ -10,11 +10,12 @@ <th>{% trans "+0" %}</th> <th>{% trans "-0" %}</th> <th>{% trans "-1" %}</th> + <th><a href="#" class="tip" title="{% trans "Your Rating" %}"><i class="icon-user"></i></a></th> </thead> <tbody> {% for proposal in proposals %} - <tr> + <tr class="{{ proposal.user_vote_css }}"> <td>{{ proposal.number }}</td> <td> <a href="{% url review_detail proposal.pk %}"> @@ -29,6 +30,7 @@ <td>{{ proposal.plus_zero }}</td> <td>{{ proposal.minus_zero }}</td> <td>{{ proposal.minus_one }}</td> + <td>{{ proposal.user_vote|default:"" }}</td> </tr> {% endfor %} </tbody> diff --git a/symposion/templates/reviews/base.html b/symposion/templates/reviews/base.html index a4ba03fd..695d9c8c 100644 --- a/symposion/templates/reviews/base.html +++ b/symposion/templates/reviews/base.html @@ -97,7 +97,8 @@ <script src="{{ STATIC_URL }}tabletools/js/TableTools.min.js" type="text/javascript"></script> <script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script> <script type="text/javascript"> - $(function() { + $(function() { + $(".tip").tooltip(); $("table.table-reviews").dataTable({ "sDom": "<'row'<'span3'l><'span3'T><'span4'f>r>t<'row'<'span3'i><'span5'p>>", "sPaginationType": "bootstrap",