Index: /waeup/branches/ulif-rewrite/src/waeup/tables.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/tables.py	(revision 4432)
+++ /waeup/branches/ulif-rewrite/src/waeup/tables.py	(revision 4433)
@@ -37,2 +37,6 @@
     title = 'Departments'
 
+class FacultyTableProvider(CodeAndTitleTableProvider):
+    grok.context(IFacultyContainer)
+    grok.provides(ITableProvider)
+    title = 'Faculties'
Index: /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py	(revision 4432)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py	(revision 4433)
@@ -11,5 +11,4 @@
                             FormWrapMixin)
 from waeup.widgets.interfaces import ITableProvider
-from waeup.widgets.table import Col, YUITable
 
 class FacultyContainer(grok.Container):
@@ -160,23 +159,2 @@
     def render(self):
         return u'<div class="portlet"><a href="manage">Manage faculties</a></div>'
-
-class FacultyTableProvider(grok.Adapter):
-    grok.context(IFacultyContainer)
-    grok.provides(ITableProvider)
-
-    def __init__(self, context):
-        self.context = context
-        data = self.context
-        cols = (
-            Col(
-                header='Code', sortable=True,
-                data = tuple(['<a href="%s">%s</a>' % (
-                            data[x].code, data[x].code) for x in data])),
-            Col(
-                header='Title', sortable=True,
-                data = tuple([data.getName(x) for x in data])),
-                )
-        self.table = YUITable('Faculties', cols=cols)
-
-    def getTable(self):
-        return self.table
