Index: WAeUP_SRP/trunk/profiles/default/layouts.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 596)
+++ WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 600)
@@ -3,4 +3,5 @@
  <property name="title"></property>
  <object name="accommodation" meta_type="CPS Layout"/>
+ <object name="academics_search" meta_type="CPS Layout"/>
  <object name="certificate" meta_type="CPS Layout"/>
  <object name="certificate_course" meta_type="CPS Layout"/>
Index: WAeUP_SRP/trunk/profiles/default/layouts/academics_search.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/academics_search.xml	(revision 600)
+++ WAeUP_SRP/trunk/profiles/default/layouts/academics_search.xml	(revision 600)
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<object name="student_search" meta_type="CPS Layout">
+ <property name="layout_create_method"></property>
+ <property name="layout_edit_method"></property>
+ <property name="layout_view_method"></property>
+ <property name="style_prefix">layout_search_</property>
+ <property name="flexible_widgets"/>
+ <property name="validate_values_expr"></property>
+ <widget name="review_state" meta_type="Select Widget">
+  <property name="title">Review State</property>
+  <property name="fields">
+   <element value="review_state"/>
+  </property>
+  <property name="label">Review State</property>
+  <property name="label_edit">Review State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">searchable_academics_states</property>
+ </widget>
+ <widget name="search_mode" meta_type="Generic Select Widget">
+  <property name="title">Searchmode</property>
+  <property name="fields">
+   <element value="search_mode"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Search for</property>
+  <property name="label_edit">Search for</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">academics_search_mode</property>
+  <property name="render_format">radio</property>
+ </widget>
+ <widget name="search_string" meta_type="String Widget">
+  <property name="title">Searchstring</property>
+  <property name="fields">
+   <element value="search_string"/>
+  </property>
+  <property name="label">Search for</property>
+  <property name="label_edit">Search for</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">30</property>
+ </widget>
+ <table>
+  <row>
+   <cell name="review_state" ncols="2"/>
+  </row>
+  <row>
+   <cell name="search_string"/>
+   <cell name="search_mode"/>
+  </row>
+ </table>
+</object>
Index: WAeUP_SRP/trunk/profiles/default/schemas.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas.xml	(revision 596)
+++ WAeUP_SRP/trunk/profiles/default/schemas.xml	(revision 600)
@@ -3,4 +3,5 @@
  <property name="title"></property>
  <object name="academics" meta_type="CPS Schema"/>
+ <object name="academics_search" meta_type="CPS Schema"/>
  <object name="accommodation" meta_type="CPS Schema"/>
  <object name="certificate" meta_type="CPS Schema"/>
@@ -24,4 +25,3 @@
  <object name="study_level" meta_type="CPS Schema"/>
  <object name="university" meta_type="CPS Schema"/>
- <object name="members_search" meta_type="CPS Schema"/>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/schemas/academics_search.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/academics_search.xml	(revision 600)
+++ WAeUP_SRP/trunk/profiles/default/schemas/academics_search.xml	(revision 600)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<object name="student_search" meta_type="CPS Schema">
+ <field name="review_state" meta_type="CPS String Field"/>
+ <field name="search_mode" meta_type="CPS String Field"/>
+ <field name="search_string" meta_type="CPS String Field"/>
+</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/academics_search_mode.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/academics_search_mode.xml	(revision 600)
+++ WAeUP_SRP/trunk/profiles/default/vocabularies/academics_search_mode.xml	(revision 600)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<object name="search_mode_voc" meta_type="CPS Vocabulary">
+ <property name="title"></property>
+ <property name="title_msgid"></property>
+ <property name="description"></property>
+ <property name="acl_write_roles">Manager</property>
+ <item key="course" msgid="">Course</item>
+ <item key="cert_course" msgid="">Certificate Course</item>
+ <item key="department" msgid="">Department</item>
+</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_academics_states.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_academics_states.xml	(revision 600)
+++ WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_academics_states.xml	(revision 600)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<object name="searchable_review_states_voc" meta_type="CPS Vocabulary">
+ <property name="title"></property>
+ <property name="title_msgid"></property>
+ <property name="description"></property>
+ <property name="acl_write_roles">Manager</property>
+ <item key="all" msgid="">All States</item>
+  <item key="created" msgid="">Data Imported</item>
+  <item key="unchecked" msgid="">unchecked</item>
+  <item key="checked" msgid="">checked</item>
+</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml	(revision 596)
+++ WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml	(revision 600)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<object name="searchable_review_states_voc" meta_type="CPS Vocabulary">
+<object name="searchable_student_states_voc" meta_type="CPS Vocabulary">
  <property name="title"></property>
  <property name="title_msgid"></property>
