<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,8 +1,11 @@
 &lt;% form_tag(directory_people_path) do %&gt;
-  Year in School: &lt;br/&gt;
-  &lt;%= select_tag 'school_year[]', options_for_select(SchoolYear.find(:all).collect {|sy| [&quot;(#{sy.name} #{sy.level})&quot;, sy.id]}, @options[&quot;school_year&quot;]), :multiple =&gt; true %&gt;
-  &lt;br/&gt;  
-  Gender:
+  
+  
+  &lt;div class=&quot;adfieldbox&quot;&gt;First Name:&lt;br /&gt;&lt;%= text_field_tag :first_name, @options['first_name'], :class =&gt; 'wide' %&gt;&lt;/div&gt;
+  
+  &lt;div class=&quot;adfieldbox&quot;&gt;Last Name:&lt;br /&gt;&lt;%= text_field_tag :last_name, @options['last_name'], :class =&gt; 'wide' %&gt;&lt;/div&gt;
+  
+  &lt;div class=&quot;adfieldbox&quot;&gt;Gender:&lt;br /&gt;
   &lt;ul&gt;
     &lt;% ['1','0'].each do |gender| %&gt;
       &lt;li&gt;
@@ -10,18 +13,21 @@
         &lt;%= Person.human_gender(gender) %&gt; 
       &lt;/li&gt;
     &lt;% end %&gt;
-  &lt;/ul&gt;
-  &lt;br/&gt; 
-  Ministry: &lt;br/&gt;
-  &lt;%= select_tag 'ministry[]', options_for_select(@my.ministries.collect {|ministry| [ministry.name, ministry.id]}, @options[&quot;ministry&quot;]), :multiple =&gt; true %&gt;
-  &lt;br/&gt;
-  Campus: &lt;br/&gt;
-  &lt;%= select_tag 'campus[]', options_for_select(@campuses.collect {|campus| [campus.name, campus.id]}, @options[&quot;campus&quot;]), :multiple =&gt; true %&gt;
-  &lt;br/&gt;
-  First Name: &lt;%= text_field_tag :first_name, @options['first_name'] %&gt;
-  Last Name: &lt;%= text_field_tag :last_name, @options['last_name'] %&gt;
-  &lt;br/&gt;
-  Email: &lt;%= text_field_tag :email, @options['email'] %&gt;&lt;br/&gt;
-  
-  &lt;%= submit_tag 'Search' %&gt;
+  &lt;/ul&gt;&lt;/div&gt;
+  
+  &lt;div class=&quot;adfieldbox&quot;&gt;Email:&lt;br /&gt;&lt;%= text_field_tag :email, @options['email'], :class =&gt; 'wide' %&gt;&lt;/div&gt;
+  
+  &lt;div class=&quot;clear&quot; style=&quot;margin-bottom:15px;&quot;&gt;&lt;/div&gt;
+  
+  &lt;div class=&quot;adfieldbox&quot;&gt;Year in School: &lt;br/&gt;
+  &lt;%= select_tag 'school_year[]', options_for_select(SchoolYear.find(:all).collect {|sy| [&quot;(#{sy.name} #{sy.level})&quot;, sy.id]}, @options[&quot;school_year&quot;]), :multiple =&gt; true, :class =&gt; 'wide' %&gt;&lt;/div&gt;
+    
+  &lt;div class=&quot;adfieldbox&quot;&gt;Ministry: &lt;br/&gt;
+  &lt;%= select_tag 'ministry[]', options_for_select(@my.ministries.collect {|ministry| [ministry.name, ministry.id]}, @options[&quot;ministry&quot;]), :multiple =&gt; true, :class =&gt; 'wide' %&gt;&lt;/div&gt;
+    
+  &lt;div class=&quot;adfieldbox&quot;&gt;Campus: &lt;br/&gt;
+  &lt;%= select_tag 'campus[]', options_for_select(@campuses.collect {|campus| [campus.name, campus.id]}, @options[&quot;campus&quot;]), :multiple =&gt; true, :class =&gt; 'doublewide'  %&gt;&lt;/div&gt;
+  
+  &lt;div class=&quot;clear&quot; style=&quot;margin-bottom:15px;&quot;&gt;&lt;/div&gt;
+  &lt;%= submit_tag 'Search' %&gt; &lt;%= link_to_function &quot;Back to Basic Search&quot;, &quot;$('#basic_search').show();$('#advanced_search').hide();&quot;%&gt;
 &lt;% end %&gt;
\ No newline at end of file</diff>
      <filename>app/views/people/_advanced_search.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -53,7 +53,7 @@
 	&lt;/div&gt;
   &lt;div id=&quot;advanced_search&quot; &lt;%= 'style=&quot;display:none&quot;' unless @advanced %&gt;&gt;
     &lt;%= render :partial =&gt; 'advanced_search' %&gt;
-		&lt;%= link_to_function &quot;Basic Search&quot;, &quot;$('#basic_search').show();$('#advanced_search').hide();&quot;%&gt; 
+		 
 	&lt;/div&gt;
 	
 		&amp;nbsp;&amp;nbsp;</diff>
      <filename>app/views/people/directory.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -975,3 +975,14 @@ list-style-type:round;
   font-size: 12px;
   list-style: none;
 }
+
+
+.adfieldbox {
+float:left;
+margin-right:15px;
+min-width:180px;
+}
+
+.adfieldbox input.wide{width:175px; padding:3px 0 3px 0;}
+.adfieldbox select.wide, .adfieldbox select.doublewide{width:175px; padding:0; height:65px;}
+.adfieldbox select.doublewide {width:371px;}
\ No newline at end of file</diff>
      <filename>public/stylesheets/style.css</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>fd9ea3c619f8bb25846e2360c783883fcec3c72e</id>
    </parent>
  </parents>
  <author>
    <name>unknown</name>
    <email>david@26am.com</email>
  </author>
  <url>http://github.com/twinge/ministry-tracker/commit/92b8a474461086dc343c02a6ebc2c55b1d329c02</url>
  <id>92b8a474461086dc343c02a6ebc2c55b1d329c02</id>
  <committed-date>2009-04-02T16:17:43-07:00</committed-date>
  <authored-date>2009-04-02T16:17:43-07:00</authored-date>
  <message>advanced fricken search</message>
  <tree>e3670ab5948cc7fd871ca55094386ec151fbf0ac</tree>
  <committer>
    <name>unknown</name>
    <email>david@26am.com</email>
  </committer>
</commit>
