Merge lp:~aelkner/schooltool/demo_fields into lp:schooltool/1.7

[Alan Elkner]

[lp:~aelkner/schooltool/demo_fields]

2757. By Alan Elkner <aelkner@ubuntu> on 2011-01-11

updated CHANGES.txt

2758. By Alan Elkner <aelkner@ubuntu> on 2011-01-12

moved resource limit_keys vocab to resource package

2759. By Alan Elkner <aelkner@ubuntu> on 2011-01-12

added functional tests for the limit_keys vocanulary

2760. By Alan Elkner <aelkner@ubuntu> on 2011-01-13

merged from Justus branch

2761. By Alan Elkner <aelkner@ubuntu> on 2011-01-14

added filter_keys method to field description container
used it in generateExtraFields for add/edit person views

2762. By Alan Elkner <aelkner@ubuntu> on 2011-01-17

created group-aware (teacher, student, adinistrator) person add views

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2010-11-23 22:58:23 +0000
+++ CHANGES.txt	2011-01-17 05:56:49 +0000
@@ -12,7 +12,13 @@
 ------------------
 
 - Fixed Section meeting time misalignment in calendar (https://launchpad.net/bugs/611797)
+<<<<<<< TREE
 - Added Bengali and Faroese translations, updated many others
+=======
+- Added BooFieldDescription for boolean demographic fields
+- Added limit_keys list to IFieldDescription and filter_key method to IDemographicsFields
+- Created resource demographics and changed resource views to have demos
+>>>>>>> MERGE-SOURCE
 
 
 1.5.2 (2010-10-04)

=== modified file 'src/schooltool/basicperson/browser/configure.zcml'
--- src/schooltool/basicperson/browser/configure.zcml	2010-09-22 09:40:18 +0000
+++ src/schooltool/basicperson/browser/configure.zcml	2011-01-17 05:56:49 +0000
@@ -3,13 +3,6 @@
            xmlns:zope="http://namespaces.zope.org/zope"
            i18n_domain="schooltool">
 
-  <zope:class class=".demographics.CustomEnumTextWidget">
-    <require
-        permission="zope.Public"
-        interface=".demographics.IEnumTextWidget"
-        />
-  </zope:class>
-
   <page
       name="index.html"
       for="schooltool.basicperson.interfaces.IBasicPerson"
@@ -171,6 +164,13 @@
      menu="schooltool_actions" title="New Date Field" />
 
   <page
+     name="addBool.html"
+     for="schooltool.basicperson.interfaces.IDemographicsFields"
+     class=".demographics.BoolFieldDescriptionAddView"
+     permission="schooltool.edit"
+     menu="schooltool_actions" title="New Yes/No Field" />
+
+  <page
      name="addEnum.html"
      for="schooltool.basicperson.interfaces.IDemographicsFields"
      class=".demographics.EnumFieldDescriptionAddView"
@@ -193,6 +193,13 @@
 
   <page
      name="edit.html"
+     for="schooltool.basicperson.demographics.BoolFieldDescription"
+     class=".demographics.FieldDescriptionEditView"
+     permission="schooltool.edit"
+     menu="schooltool_actions" title="Edit" />
+
+  <page
+     name="edit.html"
      for="schooltool.basicperson.demographics.EnumFieldDescription"
      class=".demographics.EnumFieldDescriptionEditView"
      permission="schooltool.edit"
@@ -214,6 +221,13 @@
 
   <page
      name="index.html"
+     for="schooltool.basicperson.demographics.BoolFieldDescription"
+     class=".demographics.BoolFieldDescriptionView"
+     permission="schooltool.view"
+     menu="schooltool_actions" title="View" />
+
+  <page
+     name="index.html"
      for="schooltool.basicperson.demographics.EnumFieldDescription"
      class=".demographics.EnumFieldDescriptionView"
      permission="schooltool.view"
@@ -229,7 +243,22 @@
       name="absolute_url"/>
 
   <zope:adapter
-      factory=".demographics.CustomEnumDataConverter" />
+      factory="z3c.form.browser.checkbox.CheckBoxFieldWidget"
+      for="schooltool.basicperson.interfaces.FilterKeyList
+           z3c.form.interfaces.IFormLayer"
+      provides="z3c.form.interfaces.IFieldWidget" />
+
+  <zope:adapter
+      factory=".demographics.CustomEnumDataConverter"
+      for="schooltool.basicperson.interfaces.EnumValueList
+           z3c.form.interfaces.ITextAreaWidget"
+      />
+
+  <zope:adapter
+      factory="z3c.form.browser.textarea.TextAreaFieldWidget"
+      for="schooltool.basicperson.interfaces.EnumValueList
+           z3c.form.interfaces.IFormLayer"
+      />
 
   <resourceDirectory
       name="jstree"
@@ -241,4 +270,57 @@
       file="resources/jstree/jquery.min.js"
       layer=".skin.IBasicPersonLayer" />
 
+  <!-- Group-aware add views -->
+  <page
+      name="addTeacher.html"
+      for="schooltool.person.interfaces.IPersonContainer"
+      class=".person.TeacherAddView"
+      permission="schooltool.edit"
+      />
+  <page
+      name="addStudent.html"
+      for="schooltool.person.interfaces.IPersonContainer"
+      class=".person.StudentAddView"
+      permission="schooltool.edit"
+      />
+  <page
+      name="addAdministrator.html"
+      for="schooltool.person.interfaces.IPersonContainer"
+      class=".person.AdministratorAddView"
+      permission="schooltool.edit"
+      />
+
+  <configure package="schooltool.skin">
+    <navigationViewlet
+        name="add_teacher"
+        for="schooltool.person.interfaces.IPersonContainer"
+        manager="schooltool.skin.IActionMenuManager"
+        template="templates/actionsViewlet.pt"
+        class="schooltool.skin.skin.ActionMenuViewlet"
+        permission="schooltool.edit"
+        link="addTeacher.html"
+        title="Add Teacher"
+        />
+    <navigationViewlet
+        name="add_student"
+        for="schooltool.person.interfaces.IPersonContainer"
+        manager="schooltool.skin.IActionMenuManager"
+        template="templates/actionsViewlet.pt"
+        class="schooltool.skin.skin.ActionMenuViewlet"
+        permission="schooltool.edit"
+        link="addStudent.html"
+        title="Add Student"
+        />
+    <navigationViewlet
+        name="add_administrator"
+        for="schooltool.person.interfaces.IPersonContainer"
+        manager="schooltool.skin.IActionMenuManager"
+        template="templates/actionsViewlet.pt"
+        class="schooltool.skin.skin.ActionMenuViewlet"
+        permission="schooltool.edit"
+        link="addAdministrator.html"
+        title="Add Administrator"
+        />
+  </configure>
+
 </configure>

=== modified file 'src/schooltool/basicperson/browser/demographics.py'
--- src/schooltool/basicperson/browser/demographics.py	2010-08-30 16:09:34 +0000
+++ src/schooltool/basicperson/browser/demographics.py	2011-01-17 05:56:49 +0000
@@ -29,41 +29,28 @@
 from zope.container.interfaces import INameChooser
 from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 
-from z3c.form.browser.textarea import TextAreaWidget
 from z3c.form.interfaces import ITextAreaWidget
 from z3c.form import form, field, button
 from z3c.form.converter import BaseDataConverter, FormatterValidationError
-from z3c.form.widget import FieldWidget
 
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.basicperson.demographics import TextFieldDescription
 from schooltool.basicperson.demographics import DateFieldDescription
+from schooltool.basicperson.demographics import BoolFieldDescription
 from schooltool.basicperson.demographics import EnumFieldDescription
 from schooltool.basicperson.interfaces import IEnumFieldDescription
 from schooltool.basicperson.interfaces import IDemographicsFields
 from schooltool.basicperson.interfaces import IFieldDescription
+from schooltool.basicperson.interfaces import EnumValueList
 
 from schooltool.common import format_message
 from schooltool.common import SchoolToolMessage as _
 
 
-class IEnumTextWidget(ITextAreaWidget):
-    """Marker interface for custom enum widget."""
-
-
-class CustomEnumTextWidget(TextAreaWidget):
-    implements(IEnumTextWidget)
-
-
-def CustomEnumFieldTextWidget(field, request):
-    """IFieldWidget factory for CustomEnumTextWidget."""
-    return FieldWidget(field, CustomEnumTextWidget(request))
-
-
 class CustomEnumDataConverter(BaseDataConverter):
     """A special data converter for iso enums."""
 
-    adapts(IList, CustomEnumTextWidget)
+    adapts(EnumValueList, ITextAreaWidget)
 
     def toWidgetValue(self, value):
         """See interfaces.IDataConverter"""
@@ -110,6 +97,8 @@
 class DemographicsView(BrowserView):
     """A Demographics List view."""
 
+    title = _('Demographics Container')
+
     def demographics(self):
         pos = 0
         for demo in list(self.context.values()):
@@ -195,10 +184,21 @@
         self._fd = fd
         return fd
 
+
+class BoolFieldDescriptionAddView(FieldDescriptionAddView):
+
+    def create(self, data):
+        fd = BoolFieldDescription(data['title'],
+                                  str(data['name']),
+                                  data['required'])
+        form.applyChanges(self, fd, data)
+        self._fd = fd
+        return fd
+
+
 class EnumFieldDescriptionAddView(FieldDescriptionAddView):
 
     fields = field.Fields(IEnumFieldDescription)
-    fields['items'].widgetFactory = CustomEnumFieldTextWidget
 
     def create(self, data):
         fd = EnumFieldDescription(data['title'],
@@ -234,7 +234,6 @@
 class EnumFieldDescriptionEditView(FieldDescriptionEditView):
 
     fields = field.Fields(IEnumFieldDescription).omit('name')
-    fields['items'].widgetFactory = CustomEnumFieldTextWidget
 
 
 class FieldDescriptionView(form.DisplayForm):
@@ -255,8 +254,12 @@
     """Display form for a date field description."""
 
 
+class BoolFieldDescriptionView(FieldDescriptionView):
+    """Display form for a bool field description."""
+
+
 class EnumFieldDescriptionView(FieldDescriptionView):
     """Display form for an enum field description."""
 
     fields = field.Fields(IEnumFieldDescription)
-    fields['items'].widgetFactory = CustomEnumFieldTextWidget
+

=== modified file 'src/schooltool/basicperson/browser/ftests/basicperson.txt'
--- src/schooltool/basicperson/browser/ftests/basicperson.txt	2010-11-15 16:05:34 +0000
+++ src/schooltool/basicperson/browser/ftests/basicperson.txt	2011-01-17 05:56:49 +0000
@@ -36,7 +36,7 @@
     >>> manager.getLink('John')
     <Link text='John' url='http://localhost/persons/john'>
 
-    >>> manager.getLink('Administrator', index=1)
+    >>> manager.getLink('Administrator', index=2)
     <Link text='Administrator' url='http://localhost/persons/manager'>
 
 You can filter the list:
@@ -49,7 +49,7 @@
     >>> manager.getLink('John')
     <Link text='John' url='http://localhost/persons/john'>
 
-    >>> manager.getLink('Administrator', index=1)
+    >>> manager.getLink('Administrator', index=2)
     Traceback (most recent call last):
     ...
     LinkNotFoundError

=== modified file 'src/schooltool/basicperson/browser/ftests/demographics.txt'
--- src/schooltool/basicperson/browser/ftests/demographics.txt	2010-05-21 15:45:10 +0000
+++ src/schooltool/basicperson/browser/ftests/demographics.txt	2011-01-17 05:56:49 +0000
@@ -147,6 +147,8 @@
     >>> manager.getLink('Demographics').click()
     >>> manager.getLink('ethnicity').click()
     >>> manager.getLink('Edit').click()
+    >>> print manager.getControl(name='form.widgets.limit_keys:list').value
+    []
     >>> print manager.getControl('List of values').value
     American Indian or Alaska Native
     Asian
@@ -154,15 +156,33 @@
     Native Hawaiian or Other Pacific Islander
     White
 
-Let's make the field required, and add Martians to it:
+Let's make the field required, and add Martians to it.  Also, we'll put limit
+keys into the empty list so that we can test that they get saved:
 
+    >>> manager.getControl(name='form.widgets.limit_keys:list').value = ['students', 'teachers']
     >>> values = manager.getControl('List of values').value.splitlines()
     >>> manager.getControl('List of values').value = "\n".join(values + ['Martians'])
     >>> manager.getControl('yes').click()
     >>> manager.getControl('Apply').click()
 
-Now if we go to the add person form, we should see the additional
-value in the select box, and have the field required:
+Calling the edit form back up, we see that our changes took:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Demographics').click()
+    >>> manager.getLink('ethnicity').click()
+    >>> manager.getLink('Edit').click()
+    >>> print manager.getControl(name='form.widgets.limit_keys:list').value
+    ['students', 'teachers']
+    >>> print manager.getControl('List of values').value
+    American Indian or Alaska Native
+    Asian
+    Black or African American
+    Native Hawaiian or Other Pacific Islander
+    White
+    Martians
+
+When we go to the add person form, we should still not see the additional
+value in the select box as the group is not yet set:
 
     >>> manager.getLink('Manage').click()
     >>> manager.getLink('Persons').click()
@@ -183,9 +203,42 @@
     Confirm password
     ID
     Language
-    Ethnicity *
     Citizenship
 
+However, if we make john a teacher, it will show up when we edit him.
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('John').click()
+    >>> manager.getLink('Groups').click()
+    >>> manager.getControl(name='add_item.teachers').value = 'checked'
+    >>> manager.getControl('Add').click()
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('John').click()
+    >>> manager.getLink('Edit').click()
+    >>> manager.getControl('Ethnicity').displayOptions
+    ['American Indian or Alaska Native',
+     'Asian',
+     'Black or African American',
+     'Native Hawaiian or Other Pacific Islander',
+     'White',
+     'Martians']
+
+When we change the demo to not have a limit_key, then it will show when we add
+a new person:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Demographics').click()
+    >>> manager.getLink('ethnicity').click()
+    >>> manager.getLink('Edit').click()
+    >>> manager.getControl(name='form.widgets.limit_keys:list').value = []
+    >>> manager.getControl('Apply').click()
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('New Person').click()
     >>> manager.getControl('Ethnicity').displayOptions
     ['American Indian or Alaska Native',
      'Asian',
@@ -217,6 +270,36 @@
      'Martians',
      'N\xc3\xb6rds']
 
+Boolean fields are available, so we'll create one called 'certified' and test
+the values in the display view:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Demographics').click()
+    >>> manager.getLink('New Yes/No Field').click()
+    >>> manager.getControl('Title').value = "Certified"
+    >>> manager.getControl('ID').value = "certified"
+    >>> manager.getControl(name='form.widgets.required:list').value = ['true']
+    >>> manager.getControl('Add').click()
+
+    >>> manager.printQuery('//span[@id="form-widgets-title"]')
+    <span id="form-widgets-title" class="text-widget required textline-field">Certified</span>
+    >>> manager.printQuery('//span[@id="form-widgets-name"]')
+    <span id="form-widgets-name" class="text-widget required pythonidentifier-field">certified</span>
+    >>> manager.printQuery('//span[@id="form-widgets-required"]//span')
+    <span class="selected-option">yes</span>
+
+Now when we add a new person, the new 'Certified' field appears as a boolean
+radio field:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('New Person').click()
+
+    >>> manager.printQuery('//input[@id="form-widgets-certified-0"]')
+    <input id="form-widgets-certified-0" ... value="true" type="radio" />
+    >>> manager.printQuery('//input[@id="form-widgets-certified-1"]')
+    <input id="form-widgets-certified-1" ... value="false" type="radio" />
+
 TODO
 Test values being unset if you remove a field
 Test export

=== added file 'src/schooltool/basicperson/browser/ftests/group_aware.txt'
--- src/schooltool/basicperson/browser/ftests/group_aware.txt	1970-01-01 00:00:00 +0000
+++ src/schooltool/basicperson/browser/ftests/group_aware.txt	2011-01-17 05:56:49 +0000
@@ -0,0 +1,123 @@
+Group-aware add views
+=====================
+
+A manager logs in
+
+    >>> manager = Browser('manager', 'schooltool')
+
+    >>> from schooltool.app.browser.ftests import setup
+    >>> setup.setUpBasicSchool()
+
+Let's change some of the default demographics fields to be group-specific:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Demographics').click()
+    >>> manager.getLink('ethnicity').click()
+    >>> manager.getLink('Edit').click()
+    >>> manager.getControl(name='form.widgets.limit_keys:list').value = ['students']
+    >>> manager.getControl('Apply').click()
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Demographics').click()
+    >>> manager.getLink('language').click()
+    >>> manager.getLink('Edit').click()
+    >>> manager.getControl(name='form.widgets.limit_keys:list').value = ['teachers']
+    >>> manager.getControl('Apply').click()
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Demographics').click()
+    >>> manager.getLink('citizenship').click()
+    >>> manager.getLink('Edit').click()
+    >>> manager.getControl(name='form.widgets.limit_keys:list').value = ['administrators']
+    >>> manager.getControl('Apply').click()
+
+Adding a student will have only student demos:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('Add Student').click()
+    >>> manager.printQuery('//fieldset[@id="demo-data"]/div[@class="row"]/div[@class="label"]//span/text()')
+    ID
+    Ethnicity
+    Place of birth
+
+    >>> manager.getControl('First name').value = "John"
+    >>> manager.getControl('Last name').value = "Petterson"
+    >>> manager.getControl('Gender').value = ['male']
+    >>> manager.getControl('Birth date').value = '1980-01-01'
+    >>> manager.getControl('Username').value = "john"
+    >>> manager.getControl('Password').value = "pwd"
+    >>> manager.getControl('Confirm password').value = "pwd"
+
+    >>> manager.getControl('ID').value = "001122"
+    >>> manager.getControl('Ethnicity').displayValue = ['Black or African American']
+    >>> manager.getControl('Place of birth').value = "South Hampton"
+    >>> manager.getControl('Add').click()
+
+    >>> manager.printQuery('//span[@id="form-widgets-ID"]/text()')
+    001122
+    >>> manager.printQuery('//span[@id="form-widgets-ethnicity"]/span/text()')
+    Black or African American
+    >>> manager.printQuery('//span[@id="form-widgets-placeofbirth"]/text()')
+    South Hampton
+
+Adding a teacher will have only teacher demos:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('Add Teacher').click()
+    >>> manager.printQuery('//fieldset[@id="demo-data"]/div[@class="row"]/div[@class="label"]//span/text()')
+    ID
+    Language
+    Place of birth
+
+    >>> manager.getControl('First name').value = "Bob"
+    >>> manager.getControl('Last name').value = "Hall"
+    >>> manager.getControl('Gender').value = ['male']
+    >>> manager.getControl('Birth date').value = '1980-01-01'
+    >>> manager.getControl('Username').value = "bhall"
+    >>> manager.getControl('Password').value = "pwd"
+    >>> manager.getControl('Confirm password').value = "pwd"
+
+    >>> manager.getControl('ID').value = "987654"
+    >>> manager.getControl('Language').value = "French"
+    >>> manager.getControl('Place of birth').value = "Boston"
+    >>> manager.getControl('Add').click()
+
+    >>> manager.printQuery('//span[@id="form-widgets-ID"]/text()')
+    987654
+    >>> manager.printQuery('//span[@id="form-widgets-language"]/text()')
+    French
+    >>> manager.printQuery('//span[@id="form-widgets-placeofbirth"]/text()')
+    Boston
+
+Adding an administrator will have only administrator demos:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('Add Administrator').click()
+    >>> manager.printQuery('//fieldset[@id="demo-data"]/div[@class="row"]/div[@class="label"]//span/text()')
+    ID
+    Place of birth
+    Citizenship
+
+    >>> manager.getControl('First name').value = "Jane"
+    >>> manager.getControl('Last name').value = "Brown"
+    >>> manager.getControl('Gender').value = ['male']
+    >>> manager.getControl('Birth date').value = '1980-01-01'
+    >>> manager.getControl('Username').value = "jbrown"
+    >>> manager.getControl('Password').value = "pwd"
+    >>> manager.getControl('Confirm password').value = "pwd"
+
+    >>> manager.getControl('ID').value = "123456"
+    >>> manager.getControl('Place of birth').value = "Miami"
+    >>> manager.getControl('Citizenship').value = 'Spain'
+    >>> manager.getControl('Add').click()
+
+    >>> manager.printQuery('//span[@id="form-widgets-ID"]/text()')
+    123456
+    >>> manager.printQuery('//span[@id="form-widgets-placeofbirth"]/text()')
+    Miami
+    >>> manager.printQuery('//span[@id="form-widgets-citizenship"]/text()')
+    Spain
+

=== modified file 'src/schooltool/basicperson/browser/person.py'
--- src/schooltool/basicperson/browser/person.py	2010-11-15 16:06:20 +0000
+++ src/schooltool/basicperson/browser/person.py	2011-01-17 05:56:49 +0000
@@ -37,7 +37,9 @@
 
 from schooltool.app.browser.app import RelationshipViewBase
 from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.group.interfaces import IGroupContainer
 from schooltool.person.interfaces import IPersonFactory
+from schooltool.schoolyear.interfaces import ISchoolYearContainer
 
 from schooltool.basicperson.interfaces import IDemographicsFields
 from schooltool.basicperson.interfaces import IBasicPerson
@@ -135,7 +137,11 @@
     def generateExtraFields(self):
         field_descriptions = IDemographicsFields(ISchoolToolApplication(None))
         fields = field.Fields()
-        for field_desc in field_descriptions.values():
+        if IBasicPerson.providedBy(self.context):
+            limit_keys = [group.__name__ for group in self.context.groups]
+        else:
+            limit_keys = []
+        for field_desc in field_descriptions.filter_keys(limit_keys):
             fields += field_desc.makeField()
         return fields
 
@@ -458,3 +464,120 @@
     def getCollection(self):
         return self.context.advisees
 
+
+###############  Base class of all group-aware add views ################
+class PersonAddViewBase(PersonAddFormBase):
+
+    id = 'person-form'
+    template = ViewPageTemplateFile('templates/person_form.pt')
+
+    def makeRows(self, fields, cols=1):
+        rows = []
+        while fields:
+            rows.append(fields[:cols])
+            fields = fields[cols:]
+        return rows
+
+    def makeFieldSet(self, fieldset_id, legend, fields, cols=1):
+        result = {
+            'id': fieldset_id,
+            'legend': legend,
+            }
+        result['rows'] = self.makeRows(fields, cols)
+        return result
+
+    def fieldsets(self):
+        result = []
+        sources = [
+            (self.base_id, self.base_legend, list(self.getBaseFields())),
+            (self.demo_id, self.demo_legend, list(self.getDemoFields())),
+            ]
+        for fieldset_id, legend, fields in sources:
+            result.append(self.makeFieldSet(fieldset_id, legend, fields, 2))
+        return result
+
+    def getDemoFields(self):
+        fields = field.Fields()
+        dfs = IDemographicsFields(ISchoolToolApplication(None))
+        for field_desc in dfs.filter_key(self.group_id):
+            fields += field_desc.makeField()
+        return fields
+
+    def getBaseFields(self):
+        return field.Fields(IPersonAddForm).omit('group')
+
+    def groupViewURL(self):
+        return '%s/%s.html' % (absoluteURL(self.context, self.request),
+                               self.group_id)
+
+    def updateActions(self):
+        super(PersonAddViewBase, self).updateActions()
+        self.actions['add'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+    @button.buttonAndHandler(_('Add'))
+    def handleAdd(self, action):
+        super(PersonAddViewBase, self).handleAdd.func(self, action)
+
+    @button.buttonAndHandler(_('Cancel'))
+    def handle_cancel_action(self, action):
+        self.request.response.redirect(self.groupViewURL())
+
+    def create(self, data):
+        username = data.get('username')
+        first_name = data.get('first_name')
+        last_name = data.get('last_name')
+        person = self._factory(username, first_name, last_name)
+        data.pop('confirm')
+        form.applyChanges(self, person, data)
+        group = None
+        syc = ISchoolYearContainer(ISchoolToolApplication(None))
+        active_schoolyear = syc.getActiveSchoolYear()
+        if active_schoolyear is not None:
+            group = IGroupContainer(active_schoolyear).get(self.group_id)
+        if group is not None:
+            person.groups.add(group)
+        self._person = person
+        return person
+
+    def update(self):
+        self.fields = self.getBaseFields()
+        self.fields += self.getDemoFields()
+        self.updateWidgets()
+        self.updateActions()
+        self.actions.execute()
+
+    def updateWidgets(self):
+        super(PersonAddViewBase, self).updateWidgets()
+
+
+###############  Group-aware add views ################
+class TeacherAddView(PersonAddViewBase):
+
+    group_id = 'teachers'
+    base_id = 'base-data'
+    base_legend = _('Teacher identification')
+    demo_id = 'demo-data'
+    demo_legend = _('Teacher demographics')
+    label = _('Add new teacher')
+
+
+class StudentAddView(PersonAddViewBase):
+
+    group_id = 'students'
+    base_id = 'base-data'
+    base_legend = _('Student identification')
+    demo_id = 'demo-data'
+    demo_legend = _('Student demographics')
+    label = _('Add new student')
+
+
+class AdministratorAddView(PersonAddViewBase):
+
+    group_id = 'administrators'
+    base_id = 'base-data'
+    base_legend = _('Administrator identification')
+    demo_id = 'demo-data'
+    demo_legend = _('Administrator demographics')
+    label = _('Add new administrator')
+

=== modified file 'src/schooltool/basicperson/browser/templates/demographics-view.pt'
--- src/schooltool/basicperson/browser/templates/demographics-view.pt	2009-10-25 01:13:33 +0000
+++ src/schooltool/basicperson/browser/templates/demographics-view.pt	2011-01-17 05:56:49 +0000
@@ -1,10 +1,10 @@
 <tal:dummy condition="view/update"> </tal:dummy>
 <html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
 <head>
-  <title metal:fill-slot="title" i18n:translate="">Demographics Container</title>
+  <title metal:fill-slot="title" tal:content="view/title" />
 </head>
 <body>
-<h1 metal:fill-slot="content-header" i18n:translate="">Demographics Container</h1>
+<h1 metal:fill-slot="content-header" tal:content="view/title" />
 
 <metal:block metal:fill-slot="body">
 

=== added file 'src/schooltool/basicperson/browser/templates/person_form.pt'
--- src/schooltool/basicperson/browser/templates/person_form.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/basicperson/browser/templates/person_form.pt	2011-01-17 05:56:49 +0000
@@ -0,0 +1,138 @@
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+  <body>
+    <metal:nothing metal:fill-slot="content-header" />
+    <metal:block metal:fill-slot="body">
+      <form action="." method="post" enctype="multipart/form-data" class="standalone"
+            metal:define-macro="form"
+            tal:attributes="method view/method;
+                            enctype view/enctype;
+                            acceptCharset view/acceptCharset;
+                            accept view/accept;
+                            action view/action;
+                            name view/name;
+                            id view/id">
+        <metal:subform define-macro="subform">
+          <div class="viewspace" metal:define-slot="viewspace">
+            <metal:label define-slot="label">
+              <h3 metal:define-macro="form-label"
+                  tal:condition="view/label|nothing"
+                  tal:content="view/label">
+                Form Label
+              </h3>
+            </metal:label>
+            <metal:info define-slot="info">
+              <div class="required-info"
+                   metal:define-macro="required-info">
+                <!--<span class="required">*</span>
+                    &ndash; required -->
+              </div>
+            </metal:info>
+            <metal:header define-slot="header">
+              <div class="status"
+                   tal:condition="view/status"
+                   metal:define-macro="form-header">
+                <div class="summary"
+                     i18n:translate=""
+                     tal:content="view/status">
+                  Form status summary
+                </div>
+                <ul class="errors"
+                    tal:define="errors view/errors|view/widgets/errors"
+                    tal:condition="errors"
+                    metal:define-macro="form-errors">
+                  <li tal:repeat="error errors">
+                    <tal:block condition="error/widget">
+                      <span tal:replace="error/widget/label" />:
+                    </tal:block>
+                    <span tal:replace="structure error/render">Error Type</span>
+                  </li>
+                </ul>
+              </div>
+            </metal:header>
+            <div metal:define-slot="extra-info" tal:replace="nothing">
+            </div>
+            <div metal:define-slot="main">
+              <metal:widget-rows define-macro="widget-rows">
+                <tal:loop repeat="fieldset view/fieldsets">
+                  <fieldset tal:attributes="id fieldset/id">
+                    <legend tal:content="fieldset/legend">legend</legend>
+                    <tal:loop repeat="row fieldset/rows">
+                      <tal:block repeat="widget_id row">
+                        <metal:block tal:define="widget python:view.widgets[widget_id]">
+                          <div id="" class="row"
+                               tal:attributes="id string:${widget/id}-row"
+                               tal:condition="python:widget.mode != 'hidden'">
+                            <metal:widget-row define-macro="widget-row">
+                              <div class="label">
+                                <label tal:attributes="for widget/id">
+                                  <span i18n:translate=""
+                                        tal:content="widget/label">label</span>
+                                  <span class="required"
+                                        tal:condition="widget/required">*</span>
+                                </label>
+                              </div>
+                              <p class="hint" tal:content="widget/field/description">Description of this field.</p>
+                              <div class="widget" tal:content="structure widget/render">
+                                <input type="text" size="24" value="" />
+                              </div>
+                              <div class="error"
+                                   tal:condition="widget/error">
+                                <span tal:replace="structure widget/error/render">error</span>
+                              </div>
+                            </metal:widget-row>
+                          </div>
+                          <input type="hidden" value=""
+                                 tal:condition="python:widget.mode == 'hidden'"
+                                 tal:replace="structure widget/render" />
+                        </metal:block>
+                      </tal:block>
+                      <br class="clearboth" />
+                    </tal:loop>
+                    <div metal:define-slot="extra-widgets" tal:replace="nothing">
+                    </div>
+                  </fieldset>
+                </tal:loop>
+              </metal:widget-rows>
+              <metal:groups define-macro="groups">
+                <fieldset tal:condition="view/groups|nothing"
+                          tal:repeat="view view/groups">
+                  <legend tal:condition="view/label"
+                          tal:content="view/label">Label</legend>
+                  <metal:group-header define-slot="group-header">
+                    <div class="status"
+                         tal:condition="view/widgets/errors">
+                      <div metal:use-macro="template/macros/errors" />
+                    </div>
+                  </metal:group-header>
+                  <metal:group-rows define-slot="group-rows">
+                    <div metal:use-macro="template/macros/widget-rows" />
+                  </metal:group-rows>
+                </fieldset>
+              </metal:groups>
+            </div>
+            <metal:above-buttons define-slot="above-buttons">
+              <tal:block
+                  repeat="form view/subforms"
+                  content="structure form/render"
+                  condition="view/subforms|nothing" />
+            </metal:above-buttons>
+          </div>
+          <metal:buttons define-slot="buttons">
+            <div metal:define-macro="form-buttons">
+              <div class="buttons controls"
+                   metal:define-slot="bottom-buttons">
+                <tal:block condition="view/actions|nothing">
+                  <input tal:repeat="action view/actions/values"
+                         tal:replace="structure action/render"
+                         />
+                </tal:block>
+              </div>
+            </div>
+          </metal:buttons>
+          <metal:bottom define-slot="bottom">
+          </metal:bottom>
+        </metal:subform>
+      </form>
+    </metal:block>
+  </body>
+</html>

=== modified file 'src/schooltool/basicperson/configure.zcml'
--- src/schooltool/basicperson/configure.zcml	2010-08-08 12:06:54 +0000
+++ src/schooltool/basicperson/configure.zcml	2011-01-17 05:56:49 +0000
@@ -52,6 +52,13 @@
              set_schema="schooltool.basicperson.interfaces.IFieldDescription" />
   </class>
 
+  <class class=".demographics.BoolFieldDescription">
+    <allow interface="zope.location.interfaces.ILocation" />
+    <allow interface="schooltool.basicperson.interfaces.IFieldDescription" />
+    <require permission="schooltool.edit"
+             set_schema="schooltool.basicperson.interfaces.IFieldDescription" />
+  </class>
+
   <class class=".demographics.EnumFieldDescription">
     <allow interface="zope.location.interfaces.ILocation" />
     <allow interface="schooltool.basicperson.interfaces.IEnumFieldDescription" />
@@ -74,6 +81,14 @@
      provides="zope.schema.interfaces.IVocabularyFactory"
      name="schooltool.basicperson.advisor_vocabulary" />
 
+  <utility
+     factory=".vocabularies.LimitKeyVocabFactory"
+     provides="zope.schema.interfaces.IVocabularyFactory"
+     name="schooltool.basicperson.limit_keys_vocabulary" />
+
+  <adapter factory=".vocabularies.getLimitKeyVocabularyForFieldDescription" />
+  <adapter factory=".vocabularies.getLimitKeyVocabularyForPersonFields" />
+
   <include package="schooltool.basicperson.browser" />
 
   <adapter factory=".demographics.getPersonDemographics" />

=== modified file 'src/schooltool/basicperson/demographics.py'
--- src/schooltool/basicperson/demographics.py	2010-08-30 09:15:43 +0000
+++ src/schooltool/basicperson/demographics.py	2011-01-17 05:56:49 +0000
@@ -24,7 +24,7 @@
 
 from zope.schema._field import Choice
 from zope.schema._field import Date
-from zope.schema import TextLine
+from zope.schema import TextLine, Bool
 from zope.location.location import Location
 from zope.location.location import locate
 from zope.interface import Interface
@@ -113,6 +113,25 @@
 class DemographicsFields(OrderedContainer):
     implements(IDemographicsFields)
 
+    def filter_key(self, key):
+        """Return the subset of fields whose limited_keys list is either
+           empty, or it contains the key passed."""
+        result = []
+        for field in self.values():
+            if not field.limit_keys or key in field.limit_keys:
+                result.append(field)
+        return result
+
+    def filter_keys(self, keys):
+        """Return the subset of fields whose limited_keys list is either
+           empty, or it contains one of the keys passed."""
+        result = []
+        for field in self.values():
+            limit_keys = field.limit_keys
+            if not limit_keys or [key for key in keys if key in limit_keys]:
+                result.append(field)
+        return result
+
 
 def setUpDefaultDemographics(app):
     dfs = DemographicsFields()
@@ -152,9 +171,11 @@
 
 class FieldDescription(Persistent, Location):
     implements(IFieldDescription)
+    limit_keys = []
 
-    def __init__(self, name, title, required=False):
-        self.name, self.title,self.required = name, title, required
+    def __init__(self, name, title, required=False, limit_keys=[]):
+        self.name, self.title, self.required, self.limit_keys = (name,
+            title, required, limit_keys)
 
     def setUpField(self, form_field):
         form_field.required = self.required
@@ -202,3 +223,10 @@
 
     def makeField(self):
         return self.setUpField(TextLine(title=unicode(self.title)))
+
+
+class BoolFieldDescription(FieldDescription):
+
+    def makeField(self):
+        return self.setUpField(Bool(title=unicode(self.title)))
+

=== modified file 'src/schooltool/basicperson/interfaces.py'
--- src/schooltool/basicperson/interfaces.py	2010-08-08 12:06:54 +0000
+++ src/schooltool/basicperson/interfaces.py	2011-01-17 05:56:49 +0000
@@ -21,7 +21,7 @@
 """
 from zope.container.interfaces import IContainer
 from zope.container.interfaces import IOrderedContainer
-from zope.schema import Date, Choice, TextLine, Bool
+from zope.schema import Date, Choice, TextLine, Bool, List, Set
 from zope.configuration.fields import PythonIdentifier
 from zope.interface import Interface, Attribute
 
@@ -113,6 +113,18 @@
 class IDemographicsFields(IOrderedContainer):
     """Demographics field storage."""
 
+    def filter_key(key):
+        """Return the subset of fields whose limited_keys list is either
+           empty, or it contains the key passed"""
+
+    def filter_keys(keys):
+        """Return the subset of fields whose limited_keys list is either
+           empty, or it contains one of the keys passed"""
+
+
+class FilterKeyList(List):
+    """Marker field to pin widgets on."""
+
 
 class IFieldDescription(Interface):
     """Demographics field."""
@@ -129,9 +141,30 @@
         title = _(u"Required"),
         description = _(u"Whether this Field is required or not"))
 
+    limit_keys = FilterKeyList(
+        title = _(u"Limit keys"),
+        description = _(u"An optional list of limit keys for this field"),
+        value_type=Choice(
+            title=_(u"Limit key"),
+            source="schooltool.basicperson.limit_keys_vocabulary",
+            required=True,
+            ),
+        required=False)
+
+
+class EnumValueList(List):
+    """Marker field to pin custom validation on."""
+
 
 class IEnumFieldDescription(IFieldDescription):
     """Enumeration demographics field."""
 
-    items = List(
+    items = EnumValueList(
         title = _('List of values'))
+
+
+class IFieldFilterVocabulary(IVocabularyTokenized):
+    """Marker interface for vocabularies that give keys that are used
+    to filder demographics fields for the context.
+    """
+

=== modified file 'src/schooltool/basicperson/tests/test_demographics.py'
--- src/schooltool/basicperson/tests/test_demographics.py	2010-01-10 17:31:54 +0000
+++ src/schooltool/basicperson/tests/test_demographics.py	2011-01-17 05:56:49 +0000
@@ -31,6 +31,7 @@
 from schooltool.basicperson.demographics import setUpDefaultDemographics
 from schooltool.basicperson.demographics import IDemographicsForm
 from schooltool.basicperson.demographics import TextFieldDescription
+from schooltool.basicperson.demographics import BoolFieldDescription
 from schooltool.basicperson.demographics import PersonDemographicsData
 from schooltool.schoolyear.testing import (setUp, tearDown,
                                            provideStubUtility,
@@ -140,6 +141,65 @@
     """
 
 
+def doctest_DemographicsFields():
+    """Tests for DemographicsFields
+
+    DemographicsFields is a class that contains demo fields that themselves
+    may or may not be limited to a group or groups.
+
+        >>> dfs = IDemographicsFields(ISchoolToolApplication(None))
+        >>> dfs['email'] = TextFieldDescription("email", "Email")
+        >>> dfs['supervisor'] = TextFieldDescription("supervisor", "Supervisor",
+        ...     limit_keys=['teachers'])
+        >>> dfs['advisor'] = TextFieldDescription("advisor", "Advisor",
+        ...     limit_keys=['students'])
+        >>> dfs['phone'] = TextFieldDescription("phone", "Phone",
+        ...     limit_keys=['teachers', 'students'])
+
+
+    When we pass the filter_key method a key that does not belong
+    to any of the limit_keys lists, then it will only return those
+    fields that have empty limit_keys lists.
+
+        >>> [f.__name__ for f in dfs.filter_key('anything')]
+        [u'ID', u'ethnicity', u'language', u'placeofbirth', u'citizenship',
+                u'email']
+
+    When we pass 'teachers', it picks up the additional fields that are for
+    teachers.
+
+        >>> [f.__name__ for f in dfs.filter_key('teachers')]
+        [u'ID', u'ethnicity', u'language', u'placeofbirth', u'citizenship',
+                u'email', u'supervisor', u'phone']
+
+    When we pass 'students', it picks up the additional fields that are for
+    students.
+
+        >>> [f.__name__ for f in dfs.filter_key('students')]
+        [u'ID', u'ethnicity', u'language', u'placeofbirth', u'citizenship',
+                u'email', u'advisor', u'phone']
+
+    We also have a filter_keys method to return fields whose keys are in the
+    list passed.
+
+        >>> [f.__name__ for f in dfs.filter_keys([])]
+        [u'ID', u'ethnicity', u'language', u'placeofbirth', u'citizenship',
+                u'email']
+
+        >>> [f.__name__ for f in dfs.filter_keys(['students'])]
+        [u'ID', u'ethnicity', u'language', u'placeofbirth', u'citizenship',
+                u'email', u'advisor', u'phone']
+
+        >>> [f.__name__ for f in dfs.filter_keys(['teachers'])]
+        [u'ID', u'ethnicity', u'language', u'placeofbirth', u'citizenship',
+                u'email', u'supervisor', u'phone']
+
+        >>> [f.__name__ for f in dfs.filter_keys(['students', 'teachers'])]
+        [u'ID', u'ethnicity', u'language', u'placeofbirth', u'citizenship',
+                u'email', u'supervisor', u'advisor', u'phone']
+    """
+
+
 def doctest_EnumFieldDescription():
     """Tests for EnumFieldDescription
 
@@ -194,6 +254,33 @@
     """
 
 
+def doctest_BoolFieldDescription():
+    """Tests for BoolFieldDescription
+
+    Boolean field description is a class that defines a boolean field shown
+    in person add/edit form.
+
+       >>> fd = BoolFieldDescription("ID", "ID")
+       >>> fields = fd.makeField()
+       >>> len(fields)
+       1
+
+       >>> field = fields['ID']
+       >>> field
+       <Field 'ID'>
+
+       >>> field.interface
+       <InterfaceClass schooltool.basicperson.demographics.IDemographicsForm>
+
+       >>> field.field
+       <zope.schema._bootstrapfields.Bool object at ...>
+
+       >>> field.__name__
+       'ID'
+
+    """
+
+
 def doctest_DateFieldDescription():
     """Tests for DateFieldDescription
 

=== modified file 'src/schooltool/basicperson/vocabularies.py'
--- src/schooltool/basicperson/vocabularies.py	2010-08-08 12:06:54 +0000
+++ src/schooltool/basicperson/vocabularies.py	2011-01-17 05:56:49 +0000
@@ -20,9 +20,12 @@
 Sources and vocabularies for form fields.
 """
 from zope.interface import implements
+from zope.interface import implementer
+from zope.component import adapter
 from zope.schema.interfaces import ITitledTokenizedTerm
 
 from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.app.utils import vocabulary
 from schooltool.person.interfaces import IPerson
 from schooltool.group.interfaces import IGroupContainer
 from schooltool.group.interfaces import IGroup
@@ -31,6 +34,11 @@
 from schooltool.basicperson.browser.person import GroupTerm
 from schooltool.basicperson.interfaces import IGroupVocabulary
 from schooltool.basicperson.interfaces import IBasicPersonVocabulary
+from schooltool.basicperson.interfaces import IDemographicsFields
+from schooltool.basicperson.interfaces import IFieldDescription
+from schooltool.basicperson.interfaces import IFieldFilterVocabulary
+
+from schooltool.common import SchoolToolMessage as _
 
 
 class Term(object):
@@ -115,3 +123,25 @@
 
 def advisorVocabularyFactory():
     return AdvisorVocabulary
+
+
+def LimitKeyVocabFactory():
+    return IFieldFilterVocabulary
+
+
+@adapter(IFieldDescription)
+@implementer(IFieldFilterVocabulary)
+def getLimitKeyVocabularyForFieldDescription(field_description):
+    field_container = field_description.__parent__
+    return IFieldFilterVocabulary(field_container)
+
+
+@adapter(IDemographicsFields)
+@implementer(IFieldFilterVocabulary)
+def getLimitKeyVocabularyForPersonFields(person_field_description_container):
+     return vocabulary([
+        ('students', _('Students')),
+        ('teachers', _('Teachers')),
+        ('administrators', _('Administrators')),
+        ])
+

=== modified file 'src/schooltool/resource/browser/configure.zcml'
--- src/schooltool/resource/browser/configure.zcml	2009-11-23 14:48:29 +0000
+++ src/schooltool/resource/browser/configure.zcml	2011-01-17 05:56:49 +0000
@@ -1,8 +1,31 @@
 <?xml version="1.0"?>
 <configure xmlns="http://namespaces.zope.org/browser"
+    xmlns:z3c="http://namespaces.zope.org/z3c"
            xmlns:zope="http://namespaces.zope.org/zope"
            i18n_domain="schooltool">
 
+  <zope:class class=".resource.ResourceSubTypeWidget">
+    <require
+        permission="zope.Public"
+        interface="z3c.form.interfaces.ITextWidget"
+        />
+  </zope:class>
+
+  <zope:adapter
+      factory=".resource.ResourceSubTypeFieldWidget"
+      provides="z3c.form.interfaces.IFieldWidget"
+      for="schooltool.resource.interfaces.ResourceSubType
+           z3c.form.interfaces.IFormLayer"
+      />
+
+  <z3c:widgetTemplate
+      mode="input"
+      widget=".resource.IResourceSubTypeWidget"
+      layer="z3c.form.interfaces.IFormLayer"
+      template="subtype_widget.pt"
+      />
+
+
   <!-- Resource Traverser -->
   <zope:view
       for="..interfaces.IBaseResource"
@@ -58,6 +81,29 @@
       />
 
   <configure package="schooltool.skin">
+    <navigationViewlet
+      name="resources"
+      for="*"
+      manager="schooltool.app.browser.interfaces.IManageMenuViewletManager"
+      template="templates/navigationViewlet.pt"
+      class="schooltool.skin.TopLevelContainerNavigationViewlet"
+      permission="schooltool.view"
+      link="resources"
+      title="Resources"
+      order="60"
+      />
+
+    <navigationViewlet
+      name="resource_demographics"
+      for="*"
+      manager="schooltool.app.browser.interfaces.IManageMenuViewletManager"
+      template="templates/navigationViewlet.pt"
+      class="schooltool.skin.skin.NavigationViewlet"
+      permission="schooltool.edit"
+      link="resource_demographics"
+      title="Resource Demographics"
+      order="65"
+      />
 
     <page
         name="index.html"
@@ -67,147 +113,14 @@
         menu="zmi_views"
         title="View"
         />
-
-    <addform
-        label="Add a Resource"
-        name="addSchoolToolResource.html"
-        schema="schooltool.resource.interfaces.IResource"
-        fields="title description notes"
-        set_before_add="title description notes"
-        content_factory="schooltool.resource.resource.Resource"
-        template="templates/simple_add.pt"
-        class="schooltool.app.browser.app.BaseAddView"
-        permission="schooltool.edit">
-      <widget field="description" height="5" />
-    </addform>
-
-    <editform
-        for="schooltool.resource.interfaces.IResource"
-        name="edit.html"
-        label="Edit Resource Information"
-        schema="schooltool.resource.interfaces.IResource"
-        fields="title description notes"
-        permission="schooltool.edit"
-        template="templates/simple_edit.pt"
-        class="schooltool.resource.browser.resource.ResourceEditView"
-        menu="schooltool_actions"
-        title="Edit Info">
-      <widget field="description" height="5" />
-    </editform>
-
-    <!-- Location forms -->
-    <addform
-        label="Add a Location"
-        name="addSchoolToolLocation.html"
-        schema="schooltool.resource.interfaces.ILocation"
-        fields="title type description capacity notes"
-        set_before_add="title type description capacity notes"
-        content_factory="schooltool.resource.resource.Location"
-        template="templates/simple_add.pt"
-        class="schooltool.app.browser.app.BaseAddView"
-        permission="schooltool.edit">
-      <widget field="description" height="5" />
-      <widget field="type"
-          class="schooltool.resource.browser.resource.ResourceSubTypeWidget"
-          utility="location"/>
-    </addform>
-
-    <editform
-        for="schooltool.resource.interfaces.ILocation"
-        name="edit.html"
-        label="Edit Location Information"
-        schema="schooltool.resource.interfaces.ILocation"
-        fields="title type description capacity notes"
-        permission="schooltool.edit"
-        template="templates/simple_edit.pt"
-        class="schooltool.resource.browser.resource.ResourceEditView"
-        menu="schooltool_actions"
-        title="Edit Info">
-      <widget field="description" height="5" />
-      <widget field="type"
-          class="schooltool.resource.browser.resource.ResourceSubTypeWidget"
-          utility="location"/>
-    </editform>
-
-    <!-- Equipment forms -->
-    <addform
-        label="Add an Equipment"
-        name="addSchoolToolEquipment.html"
-        schema="schooltool.resource.interfaces.IEquipment"
-        fields="title description type manufacturer model serialNumber
-                purchaseDate notes"
-        set_before_add="title description notes type manufacturer model
-                        serialNumber purchaseDate"
-        content_factory="schooltool.resource.resource.Equipment"
-        template="templates/simple_add.pt"
-        class="schooltool.app.browser.app.BaseAddView"
-        permission="schooltool.edit">
-      <widget field="description" height="5" />
-      <widget field="type"
-          class="schooltool.resource.browser.resource.ResourceSubTypeWidget"
-          utility="equipment"/>
-    </addform>
-
-    <editform
-        for="schooltool.resource.interfaces.IEquipment"
-        name="edit.html"
-        label="Edit Equipment Information"
-        schema="schooltool.resource.interfaces.IEquipment"
-        fields="title description type manufacturer model serialNumber
-                purchaseDate notes"
-        permission="schooltool.edit"
-        template="templates/simple_edit.pt"
-        class="schooltool.resource.browser.resource.ResourceEditView"
-        menu="schooltool_actions"
-        title="Edit Info">
-      <widget field="description" height="5" />
-      <widget field="type"
-          class="schooltool.resource.browser.resource.ResourceSubTypeWidget"
-          utility="equipment"/>
-    </editform>
-
-    <navigationViewlet
-      name="resources"
-      for="*"
-      manager="schooltool.app.browser.interfaces.IManageMenuViewletManager"
-      template="templates/navigationViewlet.pt"
-      class="schooltool.skin.TopLevelContainerNavigationViewlet"
-      permission="schooltool.view"
-      link="resources"
-      title="Resources"
-      order="60"
-      />
-
   </configure>
 
-
   <containerViews
       for="..interfaces.IResourceContainer"
       contents="schooltool.view"
       add="schooltool.edit"
       />
 
-  <menuItem
-      menu="schooltool_actions"
-      title="New Resource"
-      for="..interfaces.IResourceContainer"
-      action="+/addSchoolToolResource.html"
-      />
-
-  <menuItem
-      menu="schooltool_actions"
-      title="New Location"
-      for="..interfaces.IResourceContainer"
-      action="+/addSchoolToolLocation.html"
-      />
-
-  <menuItem
-      menu="schooltool_actions"
-      title="New Equipment"
-      for="..interfaces.IResourceContainer"
-      action="+/addSchoolToolEquipment.html"
-      />
-
   <page
       name="index.html"
       for="..interfaces.IResource"
@@ -302,4 +215,117 @@
       order="5"
       />
 
+  <zope:adapterTraverserPlugin
+     for="schooltool.app.interfaces.ISchoolToolApplication"
+     layer="zope.publisher.interfaces.http.IHTTPRequest"
+     name="resource_demographics"
+     adapter="schooltool.resource.interfaces.IResourceDemographicsFields"
+     permission="zope.Public"
+     />
+
+  <zope:configure package="schooltool.basicperson.browser">
+    <page
+       name="index.html"
+       for="schooltool.resource.interfaces.IResourceDemographicsFields"
+       class="schooltool.resource.browser.resource.ResourceDemographicsView"
+       template="templates/demographics-view.pt"
+       permission="schooltool.edit"
+       />
+  </zope:configure>
+
+  <zope:adapter
+      factory=".resource.ResourceDemographicsFieldsAbsoluteURLAdapter"
+      provides="zope.traversing.browser.interfaces.IAbsoluteURL" />
+
+  <zope:adapter
+      factory=".resource.ResourceDemographicsFieldsAbsoluteURLAdapter"
+      provides="zope.interface.Interface"
+      name="absolute_url"/>
+
+  <menuItem
+      menu="schooltool_actions"
+      title="Edit Info"
+      for="schooltool.resource.interfaces.IResource"
+      action="edit.html"
+      permission="schooltool.edit"
+      />
+  <page
+      for="schooltool.resource.interfaces.IResource"
+      name="edit.html"
+      class=".resource.ResourceEditView"
+      permission="schooltool.edit"
+      layer="schooltool.skin.ISchoolToolLayer"
+      />
+  <menuItem
+      menu="schooltool_actions"
+      title="Edit Info"
+      for="schooltool.resource.interfaces.ILocation"
+      action="edit.html"
+      permission="schooltool.edit"
+      />
+  <page
+      for="schooltool.resource.interfaces.ILocation"
+      name="edit.html"
+      class=".resource.LocationEditView"
+      permission="schooltool.edit"
+      layer="schooltool.skin.ISchoolToolLayer"
+      />
+  <menuItem
+      menu="schooltool_actions"
+      title="Edit Info"
+      for="schooltool.resource.interfaces.IEquipment"
+      action="edit.html"
+      permission="schooltool.edit"
+      />
+  <page
+      for="schooltool.resource.interfaces.IEquipment"
+      name="edit.html"
+      class=".resource.EquipmentEditView"
+      permission="schooltool.edit"
+      layer="schooltool.skin.ISchoolToolLayer"
+      />
+
+  <menuItem
+      menu="schooltool_actions"
+      title="New Resource"
+      for="schooltool.resource.interfaces.IResourceContainer"
+      action="addResource.html"
+      permission="schooltool.edit"
+      />
+  <page
+      name="addResource.html"
+      for="schooltool.resource.interfaces.IResourceContainer"
+      class=".resource.ResourceAddView"
+      permission="schooltool.edit"
+      layer="schooltool.skin.ISchoolToolLayer"
+      />
+  <menuItem
+      menu="schooltool_actions"
+      title="New Location"
+      for="schooltool.resource.interfaces.IResourceContainer"
+      action="addLocation.html"
+      permission="schooltool.edit"
+      />
+  <page
+      name="addLocation.html"
+      for="schooltool.resource.interfaces.IResourceContainer"
+      class=".resource.LocationAddView"
+      permission="schooltool.edit"
+      layer="schooltool.skin.ISchoolToolLayer"
+      />
+  <menuItem
+      menu="schooltool_actions"
+      title="New Equipment"
+      for="schooltool.resource.interfaces.IResourceContainer"
+      action="addEquipment.html"
+      permission="schooltool.edit"
+      />
+  <page
+      name="addEquipment.html"
+      for="schooltool.resource.interfaces.IResourceContainer"
+      class=".resource.EquipmentAddView"
+      permission="schooltool.edit"
+      layer="schooltool.skin.ISchoolToolLayer"
+      />
+
 </configure>

=== added file 'src/schooltool/resource/browser/demographics.txt'
--- src/schooltool/resource/browser/demographics.txt	1970-01-01 00:00:00 +0000
+++ src/schooltool/resource/browser/demographics.txt	2011-01-17 05:56:49 +0000
@@ -0,0 +1,50 @@
+Resource demographics
+=====================
+
+A manager logs in.
+
+    >>> manager = Browser('manager', 'schooltool')
+
+There's a link in the manage tab that brings up the Resource Demographics
+container view.
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Resource Demographics').click()
+    >>> manager.printQuery("id('content-header')//h1")
+    <h1>Resource Demographics Container</h1>
+
+We'll create some demographics fields.
+
+    >>> manager.getLink('New Text Field').click()
+
+    >>> manager.printQuery("id('column-center')//input[@type='checkbox']")
+    <input ... value="resource" type="checkbox" />
+    <input ... value="location" type="checkbox" />
+    <input ... value="equipment" type="checkbox" />
+
+    >>> manager.getControl('Title').value = "Room Number"
+    >>> manager.getControl('ID').value = "room"
+    >>> manager.getControl(name='form.widgets.required:list').value = ['true']
+    >>> manager.getControl(name='form.widgets.limit_keys:list').value = ['location']
+    >>> manager.getControl('Add').click()
+
+    >>> manager.getLink('Edit').click()
+    >>> print manager.getControl(name='form.widgets.limit_keys:list').value
+    ['location']
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Resource Demographics').click()
+    >>> manager.getLink('New Yes/No Field').click()
+    >>> manager.getControl('Title').value = "Certified"
+    >>> manager.getControl('ID').value = "certified"
+    >>> manager.getControl(name='form.widgets.required:list').value = ['true']
+    >>> manager.getControl('Add').click()
+
+Now we see them in the container view.
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Resource Demographics').click()
+    >>> manager.printQuery("id('column-center')//a")
+    <a href="http://localhost/resource_demographics/room">room</a>
+    <a href="http://localhost/resource_demographics/certified">certified</a>
+

=== modified file 'src/schooltool/resource/browser/resource-booking.txt'
--- src/schooltool/resource/browser/resource-booking.txt	2008-09-05 12:13:50 +0000
+++ src/schooltool/resource/browser/resource-booking.txt	2011-01-17 05:56:49 +0000
@@ -15,7 +15,7 @@
     >>> manager.getLink('Resources').click()
     >>> manager.getLink('New Location').click()
     >>> manager.getControl('Title').value = 'mud'
-    >>> manager.getControl(name='field.type.newSubType').value = 'Computer Lab'
+    >>> manager.getControl(name='form.widgets.type.newSubType').value = 'Computer Lab'
     >>> manager.getControl('Add').click()
     >>> manager.getLink('Computer Lab').click()
     >>> 'mud' in manager.contents

=== modified file 'src/schooltool/resource/browser/resource.py'
--- src/schooltool/resource/browser/resource.py	2010-08-30 16:09:34 +0000
+++ src/schooltool/resource/browser/resource.py	2011-01-17 05:56:49 +0000
@@ -22,22 +22,38 @@
 $Id$
 """
 
+import z3c.form
+import z3c.form.browser.text
+from z3c.form import form, field, button, subform, validator, widget
+from z3c.form.interfaces import DISPLAY_MODE, HIDDEN_MODE, NO_VALUE, IActionHandler
 from zc.table import table
+
 from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
+from zope.component import adapter, adapts
 from zope.component import getUtilitiesFor
 from zope.component import queryAdapter
 from zope.component import queryMultiAdapter
 from zope.component import queryUtility
-from zope.formlib import form
+from zope.component import getMultiAdapter
+from zope.container.interfaces import INameChooser
+from zope.event import notify
+from zope.formlib import form as oldform
+from zope.interface import implementer, implements, implementsOnly
+from zope.lifecycleevent import ObjectCreatedEvent
+from zope.publisher.browser import BrowserView
+from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.session.interfaces import ISession
-from zope.app.form.browser import widget
 from zope.traversing.browser.absoluteurl import absoluteURL
+from zope.traversing.browser.interfaces import IAbsoluteURL
 
 from schooltool.app.browser.app import BaseEditView
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.basicperson.browser.demographics import DemographicsView
 from schooltool.resource.interfaces import IBookingCalendar
 from schooltool.resource.interfaces import (IBaseResourceContained,
              IResourceContainer, IResourceTypeInformation, IResourceSubTypes,
-             IResource, IEquipment, ILocation)
+             IResource, IEquipment, ILocation, IResourceDemographicsFields)
+from schooltool.resource.resource import Resource, Location, Equipment
 from schooltool.table.interfaces import IFilterWidget
 from schooltool.table.table import url_cell_formatter
 from schooltool.table.table import CheckboxColumn
@@ -48,7 +64,7 @@
 from schooltool.common import SchoolToolMessage as _
 
 
-class ResourceContainerView(form.FormBase):
+class ResourceContainerView(oldform.FormBase):
     """A Resource Container view."""
 
     __used_for__ = IResourceContainer
@@ -56,20 +72,20 @@
     index_title = _("Resource index")
 
     prefix = "resources"
-    form_fields = form.Fields()
-    searchActions = form.Actions(
-        form.Action('Search', success='handle_search_action'),)
+    form_fields = oldform.Fields()
+    searchActions = oldform.Actions(
+        oldform.Action('Search', success='handle_search_action'),)
 
-    actions = form.Actions(
-                form.Action('Delete', success='handle_delete_action'),
-                form.Action('Book', success='handle_book_action'))
+    actions = oldform.Actions(
+                oldform.Action('Delete', success='handle_delete_action'),
+                oldform.Action('Book', success='handle_book_action'))
     template = ViewPageTemplateFile("resourcecontainer.pt")
     delete_template = ViewPageTemplateFile('container_delete.pt')
 
     resourceType = None
 
     def __init__(self, context, request):
-        form.FormBase.__init__(self, context, request)
+        oldform.FormBase.__init__(self, context, request)
         self.resourceType = self.request.get('SEARCH_TYPE','|').split('|')[0]
         self.filter_widget = queryMultiAdapter((self.getResourceUtility(),
                                                 self.request), IFilterWidget)
@@ -185,12 +201,28 @@
     """Resource Type Filter"""
 
 
-class ResourceSubTypeWidget(widget.SimpleInputWidget):
-
-    __call__ = ViewPageTemplateFile('subtype_widget.pt')
+class IResourceSubTypeWidget(z3c.form.interfaces.ITextWidget):
+    pass
+
+
+class ResourceSubTypeWidget(z3c.form.browser.text.TextWidget):
+    implementsOnly(IResourceSubTypeWidget)
+
+    utility = None
+
+    def __init__(self, request, utility=None):
+        super(ResourceSubTypeWidget, self).__init__(request)
+        self.utility = utility
+
+    def freeTextValue(self):
+        if self.value in self.subTypes():
+            return ''
+        return self.value
 
     def subTypes(self):
-        util = queryUtility(IResourceFactoryUtility, name=self.utility, default=None)
+        util = queryUtility(IResourceFactoryUtility,
+                            name=self.utility,
+                            default=None)
         if IResourceSubTypes.providedBy(util):
             subtypes = util
         else:
@@ -202,42 +234,26 @@
     def hasInput(self):
         return self.request.get(self.name,None) != '' or self.request.get(self.name+'.newSubType',None)
 
-    def getInputValue(self):
-        subType = self.request.get(self.name)
-        newSubType = self.request.get(self.name+'.newSubType')
-        return newSubType or subType
-
-
-class ResourceView(form.DisplayFormBase):
-    """A Resource info view."""
-
-    __used_for__ = IResource
-
-    form_fields = form.Fields(IResource)
-
-    template = ViewPageTemplateFile("resource.pt")
-
-    def __init__(self, context, request):
-        self.context = context
-        self.request = request
-
-
-class LocationView(ResourceView):
-    """A location info view."""
-    __used_for__ = ILocation
-    form_fields = form.Fields(ILocation)
-
-
-class EquipmentView(ResourceView):
-    """A equipment info view."""
-    __used_for__ = IEquipment
-    form_fields = form.Fields(IEquipment)
-
-
-class ResourceEditView(BaseEditView):
-    """A view for editing resource info."""
-
-    __used_for__ = IBaseResourceContained
+    def extract(self, default=NO_VALUE):
+        subType = self.request.get(self.name, default)
+        newSubType = self.request.get(self.name+'.newSubType', default)
+        if subType and subType != default:
+            return subType
+        return newSubType or default
+
+
+def ResourceSubTypeFieldWidget(field, request):
+    utility_name = 'resource'
+    if not field.interface is None:
+        # XXX: this is what we get for using named utilities
+        if issubclass(field.interface, IEquipment):
+            utility_name = 'equipment'
+        elif issubclass(field.interface, ILocation):
+            utility_name = 'location'
+    return widget.FieldWidget(
+        field,
+        ResourceSubTypeWidget(request, utility=utility_name)
+        )
 
 
 class ResourceContainerFilterWidget(PersonFilterWidget):
@@ -291,3 +307,275 @@
                 results = filter_widget.filter(results)
 
         return results
+
+
+class ResourceDemographicsFieldsAbsoluteURLAdapter(BrowserView):
+
+    adapts(IResourceDemographicsFields, IBrowserRequest)
+    implements(IAbsoluteURL)
+
+    def __str__(self):
+        app = ISchoolToolApplication(None)
+        url = str(getMultiAdapter((app, self.request), name='absolute_url'))
+        return url + '/resource_demographics'
+
+    __call__ = __str__
+
+
+class ResourceDemographicsView(DemographicsView):
+
+    title = _('Resource Demographics Container')
+
+
+##########  Base class of all resource views (uses self.resource_type) #########
+class ResourceFieldGenerator(object):
+
+    def makeRows(self, fields, cols=1):
+        rows = []
+        while fields:
+            rows.append(fields[:cols])
+            fields = fields[cols:]
+        return rows
+
+    def makeFieldSet(self, fieldset_id, legend, fields, cols=1):
+        result = {
+            'id': fieldset_id,
+            'legend': legend,
+            }
+        result['rows'] = self.makeRows(fields, cols)
+        return result
+
+    def fieldsets(self):
+        result = []
+        sources = [
+            (self.base_id, self.base_legend, list(self.getBaseFields())),
+            (self.demo_id, self.demo_legend, list(self.getDemoFields())),
+            ]
+        for fieldset_id, legend, fields in sources:
+            result.append(self.makeFieldSet(fieldset_id, legend, fields, 2))
+        return result
+
+    def getDemoFields(self):
+        fields = field.Fields()
+        dfs = IResourceDemographicsFields(ISchoolToolApplication(None))
+        for field_desc in dfs.filter_key(self.resource_type):
+            fields += field_desc.makeField()
+        return fields
+
+
+###############  Resource view (group determined by base class) #################
+class BaseResourceView(form.Form, ResourceFieldGenerator):
+
+    template = ViewPageTemplateFile('templates/resource_view.pt')
+    mode = DISPLAY_MODE
+    id = 'resource-view'
+
+    @property
+    def label(self):
+        return self.context.title
+
+    def update(self):
+        self.fields = self.getBaseFields()
+        self.fields += self.getDemoFields()
+        self.subforms = []
+        super(BaseResourceView, self).update()
+
+    def __call__(self):
+        self.update()
+        return self.render()
+
+    def updateWidgets(self):
+        super(BaseResourceView, self).updateWidgets()
+        for widget in self.widgets:
+            if not self.widgets[widget].value:
+                self.widgets[widget].mode = HIDDEN_MODE
+
+
+class ResourceView(BaseResourceView):
+    """A location info view."""
+
+    resource_type = 'resource'
+
+    def getBaseFields(self):
+        return field.Fields(IResource)
+
+
+class LocationView(BaseResourceView):
+    """A location info view."""
+
+    resource_type = 'location'
+
+    def getBaseFields(self):
+        return field.Fields(ILocation)
+
+
+class EquipmentView(BaseResourceView):
+    """A equipment info view."""
+
+    resource_type = 'equipment'
+
+    def getBaseFields(self):
+        return field.Fields(IEquipment)
+
+
+###############  Base classes of all resource add/edit views ################
+class BaseResourceAddView(form.AddForm, ResourceFieldGenerator):
+
+    id = 'resource-form'
+    template = ViewPageTemplateFile('templates/resource_form.pt')
+
+    def getBaseFields(self):
+        return field.Fields(IResource)
+
+    def groupViewURL(self):
+        return '%s/%s.html' % (absoluteURL(self.context, self.request),
+                               self.group_id)
+
+    def updateActions(self):
+        super(BaseResourceAddView, self).updateActions()
+        self.actions['add'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+    @button.buttonAndHandler(_('Add'))
+    def handleAdd(self, action):
+        super(BaseResourceAddView, self).handleAdd.func(self, action)
+
+    @button.buttonAndHandler(_('Cancel'))
+    def handle_cancel_action(self, action):
+        self.request.response.redirect(self.groupViewURL())
+
+    def createAndAdd(self, data):
+        resource = self._factory()
+        resource.title = data.get('title')
+        chooser = INameChooser(self.context)
+        resource.__name__ = chooser.chooseName('', resource)
+        form.applyChanges(self, resource, data)
+        notify(ObjectCreatedEvent(resource))
+        self.context[resource.__name__] = resource
+        return resource
+
+    def update(self):
+        self.fields = self.getBaseFields()
+        self.fields += self.getDemoFields()
+        self.updateWidgets()
+        self.updateActions()
+        self.actions.execute()
+
+    def updateWidgets(self):
+        super(BaseResourceAddView, self).updateWidgets()
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
+
+class BaseResourceEditView(form.EditForm, ResourceFieldGenerator):
+
+    id = 'resource-form'
+    template = ViewPageTemplateFile('templates/resource_form.pt')
+
+    def update(self):
+        self.fields = self.getBaseFields()
+        self.fields += self.getDemoFields()
+        super(BaseResourceEditView, self).update()
+
+    @button.buttonAndHandler(_('Apply'))
+    def handle_apply_action(self, action):
+        data, errors = self.extractData()
+        if errors:
+            self.status = self.formErrorsMessage
+            return
+        self.applyChanges(data)
+        url = absoluteURL(self.context, self.request)
+        self.request.response.redirect(url)
+
+    @button.buttonAndHandler(_('Cancel'))
+    def handle_cancel_action(self, action):
+        url = absoluteURL(self.context, self.request)
+        self.request.response.redirect(url)
+
+    @property
+    def label(self):
+        return _(u'Change information for ${fullname}',
+                 mapping={'fullname': self.context.title})
+
+    def updateActions(self):
+        super(BaseResourceEditView, self).updateActions()
+        self.actions['apply'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+
+###############  Resource add/edit views ################
+class BaseResourceForm(object):
+
+    resource_type = 'resource'
+    base_id = 'base-data'
+    base_legend = _('Resource identification')
+    demo_id = 'demo-data'
+    demo_legend = _('Resource demographics')
+
+    def getBaseFields(self):
+        return field.Fields(IResource).omit('type')
+
+
+class ResourceAddView(BaseResourceForm, BaseResourceAddView):
+
+    label = _('Add new resource')
+    _factory = Resource
+
+
+class ResourceEditView(BaseResourceForm, BaseResourceEditView):
+
+    label = _('Edit resource')
+
+
+###############  Location add/edit views ################
+class BaseLocationForm(object):
+
+    resource_type = 'location'
+    base_id = 'base-data'
+    base_legend = _('Location identification')
+    demo_id = 'demo-data'
+    demo_legend = _('Location demographics')
+
+    def getBaseFields(self):
+        fields = field.Fields(ILocation).select('title', 'type', 'description',
+            'capacity', 'notes')
+        return fields
+
+
+class LocationAddView(BaseLocationForm, BaseResourceAddView):
+
+    label = _('Add new location')
+    _factory = Location
+
+
+class LocationEditView(BaseLocationForm, BaseResourceEditView):
+
+    label = _('Edit location')
+
+
+###############  Equipment add/edit views ################
+class BaseEquipmentForm(object):
+
+    resource_type = 'equipment'
+    base_id = 'base-data'
+    base_legend = _('Equipment identification')
+    demo_id = 'demo-data'
+    demo_legend = _('Equipment demographics')
+
+    def getBaseFields(self):
+        fields = field.Fields(IEquipment).select('title', 'type', 'description',
+            'manufacturer', 'model', 'serialNumber', 'purchaseDate', 'notes')
+        return fields
+
+
+class EquipmentAddView(BaseEquipmentForm, BaseResourceAddView):
+
+    label = _('Add new equipment')
+    _factory = Equipment
+
+
+class EquipmentEditView(BaseEquipmentForm, BaseResourceEditView):
+
+    label = _('Edit equipment')
+

=== modified file 'src/schooltool/resource/browser/resources.txt'
--- src/schooltool/resource/browser/resources.txt	2008-09-05 12:13:50 +0000
+++ src/schooltool/resource/browser/resources.txt	2011-01-17 05:56:49 +0000
@@ -7,11 +7,7 @@
 Set up
 ------
 
-    >>> from zope.testbrowser.testing import Browser
-    >>> manager = Browser()
-    >>> manager.addHeader('Authorization', 'Basic manager:schooltool')
-    >>> manager.handleErrors = False
-    >>> manager.open('http://localhost/')
+    >>> manager = Browser('manager', 'schooltool')
 
 Creating Resources
 ------------------
@@ -32,8 +28,7 @@
 
     >>> manager.getLink('New Location').click()
     >>> manager.getControl('Title').value = 'Room 101'
-    >>> manager.getControl(name='field.type.newSubType').value = 'class room'
-    >>> manager.getControl('Type').value = ['']
+    >>> manager.getControl(name='form.widgets.type.newSubType').value = 'class room'
     >>> manager.getControl('Capacity').value = '10'
     >>> manager.getControl('Add').click()
     >>> manager.getLink('class room').click()
@@ -44,7 +39,7 @@
 
     >>> manager.getLink('New Equipment').click()
     >>> manager.getControl('Title').value = 'Projector 1'
-    >>> manager.getControl(name='field.type.newSubType').value = 'Projector'
+    >>> manager.getControl(name='form.widgets.type.newSubType').value = 'Projector'
     >>> manager.getControl('Manufacturer').value = 'Sony'
     >>> manager.getControl('Model').value = 'RS-1'
     >>> manager.getControl('Serial Number').value = 'ABC123-987'
@@ -60,7 +55,7 @@
 
     >>> manager.getLink('New Equipment').click()
     >>> manager.getControl('Title').value = 'Projector 2'
-    >>> manager.getControl('Type').value = ['Projector']
+    >>> manager.getControl(name='form.widgets.type').value = ['Projector']
     >>> manager.getControl('Manufacturer').value = 'Sony'
     >>> manager.getControl('Model').value = 'RS-1'
     >>> manager.getControl('Serial Number').value = 'ABC123-9876'

=== modified file 'src/schooltool/resource/browser/subtype_widget.pt'
--- src/schooltool/resource/browser/subtype_widget.pt	2007-03-17 15:25:31 +0000
+++ src/schooltool/resource/browser/subtype_widget.pt	2011-01-17 05:56:49 +0000
@@ -1,13 +1,16 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      tal:omit-tag="">
 <input type="text"
        tal:attributes="id string:${view/name}.newSubType;
 		       name string:${view/name}.newSubType;
-		       value: view/_getFormValue"
-       />
-
+                       value view/freeTextValue" />
 <select tal:attributes="id string:${view/name};
 			name string:${view/name}">
-  <option value="">Choose One</option>
+  <option value="" i18n:translate="">Choose One</option>
   <option tal:repeat="type view/subTypes"
-	  tal:attributes="value type"
+          tal:attributes="value type;
+                          selected python:type==view.value and 'selected' or None"
 	  tal:content="type">subtype</option>
 </select>
+</html>

=== added directory 'src/schooltool/resource/browser/templates'
=== added file 'src/schooltool/resource/browser/templates/resource_form.pt'
--- src/schooltool/resource/browser/templates/resource_form.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/resource/browser/templates/resource_form.pt	2011-01-17 05:56:49 +0000
@@ -0,0 +1,138 @@
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+  <body>
+    <metal:nothing metal:fill-slot="content-header" />
+    <metal:block metal:fill-slot="body">
+      <form action="." method="post" enctype="multipart/form-data" class="standalone"
+            metal:define-macro="form"
+            tal:attributes="method view/method;
+                            enctype view/enctype;
+                            acceptCharset view/acceptCharset;
+                            accept view/accept;
+                            action view/action;
+                            name view/name;
+                            id view/id">
+        <metal:subform define-macro="subform">
+          <div class="viewspace" metal:define-slot="viewspace">
+            <metal:label define-slot="label">
+              <h3 metal:define-macro="form-label"
+                  tal:condition="view/label|nothing"
+                  tal:content="view/label">
+                Form Label
+              </h3>
+            </metal:label>
+            <metal:info define-slot="info">
+              <div class="required-info"
+                   metal:define-macro="required-info">
+                <!--<span class="required">*</span>
+                    &ndash; required -->
+              </div>
+            </metal:info>
+            <metal:header define-slot="header">
+              <div class="status"
+                   tal:condition="view/status"
+                   metal:define-macro="form-header">
+                <div class="summary"
+                     i18n:translate=""
+                     tal:content="view/status">
+                  Form status summary
+                </div>
+                <ul class="errors"
+                    tal:define="errors view/errors|view/widgets/errors"
+                    tal:condition="errors"
+                    metal:define-macro="form-errors">
+                  <li tal:repeat="error errors">
+                    <tal:block condition="error/widget">
+                      <span tal:replace="error/widget/label" />:
+                    </tal:block>
+                    <span tal:replace="structure error/render">Error Type</span>
+                  </li>
+                </ul>
+              </div>
+            </metal:header>
+            <div metal:define-slot="extra-info" tal:replace="nothing">
+            </div>
+            <div metal:define-slot="main">
+              <metal:widget-rows define-macro="widget-rows">
+                <tal:loop repeat="fieldset view/fieldsets">
+                  <fieldset tal:condition="fieldset/rows"
+                            tal:attributes="id fieldset/id">
+                    <legend tal:content="fieldset/legend">legend</legend>
+                    <tal:loop repeat="row fieldset/rows">
+                      <tal:block repeat="widget_id row">
+                        <metal:block tal:define="widget python:view.widgets[widget_id]">
+                          <div id="" class="row"
+                               tal:attributes="id string:${widget/id}-row"
+                               tal:condition="python:widget.mode != 'hidden'">
+                            <metal:widget-row define-macro="widget-row">
+                              <div class="label">
+                                <label tal:attributes="for widget/id">
+                                  <span i18n:translate=""
+                                        tal:content="widget/label">label</span>
+                                  <span class="required"
+                                        tal:condition="widget/required">*</span>
+                                </label>
+                              </div>
+                              <p class="hint" tal:content="widget/field/description">Description of this field.</p>
+                              <div class="widget" tal:content="structure widget/render">
+                                <input type="text" size="24" value="" />
+                              </div>
+                              <div class="error"
+                                   tal:condition="widget/error">
+                                <span tal:replace="structure widget/error/render">error</span>
+                              </div>
+                            </metal:widget-row>
+                          </div>
+                          <input type="hidden" value=""
+                                 tal:condition="python:widget.mode == 'hidden'"
+                                 tal:replace="structure widget/render" />
+                        </metal:block>
+                      </tal:block>
+                    </tal:loop>
+                    <div metal:define-slot="extra-widgets" tal:replace="nothing">
+                    </div>
+                  </fieldset>
+                </tal:loop>
+              </metal:widget-rows>
+              <metal:groups define-macro="groups">
+                <fieldset tal:condition="view/groups|nothing"
+                          tal:repeat="view view/groups">
+                  <legend tal:condition="view/label"
+                          tal:content="view/label">Label</legend>
+                  <metal:group-header define-slot="group-header">
+                    <div class="status"
+                         tal:condition="view/widgets/errors">
+                      <div metal:use-macro="template/macros/errors" />
+                    </div>
+                  </metal:group-header>
+                  <metal:group-rows define-slot="group-rows">
+                    <div metal:use-macro="template/macros/widget-rows" />
+                  </metal:group-rows>
+                </fieldset>
+              </metal:groups>
+            </div>
+            <metal:above-buttons define-slot="above-buttons">
+              <tal:block
+                  repeat="form view/subforms"
+                  content="structure form/render"
+                  condition="view/subforms|nothing" />
+            </metal:above-buttons>
+          </div>
+          <metal:buttons define-slot="buttons">
+            <div metal:define-macro="form-buttons">
+              <div class="buttons controls"
+                   metal:define-slot="bottom-buttons">
+                <tal:block condition="view/actions|nothing">
+                  <input tal:repeat="action view/actions/values"
+                         tal:replace="structure action/render"
+                         />
+                </tal:block>
+              </div>
+            </div>
+          </metal:buttons>
+          <metal:bottom define-slot="bottom">
+          </metal:bottom>
+        </metal:subform>
+      </form>
+    </metal:block>
+  </body>
+</html>

=== added file 'src/schooltool/resource/browser/templates/resource_view.pt'
--- src/schooltool/resource/browser/templates/resource_view.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/resource/browser/templates/resource_view.pt	2011-01-17 05:56:49 +0000
@@ -0,0 +1,36 @@
+<html metal:use-macro="view/@@standard_macros/page">
+
+  <body>
+    <metal:nothing metal:fill-slot="content-header" />
+    <metal:block metal:fill-slot="body">
+      <tal:block repeat="widget view/widgets/values">
+        <div id="" class="row"
+             tal:attributes="id string:${widget/id}-row"
+             tal:condition="python:widget.mode != 'hidden'">
+          <metal:widget-row define-macro="widget-row">
+            <div class="label">
+              <label tal:attributes="for widget/id">
+                <span i18n:translate=""
+                      tal:content="widget/label">label</span>
+                <span class="required"
+                      tal:condition="widget/required">*</span>
+              </label>
+            </div>
+            <p class="hint" tal:content="widget/field/description">Description of this field.</p>
+            <div class="widget" tal:content="structure widget/render">
+              <input type="text" size="24" value="" />
+            </div>
+            <div class="error"
+                 tal:condition="widget/error">
+              <span tal:replace="structure widget/error/render">error</span>
+            </div>
+          </metal:widget-row>
+        </div>
+        <input type="hidden" value=""
+               tal:condition="python:widget.mode == 'hidden'"
+               tal:replace="structure widget/render" />
+      </tal:block>
+    </metal:block>
+  </body>
+</html>
+

=== modified file 'src/schooltool/resource/configure.zcml'
--- src/schooltool/resource/configure.zcml	2010-01-19 12:09:22 +0000
+++ src/schooltool/resource/configure.zcml	2011-01-17 05:56:49 +0000
@@ -57,13 +57,19 @@
       factory="schooltool.app.app.SimpleNameChooser"
       provides="zope.container.interfaces.INameChooser" />
 
-  <!-- Application hook -->
+  <!-- Application Init -->
   <adapter
       for="schooltool.app.interfaces.ISchoolToolApplication"
       factory=".resource.ResourceInit"
       name="schooltool.resources"
       />
 
+  <!-- Application StartUp -->
+  <adapter
+      factory=".resource.ResourceStartUp"
+      name="schooltool.resources.startup"
+      />
+
   <!-- sample data -->
   <configure
       xmlns:zcml="http://namespaces.zope.org/zcml"
@@ -120,6 +126,9 @@
       name="booking"
       />
 
+  <adapter factory=".resource.getResourceDemographics" />
+  <adapter factory=".resource.DemographicsFormAdapter" />
+  <adapter factory=".resource.getResourceDemographicsFields" />
 
   <class class=".booking.ResourceBookingCalendar">
     <require permission="schooltool.view"
@@ -133,6 +142,17 @@
              />
   </class>
 
+  <!-- resource demos -->
+
+  <class class=".resource.ResourceDemographicsFields">
+    <implements interface="schooltool.resource.interfaces.IResourceDemographicsFields" />
+    <require
+       permission="schooltool.edit"
+       interface="schooltool.resource.interfaces.IResourceDemographicsFields"
+       set_schema="schooltool.resource.interfaces.IResourceDemographicsFields" />
+  </class>
+
+  <adapter factory=".resource.getLimitKeyVocabularyForResourceFields" />
 
   <subscriber
       for="schooltool.resource.interfaces.IBookingCalendar

=== modified file 'src/schooltool/resource/ftesting.zcml'
--- src/schooltool/resource/ftesting.zcml	2010-04-08 06:26:02 +0000
+++ src/schooltool/resource/ftesting.zcml	2011-01-17 05:56:49 +0000
@@ -8,6 +8,7 @@
   <include package="schooltool.term" />
   <include package="schooltool.schoolyear" />
   <include package="schooltool.term" file="time_machine.zcml" />
+  <include package="schooltool.basicperson" />
 
   <browser:defaultSkin name="SchoolTool" />
 

=== modified file 'src/schooltool/resource/interfaces.py'
--- src/schooltool/resource/interfaces.py	2010-02-22 10:39:32 +0000
+++ src/schooltool/resource/interfaces.py	2011-01-17 05:56:49 +0000
@@ -21,15 +21,22 @@
 """
 
 import zope.schema
+from zope.configuration.fields import PythonIdentifier
 from zope.container.interfaces import IContainer, IContained
+from zope.container.interfaces import IContainer, IOrderedContainer
 from zope.container.constraints import contains, containers
 from zope.interface import Interface, Attribute
 
+from schooltool.basicperson.interfaces import IDemographics, IDemographicsFields
 from schooltool.calendar.interfaces import ICalendarEvent
 from schooltool.calendar.interfaces import ICalendar
 from schooltool.common import SchoolToolMessage as _
 
 
+class ResourceSubType(zope.schema.TextLine):
+    """Sub-type of the resource is a free-form text line."""
+
+
 class IBaseResource(Interface):
     """Resource."""
 
@@ -37,7 +44,7 @@
         title=_("Title"),
         description=_("Title of the resource."))
 
-    type = zope.schema.TextLine(
+    type = ResourceSubType(
         title=_("Resource Type"),
         description=_("Type of resource"),
         required=True)
@@ -73,7 +80,7 @@
 class ILocation(IBaseResource):
     """Location."""
 
-    type = zope.schema.TextLine(
+    type = ResourceSubType(
         title=_("Location Type"),
         description=_("Type of location (i.e. computer lab, class room, etc.)"),
         required=True)
@@ -88,7 +95,7 @@
 class IEquipment(IBaseResource):
     """Equipment."""
 
-    type = zope.schema.TextLine(
+    type = ResourceSubType(
         title=_("Equipment Type"),
         description=_("Type of equipment (i.e. camcorder, computer, etc.)"),
         required=True)
@@ -160,3 +167,16 @@
 
 class IBookingTimetableEvent(ICalendarEvent):
     """Event that represents a possible booking in a timetable slot."""
+
+
+class IResourceDemographics(IDemographics):
+    """Demographics data storage for a resource
+
+    Stores any kind of data defined by field descriptions that are set
+    up for the resource container.
+    """
+
+
+class IResourceDemographicsFields(IDemographicsFields):
+    """Demographics field storage for resource demos."""
+

=== modified file 'src/schooltool/resource/resource.py'
--- src/schooltool/resource/resource.py	2010-01-19 12:09:22 +0000
+++ src/schooltool/resource/resource.py	2011-01-17 05:56:49 +0000
@@ -24,23 +24,42 @@
 __docformat__ = 'restructuredtext'
 
 from persistent import Persistent
-from zope.component import adapts
-from zope.interface import implements
+from persistent.dict import PersistentDict
+
+from zope.component import adapts, adapter
+from zope.interface import implements, implementer
+from zope.interface import Interface
 from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.container.contained import Contained
 from zope.container.btree import BTreeContainer
+from zope.container.ordered import OrderedContainer
+from zope.location.location import Location
+from zope.schema import TextLine, Bool, Date, Choice
+from zope.schema.vocabulary import SimpleVocabulary
+from zope.schema.vocabulary import SimpleTerm
 
 from schooltool.app.app import Asset
-from schooltool.app.app import InitBase
+from schooltool.app.app import InitBase, StartUpBase
+from schooltool.app.utils import vocabulary
 from schooltool.app.security import LeaderCrowd
-from schooltool.securitypolicy.crowds import TeachersCrowd
 from schooltool.app.interfaces import ICalendarParentCrowd
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.app.utils import vocabulary
+from schooltool.basicperson.demographics import PersonDemographicsData
+from schooltool.basicperson.demographics import DemographicsFields
+from schooltool.basicperson.demographics import IDemographicsForm
+from schooltool.basicperson.interfaces import IFieldFilterVocabulary
 from schooltool.resource import interfaces
+from schooltool.securitypolicy.crowds import TeachersCrowd
 from schooltool.securitypolicy.crowds import ConfigurableCrowd, AggregateCrowd
 from schooltool.securitypolicy.crowds import AuthenticatedCrowd
 from schooltool.common import SchoolToolMessage as _
 
 
+RESOURCE_DEMO_FIELDS_KEY = 'schooltool.resource.demographics_fields'
+RESOURCE_DEMO_DATA_KEY = 'schooltool.resource.demographics_data'
+
+
 class ResourceContainer(BTreeContainer):
     """Container of resources."""
 
@@ -93,6 +112,18 @@
 
     def __call__(self):
         self.app['resources'] = ResourceContainer()
+        self.app[RESOURCE_DEMO_FIELDS_KEY] = ResourceDemographicsFields()
+        self.app[RESOURCE_DEMO_DATA_KEY] = ResourceDemographicsDataContainer()
+
+
+class ResourceStartUp(StartUpBase):
+
+    def __call__(self):
+        if RESOURCE_DEMO_FIELDS_KEY not in self.app:
+            self.app[RESOURCE_DEMO_FIELDS_KEY] = ResourceDemographicsFields()
+        if RESOURCE_DEMO_DATA_KEY not in self.app:
+            self.app[RESOURCE_DEMO_DATA_KEY] = \
+                ResourceDemographicsDataContainer()
 
 
 class ResourceViewersCrowd(ConfigurableCrowd):
@@ -127,3 +158,77 @@
 
     def crowdFactories(self):
         return [LeaderCrowd, TeachersCrowd]
+
+
+###################  Demographics   #################
+class ResourceDemographicsFields(DemographicsFields):
+    """Storage for demographics fields for all resources."""
+    implements(interfaces.IResourceDemographicsFields)
+
+
+@implementer(interfaces.IResourceDemographicsFields)
+@adapter(ISchoolToolApplication)
+def getResourceDemographicsFields(app):
+    return app[RESOURCE_DEMO_FIELDS_KEY]
+
+
+class ResourceDemographicsDataContainer(BTreeContainer):
+    """Storage for demographics information for all resources."""
+
+
+class ResourceDemographicsData(PersonDemographicsData):
+    """Storage for demographics information for a resource."""
+    implements(interfaces.IResourceDemographics)
+
+    def isValidKey(self, key):
+        app = ISchoolToolApplication(None)
+        demographics_fields = interfaces.IResourceDemographicsFields(app)
+        return key in demographics_fields
+
+
+@adapter(interfaces.IBaseResource)
+@implementer(interfaces.IResourceDemographics)
+def getResourceDemographics(resource):
+    app = ISchoolToolApplication(None)
+    rdc = app[RESOURCE_DEMO_DATA_KEY]
+    demographics = rdc.get(resource.__name__, None)
+    if demographics is None:
+        rdc[resource.__name__] = demographics = ResourceDemographicsData()
+    return demographics
+
+
+@adapter(interfaces.IResourceDemographicsFields)
+@implementer(IFieldFilterVocabulary)
+def getLimitKeyVocabularyForResourceFields(resource_field_description_container):
+     return vocabulary([
+        ('resource', _('Resource')),
+        ('location', _('Location')),
+        ('equipment', _('Equipment')),
+        ])
+
+
+class DemographicsFormAdapter(object):
+    implements(IDemographicsForm)
+    adapts(interfaces.IBaseResource)
+
+    def __init__(self, context):
+        self.__dict__['context'] = context
+        self.__dict__['demographics'] = interfaces.IResourceDemographics(
+            self.context)
+
+    def __setattr__(self, name, value):
+        self.demographics[name] = value
+
+    def __getattr__(self, name):
+        return self.demographics.get(name, None)
+
+
+@adapter(interfaces.IResourceDemographicsFields)
+@implementer(IFieldFilterVocabulary)
+def getLimitKeyVocabularyForResourceFields(resource_field_description_container):
+     return vocabulary([
+        ('resource', _('Resource')),
+        ('location', _('Location')),
+        ('equipment', _('Equipment')),
+        ])
+

=== modified file 'src/schooltool/resource/tests/test_resource.py'
--- src/schooltool/resource/tests/test_resource.py	2010-01-10 17:31:54 +0000
+++ src/schooltool/resource/tests/test_resource.py	2011-01-17 05:56:49 +0000
@@ -68,6 +68,7 @@
 
     """
 
+
 def doctest_Location():
     r"""Test for Location
 
@@ -84,6 +85,7 @@
 
     """
 
+
 def doctest_Equipment():
     r"""Test for Equipment
 
@@ -105,6 +107,88 @@
         >>> projector.purchaseDate
     """
 
+
+def doctest_ResourceDemographics():
+    r"""Test Resource Demographics objects and adapters
+
+        >>> from schooltool.resource import interfaces, resource
+        >>> from schooltool.basicperson import demographics
+
+    First we need to set up a mock app and register its adapter:
+
+        >>> from zope.component import provideAdapter
+        >>> from zope.interface import implements
+        >>> from schooltool.app.interfaces import ISchoolToolApplication
+
+        >>> class MockSchoolToolApplication(dict):
+        ...     implements(ISchoolToolApplication)
+        >>> app = MockSchoolToolApplication()
+        >>> provideAdapter(lambda context: app, (None,), ISchoolToolApplication)
+
+    We need to do what the AppInit adapter would otherwise do:
+
+        >>> resource.ResourceInit(app)()
+        >>> resource.RESOURCE_DEMO_FIELDS_KEY in app
+        True
+        >>> resource.RESOURCE_DEMO_DATA_KEY in app
+        True
+
+    There's an adapter for the resource demo fields container:
+
+        >>> provideAdapter(resource.getResourceDemographicsFields)
+        >>> dfs = interfaces.IResourceDemographicsFields(app)
+        >>> interfaces.IResourceDemographicsFields.providedBy(dfs)
+        True
+        >>> len(dfs)
+        0
+
+    We'll add some demo fields to the container, some that are limited to a
+    specific resource type or types:
+
+        >>> dfs['ID'] = demographics.TextFieldDescription("ID", "Identifier")
+        >>> dfs['square_ft'] = demographics.TextFieldDescription("square_ft",
+        ...     "Square Feet", limit_keys=['location'])
+        >>> dfs['warranty'] = demographics.TextFieldDescription("warranty",
+        ...     "Warranty", limit_keys=['equiptment'])
+        >>> dfs['creation_date'] = demographics.DateFieldDescription(
+        ...      "creation_date", "Creation Date",
+        ...      limit_keys=['location', 'equiptment'])
+
+    When we pass the filter_key method a key that does not
+    belong  to any of the limit_keys lists, then it will only return
+    those fields that have empty limit_keys lists.
+
+        >>> [f.__name__ for f in dfs.filter_key('anything')]
+        [u'ID']
+
+    When we pass 'location', it picks up the additional fields that are for
+    location type resources.
+
+        >>> [f.__name__ for f in dfs.filter_key('location')]
+        [u'ID', u'square_ft', u'creation_date']
+
+    When we pass 'equiptment', it picks up the additional fields that are for
+    equiptment type resources.
+
+        >>> [f.__name__ for f in dfs.filter_key('equiptment')]
+        [u'ID', u'warranty', u'creation_date']
+
+    Finally there's an adapter that adapts a resource it's demo data:
+
+        >>> provideAdapter(resource.getResourceDemographics)
+
+    Now we will create a resource and see what we get when we adapt it to
+    IDemographics:
+
+        >>> sample = resource.Resource('Sample Resource')
+        >>> sample.__name__ = 'sample'
+        >>> demos = interfaces.IResourceDemographics(sample)
+        >>> interfaces.IResourceDemographics.providedBy(demos)
+        True
+        >>> len(demos)
+        0
+    """
+
 def test_suite():
     return unittest.TestSuite([
                 doctest.DocTestSuite(optionflags=doctest.ELLIPSIS),