diff --git a/app/views/devise/registrations/edit.html.erb~ b/app/views/devise/registrations/edit.html.erb~
new file mode 100644
index 0000000..6ed8bbc
--- /dev/null
+++ b/app/views/devise/registrations/edit.html.erb~
@@ -0,0 +1,32 @@
+
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+ <%= devise_error_messages! %>
+
+<<<<<<< HEAD
+
<%= f.label :email %>
+=======
+
<%= f.label :name %>
<%= f.text_field :name %>
<%= f.label :email %>
+>>>>>>> planet2012/master
+ <%= f.email_field :email %>
+
+
<%= f.label :password %> (leave blank if you don't want to change it)
+ <%= f.password_field :password, :autocomplete => "off" %>
+
+
<%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation %>
+
+
<%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password %>
+
+
<%= f.submit "Update" %>
+<% end %>
+
+
Cancel my account
+
+
Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.
+
+<%= link_to "Back", :back %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 79a8c31..ee8309c 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -2,8 +2,9 @@
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
+
<%= f.label :name %>
+ <%= f.text_field :name %>
-
<%= f.label :name %>
<%= f.text_field :name %>
<%= f.label :email %>
<%= f.email_field :email %>
diff --git a/app/views/devise/registrations/new.html.erb~ b/app/views/devise/registrations/new.html.erb~
new file mode 100644
index 0000000..4968aa5
--- /dev/null
+++ b/app/views/devise/registrations/new.html.erb~
@@ -0,0 +1,25 @@
+
Sign up
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+ <%= devise_error_messages! %>
+
+<<<<<<< HEAD
+
<%= f.label :name %>
+ <%= f.text_field :name %>
+
+=======
+
<%= f.label :name %>
<%= f.text_field :name %>
+>>>>>>> planet2012/master
+
<%= f.label :email %>
+ <%= f.email_field :email %>
+
+
<%= f.label :password %>
+ <%= f.password_field :password %>
+
+
<%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation %>
+
+
<%= f.submit "Sign up" %>
+<% end %>
+
+<%= render "links" %>
diff --git a/app/views/layouts/_search.html.erb~ b/app/views/layouts/_search.html.erb~
new file mode 100644
index 0000000..604e5e8
--- /dev/null
+++ b/app/views/layouts/_search.html.erb~
@@ -0,0 +1,5 @@
+<%= form_tag :controller => 'planet', :action => 'search', :method => 'get' do %>
+ <%= text_field_tag :search, params[:search], :id => 'search_field' %>
+ <%= submit_tag "Search", :name => nil %>
+ <%= link_to_function "Clear", "$('search_field').clear()" %>
+<% end %>
diff --git a/app/views/layouts/_search_results.html.erb~ b/app/views/layouts/_search_results.html.erb~
new file mode 100644
index 0000000..1528527
--- /dev/null
+++ b/app/views/layouts/_search_results.html.erb~
@@ -0,0 +1,6 @@
+
+ <% @grants.each do |grant| %>
+ - <%= link_to grant.title,
+ :action => 'show', :id => grant.id %>
+ <% end %>
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e4c9e36..e1be833 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -6,7 +6,11 @@
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
-
+
@@ -14,22 +18,37 @@
<%= image_tag("logo3.png") %>
<%= @page_title || "Planet Travel Site" %>
-
<% if current_user %>
<%= link_to current_user.name,
edit_user_registration_path %> |
<%= link_to "Sign out", destroy_user_session_path, :method => :delete %>
<% else %>
<%= link_to "Sign in", new_user_session_path %>
<% end %>
+
+ <% if current_user %>
+ <%= link_to current_user.name,
+ edit_user_registration_path %> |
+ <%= link_to "Sign out", destroy_user_session_path, :method => :delete %>
+ <% else %>
+ <%= link_to "Sign in", new_user_session_path %>
+ <% end %>
+
+ <%= form_tag(planet_search_path, :method => "get") do %>
+ <%= text_field_tag(:busqueda, nil, :placeholder => " Inicie su búsqueda", :id => 'search_field') %>
+ <%= submit_tag("Buscar") %>
+ <% end %>
+
<%= link_to "Home", planet_index_path %>
<%= link_to "Tipos", types_path %>
+ <%= link_to "Tipos ordenados", ordered_index_types_path %>
<%= link_to "Sitios", sites_path %>
- <%= link_to "Viajes", trips_path %>
+ <%= link_to "Viajes", trips_path %>
<%= link_to "Contact", planet_contact_path %>
<%= link_to "Sign up", new_user_registration_path unless current_user %>
-
+ <%= link_to('Documentacion', "/doc/app/index.html")%>
+
-
<%= notice %>
<%= alert %>
+
<%= notice %>
<%= alert %>
<%= yield %>