From 315722391968bef81ae8e45dce20e822b8f2dd19 Mon Sep 17 00:00:00 2001 From: rachelmad Date: Sat, 28 Feb 2015 13:58:02 -0600 Subject: [PATCH 1/2] Added all projects button to navigation --- app/views/layouts/_navigation.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb index 033b7ea6..55e4068f 100644 --- a/app/views/layouts/_navigation.html.erb +++ b/app/views/layouts/_navigation.html.erb @@ -15,6 +15,7 @@
  • <%= link_to "Projects", projects_path %>
    • From bcd57d74f8d9dc63223d8370edeb176daafd91ae Mon Sep 17 00:00:00 2001 From: rachelmad Date: Sat, 28 Feb 2015 16:35:41 -0600 Subject: [PATCH 2/2] Added in page navigation --- app/views/events/show.html.erb | 37 ++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb index 57320608..7ee957fc 100644 --- a/app/views/events/show.html.erb +++ b/app/views/events/show.html.erb @@ -1,12 +1,30 @@ <% content_for :title do @event.name end %> - +
    +
    +
    + +
    +
    + +
    <%= image_tag @event.logo, :alt => @event.name %>
    - +
    <%= %> @@ -28,10 +46,11 @@

    <%=raw @event.description %>

    + <% if @event.schedule.present? %> -
    -

    Schedule

    +
    +

    Schedule
      <%=raw @event.schedule %> @@ -41,7 +60,7 @@ <% end %>
      -

      Code of Conduct

      + Useful Tips Section

      Code of Conduct

      This event is utilizing the <%= link_to "CodeMontage Code of Conduct", "/code_of_conduct" %>. If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact an event organizer immediately. @@ -57,12 +76,13 @@

      +
      <%= %> @@ -75,7 +95,7 @@
      <% if @event.sponsors.present? %> -
      +

      <%= @event.name %> Sponsors

      @@ -106,7 +126,8 @@
      +
      <% content_for(:press) do %>Press<% end %> - + \ No newline at end of file