midgard/zeus.ugent.be
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #378 from ZeusWPI/correct-frontpage-order

Browse source 
Fix correct front-page order of events
This commit is contained in:
redfast00 2020-02-17 00:48:10 +01:00 committed by GitHub
commit d1e898f341
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
content/index.erb
View file

@ -17,7 +17,7 @@
<%= if studytime? then render '/tiles/blokmap.*'end %> <%= if studytime? then render '/tiles/blokmap.*'end %>
<!--next event --> <!--next event -->
<div class="tile is-parent"> <div class="tile is-parent">
<%= render '/partials/_events_tile.*', event: upcoming_events[0] || all_events[-1] %> <%= render '/partials/_events_tile.*', event: front_page_events[0] %>
</div> </div>
<div class="tile"> <div class="tile">
<!--top coders --> <!--top coders -->
@ -44,7 +44,7 @@
</div> </div>
<div class="tile"> <div class="tile">
<div class="tile is-vertical"> <div class="tile is-vertical">
<% all_events.reject { |x| x == (upcoming_events[0] || all_events[-1]) }.reverse[0..2].each do |event| %> <% front_page_events[1..3].each do |event| %>
<div class="tile is-parent "> <div class="tile is-parent ">
<%= render '/partials/_events_tile.*', event: event %> <%= render '/partials/_events_tile.*', event: event %>
</div> </div>

4
lib/helpers/events.rb
View file

@ -33,6 +33,10 @@ module EventsHelper
@items.find_all('/events/*/*/main.md') @items.find_all('/events/*/*/main.md')
end end
def front_page_events
upcoming_events + all_events.reverse
end
def sub_events(grouped_event) def sub_events(grouped_event)
if grouped_event.identifier =~ /main.md/ if grouped_event.identifier =~ /main.md/
query = grouped_event.identifier.to_s.split('/')[0..-2].join('/') + '/*' query = grouped_event.identifier.to_s.split('/')[0..-2].join('/') + '/*'