diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/events_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/events/index.html.erb | 1 | ||||
| -rw-r--r-- | app/views/events/without_node.html.erb | 30 |
3 files changed, 0 insertions, 36 deletions
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 818459c4..d581de16 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb | |||
| @@ -18,11 +18,6 @@ class EventsController < ApplicationController | |||
| 18 | end | 18 | end |
| 19 | end | 19 | end |
| 20 | 20 | ||
| 21 | # GET /events/without_node | ||
| 22 | def without_node | ||
| 23 | @events = Event.where(node_id: nil).order(:start_time).paginate(page: params[:page], per_page: 25) | ||
| 24 | end | ||
| 25 | |||
| 26 | # GET /events/1 | 21 | # GET /events/1 |
| 27 | # GET /events/1.xml | 22 | # GET /events/1.xml |
| 28 | def show | 23 | def show |
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index d07d6f82..a2710c2a 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | <%= link_to new_event_path, class: 'action_button' do %> | 4 | <%= link_to new_event_path, class: 'action_button' do %> |
| 5 | <%= icon("plus", library: "tabler", "aria-hidden": true) %> <%= t(".create_event") %> | 5 | <%= icon("plus", library: "tabler", "aria-hidden": true) %> <%= t(".create_event") %> |
| 6 | <% end %> | 6 | <% end %> |
| 7 | <%= link_to t(".without_page_link"), without_node_events_path %> | ||
| 8 | </div> | 7 | </div> |
| 9 | 8 | ||
| 10 | <%= will_paginate @events %> | 9 | <%= will_paginate @events %> |
diff --git a/app/views/events/without_node.html.erb b/app/views/events/without_node.html.erb deleted file mode 100644 index e59eedc7..00000000 --- a/app/views/events/without_node.html.erb +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | <h1><%= t(".title") %></h1> | ||
| 2 | |||
| 3 | <%= link_to t(".all_events_link"), events_path %> | ||
| 4 | <%= link_to new_event_path, class: 'action_button' do %> | ||
| 5 | <%= icon("plus", library: "tabler", "aria-hidden": true) %> <%= t("events.index.create_event") %> | ||
| 6 | <% end %> | ||
| 7 | |||
| 8 | <%= will_paginate @events %> | ||
| 9 | |||
| 10 | <table class="events_table"> | ||
| 11 | <tr class="header"> | ||
| 12 | <th><%= t("admin.columns.title") %></th> | ||
| 13 | <th><%= Event.human_attribute_name(:start_time) %></th> | ||
| 14 | <th><%= Event.human_attribute_name(:end_time) %></th> | ||
| 15 | <th><%= Event.human_attribute_name(:allday) %></th> | ||
| 16 | <th><%= Event.human_attribute_name(:url) %></th> | ||
| 17 | <th></th> | ||
| 18 | </tr> | ||
| 19 | |||
| 20 | <% @events.each do |event| %> | ||
| 21 | <tr> | ||
| 22 | <td><%= link_to event.display_title, event %></td> | ||
| 23 | <td><%= admin_datetime(event.start_time) %></td> | ||
| 24 | <td><%= admin_datetime(event.end_time) %></td> | ||
| 25 | <td><%= t("admin.common.#{event.allday ? "yes" : "no"}") %></td> | ||
| 26 | <td><%=h event.url %></td> | ||
| 27 | <td class="url_cell"><span class="truncate"><%= external_url_link(event.url) %></span></td> | ||
| 28 | </tr> | ||
| 29 | <% end %> | ||
| 30 | </table> | ||
