Skip to content

Commit

Permalink
Change home controller
Browse files Browse the repository at this point in the history
  • Loading branch information
feliciaan committed May 22, 2017
1 parent b671d07 commit 8422077
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 4 additions & 1 deletion app/controllers/welcome_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
class WelcomeController < ApplicationController
def index
redirect_to event_path(Event.first)
event = Event.find_by_id(5)
if event != nil
redirect_to event_path(Event.first)
end
end
end
9 changes: 4 additions & 5 deletions app/views/welcome/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container-index">
<div class="jumbotron">
<h1>Welcome!</h1>
<p>Welcome to Gandalf, an online event management service brought to you by <a href="http://zeus.ugent.be/" target="_blank">Zeus WPI</a> and <a href="http://www.fkgent.be/" target="_blank">FaculteitenKonvent Gent</a>.</p>
<p>Welcome to Gandalf, an online event management service brought to you by <a href="http://zeus.ugent.be/" target="_blank">Zeus WPI</a>.</p>
</div>

<div class="row marketing">
Expand All @@ -13,9 +13,8 @@
</div>

<div class="col-lg-6">
<h4>FK Praesidia</h4>
<p>FK Praesidia can <%= link_to "log in", new_user_session_path %> using their UGent credentials and create events.</p>
<h4>Admins</h4>
<p>Admins can <%= link_to "log in", new_user_session_path %> using their UGent credentials and create events.</p>
</div>
</div>
</div>

</div>

0 comments on commit 8422077

Please sign in to comment.