gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix scrolling of left column in schedule, show only @conference.events

Browse source
This commit is contained in:
Stella Rouzi 2015-04-20 13:17:47 +03:00
parent 751bf4eb42
commit 3b8c91bbd9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/events_controller.rb
View file

@ -72,7 +72,7 @@ module Admin
respond_to do |format|
format.html
# Explicity call #to_json to avoid the use of EventSerializer
format.json { render json: Event.where(state: :confirmed).to_json }
format.json { render json: Event.where(state: :confirmed, conference: @conference).to_json }
end
end

4
public/stylesheets/schedule/schedule.css
View file

@ -89,8 +89,8 @@ li ul li a:hover {
width:200px;
bottom:50px;
position:absolute;
overflow-x: hidden;
overflow-y: hidden;
overflow-x: auto;
overflow-y: auto;
}
.tab-content {