Fix Stellas review gripes
This commit is contained in:
parent
d13efa5f52
commit
c6bd65deaa
6 changed files with 51 additions and 46 deletions
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
@font-face {
|
||||
font-family: "suse-icons";
|
||||
src:url("fonts/suse-icons.eot");
|
||||
src:url("fonts/suse-icons.eot?#iefix") format("embedded-opentype"),
|
||||
url("fonts/suse-icons.woff") format("woff"),
|
||||
url("fonts/suse-icons.ttf") format("truetype"),
|
||||
url("fonts/suse-icons.svg#suse-icons") format("svg");
|
||||
src:font-url("suse-icons.eot");
|
||||
src:font-url("suse-icons.eot?#iefix") format("embedded-opentype"),
|
||||
font-url("suse-icons.woff") format("woff"),
|
||||
font-url("suse-icons.ttf") format("truetype"),
|
||||
font-url("suse-icons.svg#suse-icons") format("svg");
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
|
|
@ -22,8 +22,7 @@
|
|||
text-transform: none !important;
|
||||
speak: none;
|
||||
line-height: 1;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
/* We have to repeat this for every symbol that extends font awesome. So if
|
||||
|
|
@ -38,8 +37,7 @@
|
|||
text-transform: none !important;
|
||||
speak: none;
|
||||
line-height: 1;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
.fa-suse:before {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class ConferenceRegistrationsController < ApplicationController
|
|||
def show
|
||||
@workshops = @registration.workshops
|
||||
@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
|
||||
|
||||
def edit; end
|
||||
|
|
|
|||
|
|
@ -1,8 +1,15 @@
|
|||
class TicketsController < ApplicationController
|
||||
before_filter :authenticate_user!
|
||||
load_resource :conference, find_by: :short_title
|
||||
load_resource :tickets, class: Ticket
|
||||
load_resource :ticket, through: :conference
|
||||
authorize_resource :conference_registrations, class: Registration
|
||||
before_filter :check_load_resource, only: :index
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
- @workshops.each do |workshop|
|
||||
%li
|
||||
= link_to workshop.title, conference_proposal_path(@conference.short_title, workshop.id)
|
||||
- if @conference.tickets.any?
|
||||
.row
|
||||
.col-md-12
|
||||
%h4
|
||||
|
|
@ -89,7 +90,6 @@
|
|||
class: 'btn btn-danger btn-xs',
|
||||
data: { confirm: "Do you really want to delete the #{ticket.title} ticket for #{@conference.title}?" } do
|
||||
%i.fa.fa-trash-o
|
||||
|
||||
%li
|
||||
- if @tickets.any?
|
||||
= link_to 'Buy more tickets', conference_tickets_path(@conference.short_title)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue