+
+
<%= @debate.title %>
+<%= @debate.description %>
++ Creado el: <%= l @debate.created_at.to_date %> + por: <%= @debate.author.name %> +
+
@@ -38,4 +40,5 @@
<% if current_user && @debate.editable_by?(current_user) %>
<%= link_to 'Edit', edit_debate_path(@debate) %> |
<% end %>
-<%= link_to 'Back', debates_path %>
\ No newline at end of file
+<%= link_to 'Back', debates_path %>
+
\ No newline at end of file
diff --git a/app/views/devise/menu/_login_items.html.erb b/app/views/devise/menu/_login_items.html.erb
index 797656f94..167d3e87e 100644
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/views/devise/menu/_login_items.html.erb
@@ -1,11 +1,14 @@
-
+
- <% if user_signed_in? %>
-
- <%= link_to('Logout', destroy_user_session_path, method: :delete) %>
-
- <% else %>
-
- <%= link_to('Login', new_user_session_path) %>
-
- <% end %>
-
\ No newline at end of file
+-
+ <% if user_signed_in? %>
+
- + <%= link_to('Logout', destroy_user_session_path, method: :delete) %> + + <% else %> +
- + <%= link_to('Login', new_user_session_path) %> + +
- + <%#= link_to('Sign up', new_registration_path) %> + + <% end %> +
<%= notice %>
-<%= alert %>
+ <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "vendor/modernizr" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + + <%= render 'layouts/header' %> + + <% if notice %> +<%= notice %>
+ <% end %> - <%= render 'devise/menu/login_items' %> - - <%= yield %> - + <% if alert %> +<%= alert %>
+ <% end %> + +
+
+
\ No newline at end of file
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
index 5812ebb9d..2efa307cc 100644
--- a/spec/features/home_spec.rb
+++ b/spec/features/home_spec.rb
@@ -2,9 +2,4 @@ require 'rails_helper'
feature "Home" do
- scenario "Welcome message" do
- visit '/'
- expect(page).to have_content 'Debates sobre Madrid'
- end
-
end
+ <%= yield %>
+
+