Skip to content

Commit

Permalink
Re-style event rating
Browse files Browse the repository at this point in the history
  • Loading branch information
mediafinger committed Apr 1, 2012
1 parent ae8084c commit a39ae78
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 13 deletions.
9 changes: 9 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ img {
padding-right: 1.5em;
background-color: rgb(222,222,222);
}
.big_star_rating_event {
padding-left: 1.5em;
padding-right: 1.5em;
}

.authentications {
overflow: auto;
Expand Down Expand Up @@ -151,6 +155,11 @@ img {
font-weight: bold;
padding-right: 1em;
}
.left-rating {
float: left;
width: 16em;
padding-right: 1em;
}

.righty {
float: left;
Expand Down
5 changes: 5 additions & 0 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
module ApplicationHelper

def formatted_date(datestring)
date = Date.parse(datestring.to_s) if datestring
date ? date.strftime('%d.%m.%Y') : ''
end

def link_to_twitter(user)
unless user.profile.nickname.blank?
link_to "@#{user.profile.nickname}", "https://twitter.com/#!/#{user.profile.nickname}"
Expand Down
14 changes: 14 additions & 0 deletions app/views/events/_event_rating_horizontal.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- rating_sum = 0
- rating_array = Rating.find_all_by_event_id(@event['id'])
- rating_array.each{ |r| rating_sum += r[:rating] } if rating_array
- avg_rating = rating_array.count > 0 ? (rating_sum.to_f / rating_array.count) : 0

- my_rating = Rating.find_by_user_id_and_event_id(current_user.id, @event['id'])
- rating = my_rating ? my_rating.rating : 0

%span.left-rating
= '∅ :'
%span.big_star_read_only{ :avg_rating => avg_rating }
%span.righty
= 'You:'
%span.big_star_rating_event{ :event_id => @event['id'], :avg_rating => rating }
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- rating_sum = 0
- rating_array = Rating.find_all_by_event_id(@event['id'])
- rating_array.each{ |r| rating_sum += r[:rating] } if rating_array
- avg_rating = rating_array ? (rating_sum.to_f / rating_array.count) : 0
- avg_rating = rating_array.count > 0 ? (rating_sum.to_f / rating_array.count) : 0

- my_rating = Rating.find_by_user_id_and_event_id(current_user.id, @event['id'])
- rating = my_rating ? my_rating.rating : 0
Expand All @@ -12,4 +12,4 @@

.vertical-spacer
%span.lefty="(#{t('profiles.your_rating')})"
%span.righty.big_star_rating_event{ :event_id => @event['id'], :avg_rating => rating }
%span.righty.big_star_rating_event{ :event_id => @event['id'], :avg_rating => rating }
16 changes: 12 additions & 4 deletions app/views/events/_event_summary.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
= @event['name']
%h3= @event['name']
= render 'event_rating_horizontal'
%br.higher
= "#{@event['city']} / #{@event['country']}"
%br.higher
= "#{@event['start_date']} - #{@event['end_date']}"
.vertical-spacer
.left-rating
= "#{@event['city']} / #{@event['country']}"
%br.higher
= "#{formatted_date(@event['start_date'])} - #{formatted_date(@event['end_date'])}"
.righty
= link_to "Show sessions", event_sessions_path(@event['id'])
%br.higher
= link_to "Show details", event_path(@event['id'])

7 changes: 1 addition & 6 deletions app/views/events/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

%ul
%li= link_to "Show me all events", events_path
%li= link_to "Show me all events in Germany", events_in_path(:country => 'de')
%li= link_to "Show me only events in Hamburg", events_in_path(:city => 'Hamburg')

- @events.each do |event|
%br
- @event = event
= render 'event_rating'
.vertical-spacer
= render 'event_summary'
%div= link_to "Show details", event_path(event['id'])
%hr.short
= render 'event_summary'
2 changes: 1 addition & 1 deletion app/views/events/show.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= render 'event_rating'
= render 'event_rating_vertical'

.vertical-spacer
= render 'event'
Expand Down

0 comments on commit a39ae78

Please sign in to comment.