diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
index 1089f215..1e09cad0 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@@ -352,7 +352,11 @@ function checkIfAutoJoin() {
}
function filterRooms() {
- const search_term = $('#room-search').val().toLowerCase(),
+ let search = $('#room-search').val()
+
+ if (search == undefined) { return }
+
+ let search_term = search.toLowerCase(),
rooms = $('#room_block_container > div:not(:last-child)');
clear_room_search = $('#clear-room-search');
@@ -367,3 +371,8 @@ function filterRooms() {
room.style.display = (text.toLowerCase().indexOf(search_term) < 0) ? 'none' : 'block';
})
}
+
+function clearRoomSearch() {
+ $('#room-search').val('');
+ filterRooms()
+}
diff --git a/app/assets/stylesheets/admins.scss b/app/assets/stylesheets/admins.scss
index f83ae097..65036144 100644
--- a/app/assets/stylesheets/admins.scss
+++ b/app/assets/stylesheets/admins.scss
@@ -24,7 +24,7 @@
}
}
-#clear-search, #clear-room-search {
+#clear-search {
z-index: 9;
position: absolute;
right: 55px;
@@ -35,10 +35,6 @@
}
}
-.room-search {
- margin: 50px 0 25px 0;
-}
-
.tag i {
color: white !important;
}
diff --git a/app/assets/stylesheets/rooms.scss b/app/assets/stylesheets/rooms.scss
index cdcb5b6b..26709952 100644
--- a/app/assets/stylesheets/rooms.scss
+++ b/app/assets/stylesheets/rooms.scss
@@ -133,3 +133,14 @@
text-overflow: ellipsis;
padding-right: 75px;
}
+
+#clear-room-search {
+ z-index: 9;
+ position: absolute;
+ right: 15px;
+ top: 8px;
+
+ &:hover {
+ cursor: pointer;
+ }
+}
\ No newline at end of file
diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb
index 5f6c0f00..759fafdc 100644
--- a/app/views/rooms/show.html.erb
+++ b/app/views/rooms/show.html.erb
@@ -1,142 +1,140 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see .
-%>
-
-<% exceeds_limit = current_room_exceeds_limit(@room)%>
-<% if exceeds_limit%>
-
- <% if current_user.role.get_permission("can_create_rooms") %>
- <% current_user.ordered_rooms.each do |room| %>
-
- <%= link_to room do %>
- <%= render "rooms/components/room_block", room: room %>
- <% end %>
-
- <% end %>
- <% end %>
-
- <% if shared_access_allowed %>
- <% current_user.shared_rooms.each do |room| %>
-
- <%= link_to room do %>
- <%= render "rooms/components/shared_room_block", room: room %>
- <% end %>
-
- <% end %>
- <% end %>
-
- <% if current_user.role.get_permission("can_create_rooms") && !room_limit_exceeded %>
- <%= render "rooms/components/create_room_block"%>
- <% end %>
-
-
-
-
-<% unless hide_recording_tables %>
- <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%>
-<% end %>
-
-<%= render "shared/modals/delete_room_modal" %>
-
-<%= render "shared/modals/create_room_modal" %>
-
-<% if preupload_allowed? %>
- <%= render "shared/modals/preupload_presentation_modal" %>
-<% end %>
-
-<% if shared_access_allowed %>
- <%= render "shared/modals/share_room_modal" %>
- <%= render "shared/modals/remove_access_modal" %>
-<% end %>
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+<% exceeds_limit = current_room_exceeds_limit(@room)%>
+<% if exceeds_limit%>
+