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

Merge fafc06dd6e into 38bc2e3c3a

Browse source
This commit is contained in:
Stella Rouzi 2015-12-08 21:20:00 +00:00
commit 2eddbdb614
38 changed files with 222 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/views/admin/events/_change_state_dropdown.html.haml
View file

@ -1,23 +1,37 @@
- if event.transition_possible? :accept
%li= link_to 'Accept event',
accept_admin_conference_event_path(@conference.short_title, event),
method: :patch, id: "accept_event_#{event.id}"
- if @conference.email_settings.send_on_accepted?
%li= link_to 'Accept event (with email)',
accept_admin_conference_event_path(@conference.short_title, event, send_mail: true),
hint: 'Accept this event and send an automated email.',
method: :patch, id: "accept_event_#{event.id}"
%li= link_to 'Accept event (without email)',
accept_admin_conference_event_path(@conference.short_title, event, send_mail: false),
method: :patch, hint: 'Accept this event without sending an automated email.',
id: "accept_event_without_mail_#{event.id}"
hint: 'Accept this event without sending an automated email.',
method: :patch, id: "accept_event_without_mail_#{event.id}"
- else
%li= link_to 'Accept event (without email)',
accept_admin_conference_event_path(@conference.short_title, event),
hint: 'Accept this event without sending an automated email. You have not set an email template.',
method: :patch, id: "accept_event_#{event.id}"
- if event.transition_possible? :reject
%li= link_to 'Reject event',
reject_admin_conference_event_path(@conference.short_title, event),
method: :patch, confirm: 'Are you sure?', id: "reject_event_#{event.id}"
- if @conference.email_settings.send_on_rejected?
%li= link_to 'Reject event (with email)',
reject_admin_conference_event_path(@conference.short_title, event, send_mail: true),
hint: 'Reject this event and send an automated email.',
method: :patch, confirm: 'Are you sure?', id: "reject_event_#{event.id}"
%li= link_to 'Reject event (without email)',
reject_admin_conference_event_path(@conference.short_title, event, send_mail: false),
hint: 'Reject this event without sending an automated email.',
method: :patch, confirm: 'Are you sure?', id: "reject_event_without_mail_#{event.id}"
- else
%li= link_to 'Reject event (without email)',
reject_admin_conference_event_path(@conference.short_title, event),
hint: 'Reject this event without sending an automated email. You have not set an email template.',
method: :patch, confirm: 'Are you sure?', id: "reject_event_#{event.id}"
- if event.transition_possible? :restart
%li= link_to 'Start review',
@ -34,4 +48,4 @@
%li= link_to 'Cancel event',
cancel_admin_conference_event_path(@conference.short_title, event),
method: :patch, id: "cancel_event_#{event.id}",
hint: 'Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance.'
hint: 'Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance.'

2
app/views/admin/tickets/_form.html.haml
View file

@ -9,7 +9,7 @@
.row
.col-md-8
= semantic_form_for(@ticket, :url => (@ticket.new_record? ? admin_conference_tickets_path : admin_conference_ticket_path(@conference.short_title, @ticket))) do |f|
= f.input :title
= f.input :title, input_html: { required: true, autofocus: true }
= f.input :description, input_html: { rows: 5, data: { provide: "markdown-editable" } }
= f.input :price
= f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY'], include_blank: false