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

Modified rendering for registration dates in splash

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-06-05 01:12:43 +05:30
parent f87cd94cb5
commit fd20e67c76
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/conference.rb
View file

@ -116,7 +116,7 @@ class Conference < ActiveRecord::Base
# * +false+ -> If the conference registration dates are not set # * +false+ -> If the conference registration dates are not set
# * +true+ -> If conference registration dates are set # * +true+ -> If conference registration dates are set
def registration_dates_given? def registration_dates_given?
if self.registration_start_date.blank? || self.registration_end_date.blank? if registration_start_date.blank? || registration_end_date.blank?
false false
else else
true true

6
app/views/conference/_registration.html.haml
View file

@ -7,7 +7,11 @@
- if !@conference.registration_description.blank? - if !@conference.registration_description.blank?
%p %p
= @conference.registration_description = @conference.registration_description
%h4 Registration period #{ date_string(@conference.registration_start_date, @conference.registration_end_date) } - if @conference.registration_dates_given?
-if @conference.registration_end_date >= Date.today
%h4 Registration period #{ date_string(@conference.registration_start_date, @conference.registration_end_date) }
-else
%h4 Registration is Closed, it was from #{ date_string(@conference.registration_start_date, @conference.registration_end_date) }
- if @conference.registration_open? - if @conference.registration_open?
= link_to "Register for #{@conference.short_title}", register_conference_path(@conference.short_title), :class =>"btn btn-success btn-lg", target: '_blank' = link_to "Register for #{@conference.short_title}", register_conference_path(@conference.short_title), :class =>"btn btn-success btn-lg", target: '_blank'
- if @conference.use_supporter_levels? - if @conference.use_supporter_levels?