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

Merge 48b9b49655 into b2ab893d17

Browse source
This commit is contained in:
Stella Rouzi 2014-07-22 21:28:42 +00:00
commit ce9950755e
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/proposal/_form.html.haml
View file

@ -3,14 +3,14 @@
.tabbable
%ul.nav.nav-tabs
%li.active
= link_to "Proposal", "#proposal-content", "data-toggle"=>"tab"
= link_to 'Proposal', '#proposal-content', 'data-toggle'=>'tab'
%li
= link_to "Attachments", "#attachment-content", "data-toggle"=>"tab"
= link_to 'Attachments', '#attachment-content', 'data-toggle'=>'tab'
.tab-content
#proposal-content.tab-pane.active
= render 'proposal/proposal_form'
#attachment-content.tab-pane
= form_for EventAttachment.new, :url => conference_proposal_event_attachment_index_path(@conference.short_title, @event), :html => { :multipart => true, :id => "fileupload" } do |f|
= form_for EventAttachment.new, url: conference_proposal_event_attachment_index_path(@conference.short_title, @event), html: { multipart: true, id: 'fileupload' } do |f|
%table.table.table-striped
%thead
%th
@ -45,7 +45,7 @@
data.formData = inputs.serializeArray();
});
$.getJSON($('#fileupload').prop('action'), function (files) {
var fu = $('#fileupload').data('fileupload'),
var fu = $('#fileupload').data('blueimpFileupload'),
template;
fu._adjustMaxNumberOfFiles(-files.length);
template = fu._renderDownload(files)