Another round of splash design
* Add map to splash * Reverse venue<->conference relation * Split venue address into fields * Don't go through venue for lodgings anymore
This commit is contained in:
parent
30e8ab856c
commit
cb227a0afc
55 changed files with 717 additions and 548 deletions
|
|
@ -1,8 +1,8 @@
|
|||
= f.input :name
|
||||
= f.input :description, :input_html => {:rows => 2, data: { provide: "markdown-editable" } }, hint: markdown_hint("Write about the hotel/place, of what they are offering, about types of rooms, prices and address.")
|
||||
= image_tag f.object.photo(:thumb) if !f.object.photo.blank?
|
||||
= f.input :photo
|
||||
= f.input :website_link
|
||||
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
|
||||
|
||||
= link_to 'Back', admin_conference_lodgings_path(@conference.short_title)
|
||||
= semantic_form_for(@lodging, :url => (@lodging.new_record? ? admin_conference_lodgings_path : admin_conference_lodging_path(@conference.short_title, @lodging))) do |f|
|
||||
= f.input :name
|
||||
= f.input :website_link
|
||||
= f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint
|
||||
- unless @lodging.photo.blank?
|
||||
= image_tag @lodging.photo(:thumb)
|
||||
= f.input :photo
|
||||
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
%h1
|
||||
Edit Lodging
|
||||
.row
|
||||
.col-md-8
|
||||
= semantic_form_for(@lodging, :url => admin_conference_lodging_path(@conference.short_title, @lodging)) do |f|
|
||||
= render partial: 'form', locals: { f: f }
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
%h1 Lodgings
|
||||
- if @venue.lodgings.any?
|
||||
- if @conference.lodgings.any?
|
||||
.row
|
||||
.col-md-12
|
||||
%table.table
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
%th Edit
|
||||
%th Delete
|
||||
%tbody
|
||||
- @venue.lodgings.each_with_index do |lodging, index|
|
||||
- @conference.lodgings.each_with_index do |lodging, index|
|
||||
%tr
|
||||
%td
|
||||
= index + 1
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
%h1
|
||||
New Lodging
|
||||
.row
|
||||
.col-md-8
|
||||
= semantic_form_for(@lodging, :url => admin_conference_lodgings_path(@conference.short_title, @lodging)) do |f|
|
||||
= render partial: 'form', locals: { f: f }
|
||||
Loading…
Add table
Add a link
Reference in a new issue