gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI/UX changes related to tracks

Browse source 
Add confirmed and cfp_active scopes to Track
Render markdown in track's description
Make the views more similar to the proposal/events views
Change the sequence of columns in admin/Tracks#index
Remove the short_name column from the index views
Add button "My Tracks" in the user menu
Fix track count in proposals
Add details of track in admin/Tracks#show
Use tabs to show track details and events
This commit is contained in:
AEtherC0r3 2017-07-19 18:28:57 +03:00 • committed by Stella Rouzi
parent f9903eba16
commit 3d250ecf75
14 changed files with 269 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ module Admin
def index
@events = @program.events
@tracks = @program.tracks
@tracks = @program.tracks.confirmed.cfp_active
@difficulty_levels = @program.difficulty_levels
@event_types = @program.event_types
@tracks_distribution_confirmed = @conference.tracks_distribution(:confirmed)
@ -43,7 +43,7 @@ module Admin
end
def show
@tracks = @program.tracks
@tracks = @program.tracks.confirmed.cfp_active
@event_types = @program.event_types
@comments = @event.root_comments
@comment_count = @event.comment_threads.count
@ -58,7 +58,7 @@ module Admin
def edit
@event_types = @program.event_types
@tracks = Track.all
@tracks = @program.tracks.confirmed.cfp_active
@comments = @event.root_comments
@comment_count = @event.comment_threads.count
@user = @event.submitter