Compare commits
No commits in common. "5e3f5dcf1faa0c827366569ff50b9c4ff8efda0d" and "be3af16a123a32fdfd98b3a5f20d69d21d0a4f0e" have entirely different histories.
5e3f5dcf1f
...
be3af16a12
|
@ -360,7 +360,6 @@ class SeminarsController < ApplicationController
|
||||||
'sign_up' => sign_up,
|
'sign_up' => sign_up,
|
||||||
'contribute_action' => contribute_action,
|
'contribute_action' => contribute_action,
|
||||||
'time_now' => time_now,
|
'time_now' => time_now,
|
||||||
'sign_up_overdue' => sign_up_overdue,
|
|
||||||
'contribute_time_range' => SeminarMain.time_range(seminar.contribute_start_date, seminar.contribute_end_date),
|
'contribute_time_range' => SeminarMain.time_range(seminar.contribute_start_date, seminar.contribute_end_date),
|
||||||
'sign_up_time_range' => SeminarMain.time_range(seminar.signup_start_date, seminar.signup_end_date),
|
'sign_up_time_range' => SeminarMain.time_range(seminar.signup_start_date, seminar.signup_end_date),
|
||||||
'seminar_time_range' => SeminarMain.time_range(seminar.seminar_start_date, seminar.seminar_end_date)
|
'seminar_time_range' => SeminarMain.time_range(seminar.seminar_start_date, seminar.seminar_end_date)
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
@seminar_time_range = data["seminar_time_range"]
|
@seminar_time_range = data["seminar_time_range"]
|
||||||
@contribute_time_range = data["contribute_time_range"]
|
@contribute_time_range = data["contribute_time_range"]
|
||||||
@contribute_action = data["contribute_action"]
|
@contribute_action = data["contribute_action"]
|
||||||
@sign_up_overdue = data["sign_up_overdue"]
|
|
||||||
%>
|
%>
|
||||||
|
|
||||||
|
|
||||||
|
@ -50,7 +49,7 @@
|
||||||
<td class="seminarive-title-value"><%= @contribute_time_range %></td>
|
<td class="seminarive-title-value"><%= @contribute_time_range %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
<tr <%= 'class="hidden"' if @sign_up_overdue %>>
|
<tr>
|
||||||
<th class="seminarive-title-field"><%= t('seminar.signup') %></th>
|
<th class="seminarive-title-field"><%= t('seminar.signup') %></th>
|
||||||
<td class="seminarive-title-value"><%= @sign_up %><br /><%= @contribute_action %></td>
|
<td class="seminarive-title-value"><%= @sign_up %><br /><%= @contribute_action %></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in New Issue