Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added "all projects" button to navigation bar and in-page navigation to event page #354

Closed
wants to merge 2 commits into from
Closed

Added "all projects" button to navigation bar and in-page navigation to event page #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3157223
Added all projects button to navigation
rachelmad Feb 28, 2015
bcd57d7
Added in page navigation
rachelmad Feb 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions app/views/events/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
<body>
<% content_for :title do @event.name end %>

<div class="event">
<div id="side_nav">
<div class="large-2 columns panel">
<ul class="side-nav">
<% if @event.schedule.present? %>
<li><a href="#schedule">Schedule</a></li>
<% end %>
<li><a href="#conduct">Code of Conduct</a></li>
<% if @featured_projects.present? %>
<li><a href="#featured">Featured Projects</a></li>
<% end %>
<% if @event.sponsors.present? %>
<li><a href="#sponsors">Sponsors</a></li>
<% end %>
</ul>
</div>
</div>

<div class = "large-10 columns">
<div id="event_welcome" class="row">
<div class="large-10 columns large-centered text-center">
<%= image_tag @event.logo, :alt => @event.name %>
</div>

<div id="event_rsvp_top" class="row">
<div class="large-10 columns large-centered text-center">
<%= %>
Expand All @@ -28,10 +46,11 @@
<p><%=raw @event.description %><p>
</div>
</div>


<% if @event.schedule.present? %>
<div id="event_schedule" class="large-10 columns large-centered">
<h4>Schedule</h4>
<div id="event_schedule" class="large-10 columns large-centered">
<a id="schedule"><h4>Schedule</h4></a>
<div class="large-10 columns large-centered">
<ul>
<%=raw @event.schedule %>
Expand All @@ -41,7 +60,7 @@
<% end %>

<div id="event_code_of_conduct" class="large-10 columns large-centered">
<h4>Code of Conduct</h4>
<a id="conduct">Useful Tips Section<h4>Code of Conduct</h4></a>
<p>
This event is utilizing the <%= link_to "CodeMontage Code of Conduct", "/code_of_conduct" %>. <strong>If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact an event organizer immediately.</strong>

Expand All @@ -57,12 +76,13 @@

<div id="event_featured_projects" class="large-10 columns large-centered">
<% if @featured_projects.present? %>
<h4>Featured Projects</h4>
<a id="featured"><h4>Featured Projects</h4></a>
<%= render partial: 'projects/project', collection: @featured_projects %>
<% end %>
</div>
</div>


<div id="event_rsvp_bottom" class="row">
<div class="large-6 columns large-centered text-center">
<%= %>
Expand All @@ -75,7 +95,7 @@
</div>

<% if @event.sponsors.present? %>
<div id="event_sponsors" class="row">
<a id="sponsors"><div id="event_sponsors" class="row"></a>
<div class="large-10 columns large-centered">
<h2><%= @event.name %> Sponsors</h2>
<div class="sponsors row large-centered">
Expand Down Expand Up @@ -106,7 +126,8 @@
</div>
</div>
</div>
</div>

<% content_for(:press) do %>Press<% end %>

</body>
</body>
1 change: 1 addition & 0 deletions app/views/layouts/_navigation.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<li class="has-dropdown">
<%= link_to "Projects", projects_path %>
<ul class="dropdown">
<li><%= link_to "All Projects", projects_path %>
<li><%= link_to "Project Requirements", project_requirements_path %></li>
</ul>
</li>
Expand Down