diff options
Diffstat (limited to 'app/views/events/index.html.erb')
| -rw-r--r-- | app/views/events/index.html.erb | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index 51269282..2497a577 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | <% @events.each do |event| %> | 18 | <% @events.each do |event| %> |
| 19 | <tr> | 19 | <tr> |
| 20 | <td> | 20 | <td class="title"> |
| 21 | <div class="title_with_flags"> | 21 | <div class="title_with_flags"> |
| 22 | <span class="flag_stack"> | 22 | <span class="flag_stack"> |
| 23 | <%= flag("hours-24", Event.human_attribute_name(:allday)) if event.allday %> | 23 | <%= flag("hours-24", Event.human_attribute_name(:allday)) if event.allday %> |
| @@ -41,14 +41,22 @@ | |||
| 41 | </div> | 41 | </div> |
| 42 | </td> | 42 | </td> |
| 43 | <td class="event_when"> | 43 | <td class="event_when"> |
| 44 | <% if event.rrule.present? %> | 44 | <div class="when_body"> |
| 45 | <span class="rrule_raw" title="<%= event.rrule %>"><%= event_schedule_text(event) %></span> | 45 | <% if event.rrule.present? %> |
| 46 | <% if event.humanize_rrule.nil? && event.start_time %> | 46 | <% if event.humanize_rrule %> |
| 47 | <div class="event_meta"><%= admin_date(event.start_time) %></div> | 47 | <span title="<%= event.rrule %>"><%= event_schedule_text(event) %></span> |
| 48 | <% else %> | ||
| 49 | <span class="rrule_raw" title="<%= event.rrule %>"> | ||
| 50 | <%= t("events.schedule.unreadable") %> | ||
| 51 | </span> | ||
| 52 | <% if event.start_time %> | ||
| 53 | <div class="event_meta"><%= admin_date(event.start_time) %></div> | ||
| 54 | <% end %> | ||
| 55 | <% end %> | ||
| 56 | <% else %> | ||
| 57 | <%= event_date_range(event) %> | ||
| 48 | <% end %> | 58 | <% end %> |
| 49 | <% else %> | 59 | </div> |
| 50 | <%= event_date_range(event) %> | ||
| 51 | <% end %> | ||
| 52 | </td> | 60 | </td> |
| 53 | <td class="actions"> | 61 | <td class="actions"> |
| 54 | <div class="action_grid"> | 62 | <div class="action_grid"> |
