Skip to content
Browse files

Merge branch 'master' of github.com:eyko/freesbee

  • Loading branch information...
2 parents bb10efa + 754ddce commit b8c22ecd256d224681b594ac384fead729d63b50 @georges-gouriten committed
Showing with 7 additions and 8 deletions.
  1. +7 −0 app/views/layouts/application.html.erb
  2. +0 −8 app/views/offers/index.html.erb
View
7 app/views/layouts/application.html.erb
@@ -38,6 +38,13 @@
<%= render :partial => "layouts/header" %>
<div id="wrapper">
<%= yield %>
+ <div id="new_offer_form" class="fade modal">
+ <div class="modal-header">
+ <a href="#" class="close">×</a>
+ <h3>What are you giving out?</h3>
+ </div>
+ <%= render :partial => "modal_form" %>
+ </div>
</div>
<footer>
<%= render :partial => "layouts/footer" %>
View
8 app/views/offers/index.html.erb
@@ -1,12 +1,4 @@
<div id="available-freesbees">
- <div id="new_offer_form" class="fade modal">
- <div class="modal-header">
- <a href="#" class="close">×</a>
- <h3>What are you giving out?</h3>
- </div>
- <%= render :partial => "modal_form" %>
- </div>
-
<% if @offers.length > 0 %>
<div class="offers-listing">
<% @offers.each_with_index do |offer, index| %>

0 comments on commit b8c22ec

Please sign in to comment.
Something went wrong with that request. Please try again.