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

Merge branch 'master' into autofocus

Browse source
This commit is contained in:
James Mason 2017-12-07 09:59:27 -08:00 • committed by GitHub
commit a17e367afc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/osem-datepickers.js
View file

@ -80,10 +80,19 @@ $(function () {
$("#conference-start-datepicker").on("dp.change",function (e) { $("#conference-start-datepicker").on("dp.change",function (e) {
$('#conference-end-datepicker').data("DateTimePicker").setMinDate(e.date); $('#conference-end-datepicker').data("DateTimePicker").setMinDate(e.date);
}); });
$("#conference-start-datepicker").change(function (e) {
$('#conference-start-datepicker').val()?$('#conference-end-datepicker').data("DateTimePicker").setMinDate(e.date):$('#conference-end-datepicker').data("DateTimePicker").setMinDate(null);
});
$("#conference-end-datepicker").on("dp.change",function (e) { $("#conference-end-datepicker").on("dp.change",function (e) {
$('#conference-start-datepicker').data("DateTimePicker").setMaxDate(e.date); $('#conference-start-datepicker').data("DateTimePicker").setMaxDate(e.date);
}); });
$("#conference-end-datepicker").change(function (e) {
$('#conference-end-datepicker').val()?$('#conference-start-datepicker').data("DateTimePicker").setMaxDate(e.date):$('#conference-start-datepicker').data("DateTimePicker").setMaxDate(null);
});
$("#registration-period-start-datepicker").on("dp.change",function (e) { $("#registration-period-start-datepicker").on("dp.change",function (e) {
$('#registration-period-end-datepicker').data("DateTimePicker").setMinDate(e.date); $('#registration-period-end-datepicker').data("DateTimePicker").setMinDate(e.date);
}); });

2
app/views/admin/events/_proposal.html.haml
View file

@ -165,7 +165,7 @@
%td= markdown(@event.abstract) %td= markdown(@event.abstract)
%tr %tr
%td %td
%b Description %b Requirements
%td= simple_format(@event.description) %td= simple_format(@event.description)
- if @conference.program && @conference.program.rating && @conference.program.rating > 0 - if @conference.program && @conference.program.rating && @conference.program.rating > 0