Index: /waeup/branches/ulif-rewrite/src/waeup/tables.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/tables.py	(revision 4431)
+++ /waeup/branches/ulif-rewrite/src/waeup/tables.py	(revision 4431)
@@ -0,0 +1,30 @@
+"""Datatables and related components used in different contexts.
+"""
+import grok
+from waeup.interfaces import IUniversity, IFaculty, IDepartment
+from waeup.widgets.interfaces import ITableProvider
+from waeup.widgets.table import YUITable as Table
+from waeup.widgets.table import Col
+
+class DepartmentTableProvider(grok.Adapter):
+    grok.context(IFaculty)
+    grok.provides(ITableProvider)
+
+    title = 'Departments'
+    
+    def __init__(self, context):
+        self.context = context
+
+    def getTable(self, view=None):
+        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 = Table(self.title, cols=cols)
+        return self.table
Index: /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py	(revision 4430)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py	(revision 4431)
@@ -8,5 +8,4 @@
                             Manage, Add)
 from waeup.widgets.interfaces import ITableProvider
-from waeup.widgets.table import YUITable, Col
 
 class Faculty(grok.Container):
@@ -75,5 +74,5 @@
 
     def update(self):
-        self.table = ITableProvider(self.context).getTable()
+        self.table = ITableProvider(self.context).getTable(view=self.view)
         self.table.need()
 
@@ -170,24 +169,2 @@
     def render(self):
         return u'<div class="portlet"><a href="add">Add department</a></div>'
-
-class DepartmentTableProvider(grok.Adapter):
-    grok.context(IFaculty)
-    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('Departments', cols=cols)
-
-    def getTable(self):
-        return self.table
-
