gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Stellas review gripes

Browse source
This commit is contained in:
Henne Vogelsang 2014-12-09 15:19:01 +01:00
parent d13efa5f52
commit c6bd65deaa
6 changed files with 51 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/osem-fonts.css.scss
View file

@ -3,11 +3,11 @@
@font-face { @font-face {
font-family: "suse-icons"; font-family: "suse-icons";
src:url("fonts/suse-icons.eot"); src:font-url("suse-icons.eot");
src:url("fonts/suse-icons.eot?#iefix") format("embedded-opentype"), src:font-url("suse-icons.eot?#iefix") format("embedded-opentype"),
url("fonts/suse-icons.woff") format("woff"), font-url("suse-icons.woff") format("woff"),
url("fonts/suse-icons.ttf") format("truetype"), font-url("suse-icons.ttf") format("truetype"),
url("fonts/suse-icons.svg#suse-icons") format("svg"); font-url("suse-icons.svg#suse-icons") format("svg");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
@ -22,8 +22,7 @@
text-transform: none !important; text-transform: none !important;
speak: none; speak: none;
line-height: 1; line-height: 1;
-webkit-font-smoothing: antialiased; font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
} }
/* We have to repeat this for every symbol that extends font awesome. So if /* We have to repeat this for every symbol that extends font awesome. So if
@ -38,8 +37,7 @@
text-transform: none !important; text-transform: none !important;
speak: none; speak: none;
line-height: 1; line-height: 1;
-webkit-font-smoothing: antialiased; font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
} }
.fa-suse:before { .fa-suse:before {

2
app/controllers/conference_registrations_controller.rb
View file

@ -11,7 +11,7 @@ class ConferenceRegistrationsController < ApplicationController
def show def show
@workshops = @registration.workshops @workshops = @registration.workshops
@total_price = Ticket.total_price(@conference, current_user) @total_price = Ticket.total_price(@conference, current_user)
@tickets = current_user.ticket_purchases.where(conference_id: 1) @tickets = current_user.ticket_purchases.where(conference_id: @conference.id)
end end
def edit; end def edit; end

9
app/controllers/tickets_controller.rb
View file

@ -1,8 +1,15 @@
class TicketsController < ApplicationController class TicketsController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
load_resource :conference, find_by: :short_title load_resource :conference, find_by: :short_title
load_resource :tickets, class: Ticket load_resource :ticket, through: :conference
authorize_resource :conference_registrations, class: Registration authorize_resource :conference_registrations, class: Registration
before_filter :check_load_resource, only: :index
def index; end def index; end
def check_load_resource
if @tickets.empty?
redirect_to root_path, notice: "There are no tickets available for #{@conference.title}!"
end
end
end end

2
app/views/conference_registrations/show.html.haml
View file

@ -66,6 +66,7 @@
- @workshops.each do |workshop| - @workshops.each do |workshop|
%li %li
= link_to workshop.title, conference_proposal_path(@conference.short_title, workshop.id) = link_to workshop.title, conference_proposal_path(@conference.short_title, workshop.id)
- if @conference.tickets.any?
.row .row
.col-md-12 .col-md-12
%h4 %h4
@ -89,7 +90,6 @@
class: 'btn btn-danger btn-xs', class: 'btn btn-danger btn-xs',
data: { confirm: "Do you really want to delete the #{ticket.title} ticket for #{@conference.title}?" } do data: { confirm: "Do you really want to delete the #{ticket.title} ticket for #{@conference.title}?" } do
%i.fa.fa-trash-o %i.fa.fa-trash-o
%li %li
- if @tickets.any? - if @tickets.any?
= link_to 'Buy more tickets', conference_tickets_path(@conference.short_title) = link_to 'Buy more tickets', conference_tickets_path(@conference.short_title)