Simpler people search page

scottwillson · Aug 26, 2012 · d6245a1 · d6245a1
1 parent 3943267
commit d6245a1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -157,6 +157,6 @@ function makeEditable() {
 }
 
 $(document).ready(function() {
-  $('.wants_focus:visible').select();
   makeEditable();
+  jQuery('.wants_focus:visible').select();
 });
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -255,3 +255,7 @@ th, .table-striped tbody tr:nth-child(odd) th {
   text-align: center;
   white-space: nowrap;
 }
+
+#search_form {
+  margin-bottom: 0px;
+}
diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb
@@ -9,7 +9,7 @@
   <div class="row-fluid">
     <div class="span3"></div>
     <div class="span6">
-      <%= labelled_text_field_tag "name", "Name", @name, :class => "wants_focus", :help => "Enter part of a person's name to search" %>
+      <%= text_field_tag("name", @name, :class => "wants_focus span12", :placeholder => "Enter part of a person's name to search") %>
     </div>
   </div>
 <% end -%>
@@ -26,8 +26,8 @@
       </tr>
       <%= render :partial => "person", :collection => @people %>
       <% if @people.empty? %>
-      <tr valign="top">
+      <tr>
-        <td colspan="10" width="200" class="not_found">No matching people found</td>
+        <td colspan="5" class="not_found">No matching people found</td>
       </tr>
       <% else %>
         <%= will_paginate @people %>