Skip to content

Commit ce7492c

Browse files
authored
Merge pull request #866 from codeRIT/develop
Open Schedule Preview
2 parents 0eea1bb + aa6baba commit ce7492c

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

app/views/layouts/_nav.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
if simplified_nav
44
pages = ['Home']
55
else
6-
pages = ['About', 'Travel', 'FAQ', 'Sponsors', 'Gallery']
6+
pages = ['About', 'Schedule', 'Travel', 'FAQ', 'Sponsors', 'Gallery']
77
end
88
%>
99

app/views/pages/_schedule.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%
2-
event_schedule = Schedule.new("1Twk2i_aKYlYcW21eNikbdJwHVS3cWsFBr5JD4xvqMr4", 0)
2+
event_schedule = Schedule.new("1eCEF8d4jkSMcY_nZue93roCCdkbyfiBG0G0XZ5KV9xI", 0)
33
current_time = Time.now
44
hackathon_start_date = Date.new(2019, 2, 16)
55
%>

app/views/pages/index.html.erb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,15 @@
7575
</div>
7676
</div>
7777

78-
79-
<!--
8078
<div class="section schedule" id="schedule">
8179
<div class="schedule__wrapper">
8280
<br/>
83-
<h2 class="text-center">Schedule</h2>
81+
<h2 class="text-center">Schedule Preview</h2>
82+
<p><center><i>More to come!</i></center></p>
83+
<br/>
8484
<%= render "schedule" %>
8585
</div>
8686
</div>
87-
-->
8887

8988
<div class="section travel" id="travel">
9089
<div class="travel__wrapper">

0 commit comments

Comments
 (0)