gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-15 04:34:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #34 from differentreality/final_voting_visual

Browse source 
Voting visual
This commit is contained in:
Henne Vogelsang 2014-03-03 10:40:03 +01:00
commit 4092c68ea4
7 changed files with 61 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/osem.js
View file

@ -60,11 +60,6 @@ $(function() {
$(".comment-reply").hide();
$(".user-details-popover").popover();
$("#comments-div").hide();
$("#votes-link").click(function(){
$("#votes-div").toggle();
return false;
});
});
function word_count(text, divId, maxcount) {

2
app/assets/stylesheets/osem.css
View file

@ -14,7 +14,7 @@
background: url(../assets/star.png) 0 0;
width: 26px;
height: 26px;
display: block;
display: inline-block;
}
.myrating, .othersrating {
background: url(../assets/star.png) 0 0;

12
app/controllers/admin/events_controller.rb
View file

@ -1,5 +1,6 @@
class Admin::EventsController < ApplicationController
before_filter :verify_organizer
# FIXME: The timezome should only be applied on output, otherwise
# you get lost in timezone conversions...
# around_filter :set_timezone_for_this_request
@ -122,16 +123,21 @@ class Admin::EventsController < ApplicationController
end
def vote
event = Event.find(params[:id])
@event = Event.find(params[:id])
@ratings = @event.votes.includes(:person)
if votes = current_user.person.votes.find_by_event_id(params[:id])
votes.update_attributes(:rating => params[:rating])
else
@myvote = event.votes.build
@myvote = @event.votes.build
@myvote.person = current_user.person
@myvote.rating = params[:rating]
@myvote.save
end
redirect_to admin_conference_event_path(@conference.short_title, event)
respond_to do |format|
format.html { redirect_to admin_conference_event_path(@conference.short_title, @event)}
format.js
end
end
end

15
app/views/admin/events/_proposal.html.haml
View file

@ -5,15 +5,14 @@
%br
%span.muted
= @event.subtitle
.span2
= link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary"
.row-fluid
.span12
%table.table
%tr
%td
%td{:style => "width:15%"}
%b Type
%td
.dropdown
@ -113,6 +112,10 @@
%td
%b Description
%td= simple_format(@event.description)
- if @conference.call_for_papers.rating > 0
= render :partial => "voting"
- if @event.event_attachments.size > 0
%table.table
%thead
@ -142,11 +145,7 @@
%td
= link_to "Delete", conference_proposal_event_attachment_path(@conference.short_title, @event.id, a.id),
:method => :delete, :confirm => "Are you sure you want to delete this attachment? It's permanant!"
- if @conference.call_for_papers.rating > 0
.row-fluid
= link_to "Votes (#{@event.voters.length})", "#", :id => "votes-link"
#votes-div
= render :partial => 'voting'
.row-fluid
= link_to "Comments (#{@comment_count})", "#", :id => "event-comment-link"
#comments-div

28
app/views/admin/events/_voting.html.haml
View file

@ -1,7 +1,31 @@
%table#myeventratings{:style=>"width: 20%"}
%table.table#myrating
%tr
%td{:style => "width:15%"}
%b Rating
%td
%b Your vote:
- if @event.average_rating.to_f > 0
#{@event.average_rating}/#{@conference.call_for_papers.rating}
- else
Rating: 0/#{@conference.call_for_papers.rating}
- @conference.call_for_papers.rating.times do |counter|
- if @event.average_rating.to_f.round == counter+1
= label_tag "label_rating", "", :class => "avgrating", :avgrate => true
= javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
- else
= label_tag "label_rating", "", :class => "avgrating"
%tr
%td
%b Voters
%td
= @event.voters.length
- if @event.voters.length > 0
(
= @ratings.map {|x| "#{x.first_name} #{x.last_name}"}.join ', '
)
%tr
%td
%b Your vote
%td
- @conference.call_for_papers.rating.times do |counter|
- voted = @event.voted?(@event, current_user.person)

32
app/views/admin/events/index.html.haml
View file

@ -13,8 +13,9 @@
%b ID
%th
%b Title
%th
%b Rating
- if @conference.call_for_papers.rating != 0
%th
%b Rating
%th
%b Submitter
%th
@ -31,23 +32,24 @@
= event.id
%td
=link_to event.title, admin_conference_event_path(@conference.short_title, event)
%td
- if @conference.call_for_papers.rating != 0
- if @conference.call_for_papers.rating != 0
%td{:style => "width:96px"}
- if event.average_rating.to_f > 0
Rating: (#{event.average_rating}/#{@conference.call_for_papers.rating})
%b #{event.average_rating}/#{@conference.call_for_papers.rating}
%br
#{pluralize(event.voters.length, 'voter')}
%br
- @conference.call_for_papers.rating.times do |counter|
- if event.average_rating.to_f.round == counter+1
= label_tag "label_rating", "", :class => "avgrating", :avgrate => true
= javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
- else
= label_tag "label_rating", "", :class => "avgrating"
- else
Rating: (0/#{@conference.call_for_papers.rating})
Rating: 0/#{@conference.call_for_papers.rating}
%br
- @conference.call_for_papers.rating.times do |counter|
- if event.average_rating.to_f.round == counter+1
= label_tag "label_rating", "", :class => "avgrating", :avgrate => true
= javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
- else
= label_tag "label_rating", "", :class => "avgrating"
- else
= link_to "(enable voting)", admin_conference_cfp_info_path(@conference.short_title)
- if event.submitter.registrations.count < 1
- bgcolor="#F7819F"
- else

2
app/views/admin/events/vote.js.erb
View file

@ -1 +1 @@
$('table#myeventratings').replaceWith("<%= escape_javascript(render :partial => 'voting') %>");
$('table#myrating').replaceWith("<%= escape_javascript(render :partial => 'voting') %>");