diff --git a/VERSION b/VERSION
index edf46ca6..5a3539c4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.1-alpha.1+timestamp.2012.12.24.11.22.50
+Version 2.4.1-alpha.1+timestamp.2012.12.24.12.13.23
diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py
index d9b81010..ee83434f 100644
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -10,6 +10,10 @@ import datetime
 import copy
 import gluon.contenttype
 import gluon.fileutils
+try:
+    import pygraphviz as pgv
+except ImportError:
+    pgv = None
 
 response.subtitle = 'Database Administration (appadmin)'
 
@@ -460,3 +464,50 @@ def ccache():
 
     return dict(form=form, total=total,
                 ram=ram, disk=disk, object_stats=hp != False)
+
+
+
+def table_template(table):
+    def types(field):
+        f_type = field.type
+        if not isinstance(f_type,str):
+            return ' '
+        elif f_type == 'string':
+            return field.length
+        elif f_type == 'id':
+            return B('pk')
+        elif f_type.startswith('reference') or \
+                f_type.startswith('list:reference'):
+            return B('fk')
+        else:
+            return ' '
+    # this is horribe HTML but the only one graphiz understands
+    header = '<TR><TD COLSPAN="3" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#F\
+FA21F"><FONT FACE="Helvetica Bold" COLOR="white">%s</FONT></TD></TR>' % table
+    fields = []                                                                
+    for field in db[table]:
+        fields.append('<TR><TD ALIGN="LEFT" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">%s</FONT></TD><TD ALIGN="LEFT" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica">%s</FONT></TD><TD ALIGN="CENTER" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica">%s</FONT></TD></TR>' % (field.name,field.type,types(field)))
+    return '< <TABLE BGCOLOR="#F1F2AD" BORDER="1" CELLBORDER="0" CELLSPACING="0">%s %s</TABLE> >' % (header, ' '.join(fields))
+
+def bg_graph_model():
+    graph = pgv.AGraph(layout='dot', directed=True, strict=False, rankdir='LR')
+    for tablename in db.tables:
+        graph.add_node(tablename, name=tablename, shape='plaintext', 
+                       label=table_template(tablename))
+
+    for tablename in db.tables:
+        for field in db[tablename]:
+            f_type = field.type
+            if isinstance(f_type,str) and (
+                f_type.startswith('reference') or
+                f_type.startswith('list:reference')):
+                referenced_table = f_type.split()[1].split('.')[0]
+                n1 = graph.get_node(tablename)
+                n2 = graph.get_node(referenced_table)
+                graph.add_edge(n1, n2, color="#4C4C4C", label='')
+
+    graph.layout()
+    return graph.draw(format='png', prog='dot')
+
+def graph_model():
+    return dict(databases=databases, pgv=pgv)
diff --git a/applications/admin/views/appadmin.html b/applications/admin/views/appadmin.html
index f966b79c..a9f6dab8 100644
--- a/applications/admin/views/appadmin.html
+++ b/applications/admin/views/appadmin.html
@@ -2,7 +2,7 @@
 <script><!--
     jQuery(document).ready(function(){
     jQuery("table.sortable tbody tr").mouseover( function() {
-    jQuery(this).addClass("highlight"); }).mouseout( function() { 
+    jQuery(this).addClass("highlight"); }).mouseout( function() {
     jQuery(this).removeClass("highlight"); });
     jQuery('table.sortable tbody tr:odd').addClass('odd');
     jQuery('table.sortable tbody tr:even').addClass('even');
@@ -63,11 +63,11 @@
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
     {{if start>0:}}{{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)),_class="btn")}}{{pass}}
-    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}    
+    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}
     {{if rows:}}
        <div style="overflow: auto;" width="80%">
        {{linkto=URL('update',args=request.args[0])}}
-       {{upload=URL('download',args=request.args[0])}}    
+       {{upload=URL('download',args=request.args[0])}}
        {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='sortable')}}
        </div>
     {{pass}}
@@ -75,7 +75,7 @@
     <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
-{{elif request.function=='insert':}}  
+{{elif request.function=='insert':}}
   <h2>{{=T("Database")}} {{=A(request.args[0],_href=URL('index'))}}
     {{if hasattr(table,'_primarykey'):}}
       {{fieldname=table._primarykey[0]}}
@@ -83,7 +83,7 @@
       {{tablename=request.args[1]}}
       {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}
       {{=T("Table")}} {{=A(tablename,_href=URL('select',args=dbname,vars=dict(query='%s.%s.%s%s'%(dbname,tablename,fieldname,cond))))}}
-    {{else:}}  
+    {{else:}}
       {{=T("Table")}} {{=A(request.args[1],_href=URL('select',args=request.args[0],vars=dict(query='%s.%s.id>0'%tuple(request.args[:2]))))}}
     {{pass}}
   </h2>
@@ -95,7 +95,7 @@
       {{fieldname=request.vars.keys()[0]}}
       {{dbname=request.args[0]}}
       {{tablename=request.args[1]}}
-      {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}      
+      {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}
       {{=T("Table")}} {{=A(tablename,_href=URL('select',args=dbname,vars=dict(query='%s.%s.%s%s'%(dbname,tablename,fieldname,cond))))}}
       {{=T("Record")}} {{=A('%s=%s'%request.vars.items()[0],_href=URL('update',args=request.args[:2],vars=request.vars))}}
     {{else:}}
@@ -131,7 +131,7 @@
               dict(ratio=total['ratio'], hits=total['hits'], misses=total['misses']))}}
      </p>
     <p>
-      {{=T("Size of cache:")}} 
+      {{=T("Size of cache:")}}
       {{if object_stats:}}
         {{=T.M("**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}", dict(items=total['objects'], bytes=total['bytes']))}}
         {{if total['bytes'] > 524287:}}
@@ -151,7 +151,7 @@
     </div>
     <br />
     {{pass}}
-        
+
     <h4>{{=T("RAM")}}</h4>
     <p>{{=T.M("Number of entries: **%s**", ram['entries'])}}</p>
     {{if ram['entries'] > 0:}}
@@ -179,16 +179,16 @@
     </div>
     <br />
     {{pass}}
-    
+
     <h4>{{=T("DISK")}}</h4>
     <p>{{=T.M("Number of entries: **%s**", disk['entries'])}}</p>
     {{if disk['entries'] > 0:}}
       <p>
       {{=T.M("Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})",
-            dict(ratio=disk['ratio'], hits=disk['hits'], misses=disk['misses']))}} 
+            dict(ratio=disk['ratio'], hits=disk['hits'], misses=disk['misses']))}}
       </p>
       <p>
-      {{=T("Size of cache:")}} 
+      {{=T("Size of cache:")}}
       {{if object_stats:}}
         {{=T.M("**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}", dict( items=disk['objects'], bytes=disk['bytes']))}}
         {{if disk['bytes'] > 524287:}}
@@ -209,11 +209,11 @@
       <br />
     {{pass}}
   </div>
-    
+
   <div class="list-header">
     <h3>{{=T("Manage Cache")}}</h3>
   </div>
-  
+
   <div class="content">
     <p>
       {{=form}}
@@ -222,3 +222,14 @@
 </div>
 <div class="clear"></div>
 {{pass}}
+
+{{if request.function=='graph_model':}}
+<h2>{{=T("Graph Model")}}</h2>
+  {{if not pgv:}}
+    {{=T('pygraphviz library not found')}}
+  {{elif not databases:}}
+    {{=T("No databases in this application")}}
+  {{else:}}
+    {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
+  {{pass}}
+{{pass}}
diff --git a/applications/admin/views/default/design.html b/applications/admin/views/default/design.html
index 27f12512..d0910416 100644
--- a/applications/admin/views/default/design.html
+++ b/applications/admin/views/default/design.html
@@ -79,6 +79,7 @@ def deletefile(arglist, vars={}):
     {{if os.access(os.path.join(request.folder,'..',app,'databases','sql.log'),os.R_OK):}}
       {{=button(URL('peek/%s/databases/sql.log'%app), 'sql.log')}}
     {{pass}}
+    {{=button(URL(a=app, c='appadmin',f='graph_model'), T('graph model'))}}
   </div>
   {{pass}}
 
diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py
index d9b81010..ee83434f 100644
--- a/applications/examples/controllers/appadmin.py
+++ b/applications/examples/controllers/appadmin.py
@@ -10,6 +10,10 @@ import datetime
 import copy
 import gluon.contenttype
 import gluon.fileutils
+try:
+    import pygraphviz as pgv
+except ImportError:
+    pgv = None
 
 response.subtitle = 'Database Administration (appadmin)'
 
@@ -460,3 +464,50 @@ def ccache():
 
     return dict(form=form, total=total,
                 ram=ram, disk=disk, object_stats=hp != False)
+
+
+
+def table_template(table):
+    def types(field):
+        f_type = field.type
+        if not isinstance(f_type,str):
+            return ' '
+        elif f_type == 'string':
+            return field.length
+        elif f_type == 'id':
+            return B('pk')
+        elif f_type.startswith('reference') or \
+                f_type.startswith('list:reference'):
+            return B('fk')
+        else:
+            return ' '
+    # this is horribe HTML but the only one graphiz understands
+    header = '<TR><TD COLSPAN="3" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#F\
+FA21F"><FONT FACE="Helvetica Bold" COLOR="white">%s</FONT></TD></TR>' % table
+    fields = []                                                                
+    for field in db[table]:
+        fields.append('<TR><TD ALIGN="LEFT" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">%s</FONT></TD><TD ALIGN="LEFT" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica">%s</FONT></TD><TD ALIGN="CENTER" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica">%s</FONT></TD></TR>' % (field.name,field.type,types(field)))
+    return '< <TABLE BGCOLOR="#F1F2AD" BORDER="1" CELLBORDER="0" CELLSPACING="0">%s %s</TABLE> >' % (header, ' '.join(fields))
+
+def bg_graph_model():
+    graph = pgv.AGraph(layout='dot', directed=True, strict=False, rankdir='LR')
+    for tablename in db.tables:
+        graph.add_node(tablename, name=tablename, shape='plaintext', 
+                       label=table_template(tablename))
+
+    for tablename in db.tables:
+        for field in db[tablename]:
+            f_type = field.type
+            if isinstance(f_type,str) and (
+                f_type.startswith('reference') or
+                f_type.startswith('list:reference')):
+                referenced_table = f_type.split()[1].split('.')[0]
+                n1 = graph.get_node(tablename)
+                n2 = graph.get_node(referenced_table)
+                graph.add_edge(n1, n2, color="#4C4C4C", label='')
+
+    graph.layout()
+    return graph.draw(format='png', prog='dot')
+
+def graph_model():
+    return dict(databases=databases, pgv=pgv)
diff --git a/applications/examples/views/appadmin.html b/applications/examples/views/appadmin.html
index f966b79c..a9f6dab8 100644
--- a/applications/examples/views/appadmin.html
+++ b/applications/examples/views/appadmin.html
@@ -2,7 +2,7 @@
 <script><!--
     jQuery(document).ready(function(){
     jQuery("table.sortable tbody tr").mouseover( function() {
-    jQuery(this).addClass("highlight"); }).mouseout( function() { 
+    jQuery(this).addClass("highlight"); }).mouseout( function() {
     jQuery(this).removeClass("highlight"); });
     jQuery('table.sortable tbody tr:odd').addClass('odd');
     jQuery('table.sortable tbody tr:even').addClass('even');
@@ -63,11 +63,11 @@
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
     {{if start>0:}}{{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)),_class="btn")}}{{pass}}
-    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}    
+    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}
     {{if rows:}}
        <div style="overflow: auto;" width="80%">
        {{linkto=URL('update',args=request.args[0])}}
-       {{upload=URL('download',args=request.args[0])}}    
+       {{upload=URL('download',args=request.args[0])}}
        {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='sortable')}}
        </div>
     {{pass}}
@@ -75,7 +75,7 @@
     <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
-{{elif request.function=='insert':}}  
+{{elif request.function=='insert':}}
   <h2>{{=T("Database")}} {{=A(request.args[0],_href=URL('index'))}}
     {{if hasattr(table,'_primarykey'):}}
       {{fieldname=table._primarykey[0]}}
@@ -83,7 +83,7 @@
       {{tablename=request.args[1]}}
       {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}
       {{=T("Table")}} {{=A(tablename,_href=URL('select',args=dbname,vars=dict(query='%s.%s.%s%s'%(dbname,tablename,fieldname,cond))))}}
-    {{else:}}  
+    {{else:}}
       {{=T("Table")}} {{=A(request.args[1],_href=URL('select',args=request.args[0],vars=dict(query='%s.%s.id>0'%tuple(request.args[:2]))))}}
     {{pass}}
   </h2>
@@ -95,7 +95,7 @@
       {{fieldname=request.vars.keys()[0]}}
       {{dbname=request.args[0]}}
       {{tablename=request.args[1]}}
-      {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}      
+      {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}
       {{=T("Table")}} {{=A(tablename,_href=URL('select',args=dbname,vars=dict(query='%s.%s.%s%s'%(dbname,tablename,fieldname,cond))))}}
       {{=T("Record")}} {{=A('%s=%s'%request.vars.items()[0],_href=URL('update',args=request.args[:2],vars=request.vars))}}
     {{else:}}
@@ -131,7 +131,7 @@
               dict(ratio=total['ratio'], hits=total['hits'], misses=total['misses']))}}
      </p>
     <p>
-      {{=T("Size of cache:")}} 
+      {{=T("Size of cache:")}}
       {{if object_stats:}}
         {{=T.M("**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}", dict(items=total['objects'], bytes=total['bytes']))}}
         {{if total['bytes'] > 524287:}}
@@ -151,7 +151,7 @@
     </div>
     <br />
     {{pass}}
-        
+
     <h4>{{=T("RAM")}}</h4>
     <p>{{=T.M("Number of entries: **%s**", ram['entries'])}}</p>
     {{if ram['entries'] > 0:}}
@@ -179,16 +179,16 @@
     </div>
     <br />
     {{pass}}
-    
+
     <h4>{{=T("DISK")}}</h4>
     <p>{{=T.M("Number of entries: **%s**", disk['entries'])}}</p>
     {{if disk['entries'] > 0:}}
       <p>
       {{=T.M("Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})",
-            dict(ratio=disk['ratio'], hits=disk['hits'], misses=disk['misses']))}} 
+            dict(ratio=disk['ratio'], hits=disk['hits'], misses=disk['misses']))}}
       </p>
       <p>
-      {{=T("Size of cache:")}} 
+      {{=T("Size of cache:")}}
       {{if object_stats:}}
         {{=T.M("**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}", dict( items=disk['objects'], bytes=disk['bytes']))}}
         {{if disk['bytes'] > 524287:}}
@@ -209,11 +209,11 @@
       <br />
     {{pass}}
   </div>
-    
+
   <div class="list-header">
     <h3>{{=T("Manage Cache")}}</h3>
   </div>
-  
+
   <div class="content">
     <p>
       {{=form}}
@@ -222,3 +222,14 @@
 </div>
 <div class="clear"></div>
 {{pass}}
+
+{{if request.function=='graph_model':}}
+<h2>{{=T("Graph Model")}}</h2>
+  {{if not pgv:}}
+    {{=T('pygraphviz library not found')}}
+  {{elif not databases:}}
+    {{=T("No databases in this application")}}
+  {{else:}}
+    {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
+  {{pass}}
+{{pass}}
diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py
index d9b81010..ee83434f 100644
--- a/applications/welcome/controllers/appadmin.py
+++ b/applications/welcome/controllers/appadmin.py
@@ -10,6 +10,10 @@ import datetime
 import copy
 import gluon.contenttype
 import gluon.fileutils
+try:
+    import pygraphviz as pgv
+except ImportError:
+    pgv = None
 
 response.subtitle = 'Database Administration (appadmin)'
 
@@ -460,3 +464,50 @@ def ccache():
 
     return dict(form=form, total=total,
                 ram=ram, disk=disk, object_stats=hp != False)
+
+
+
+def table_template(table):
+    def types(field):
+        f_type = field.type
+        if not isinstance(f_type,str):
+            return ' '
+        elif f_type == 'string':
+            return field.length
+        elif f_type == 'id':
+            return B('pk')
+        elif f_type.startswith('reference') or \
+                f_type.startswith('list:reference'):
+            return B('fk')
+        else:
+            return ' '
+    # this is horribe HTML but the only one graphiz understands
+    header = '<TR><TD COLSPAN="3" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="#F\
+FA21F"><FONT FACE="Helvetica Bold" COLOR="white">%s</FONT></TD></TR>' % table
+    fields = []                                                                
+    for field in db[table]:
+        fields.append('<TR><TD ALIGN="LEFT" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica Bold">%s</FONT></TD><TD ALIGN="LEFT" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica">%s</FONT></TD><TD ALIGN="CENTER" CELLPADDING="4" BORDER="0"><FONT COLOR="#7B7B7B" FACE="Helvetica">%s</FONT></TD></TR>' % (field.name,field.type,types(field)))
+    return '< <TABLE BGCOLOR="#F1F2AD" BORDER="1" CELLBORDER="0" CELLSPACING="0">%s %s</TABLE> >' % (header, ' '.join(fields))
+
+def bg_graph_model():
+    graph = pgv.AGraph(layout='dot', directed=True, strict=False, rankdir='LR')
+    for tablename in db.tables:
+        graph.add_node(tablename, name=tablename, shape='plaintext', 
+                       label=table_template(tablename))
+
+    for tablename in db.tables:
+        for field in db[tablename]:
+            f_type = field.type
+            if isinstance(f_type,str) and (
+                f_type.startswith('reference') or
+                f_type.startswith('list:reference')):
+                referenced_table = f_type.split()[1].split('.')[0]
+                n1 = graph.get_node(tablename)
+                n2 = graph.get_node(referenced_table)
+                graph.add_edge(n1, n2, color="#4C4C4C", label='')
+
+    graph.layout()
+    return graph.draw(format='png', prog='dot')
+
+def graph_model():
+    return dict(databases=databases, pgv=pgv)
diff --git a/applications/welcome/views/appadmin.html b/applications/welcome/views/appadmin.html
index f966b79c..a9f6dab8 100644
--- a/applications/welcome/views/appadmin.html
+++ b/applications/welcome/views/appadmin.html
@@ -2,7 +2,7 @@
 <script><!--
     jQuery(document).ready(function(){
     jQuery("table.sortable tbody tr").mouseover( function() {
-    jQuery(this).addClass("highlight"); }).mouseout( function() { 
+    jQuery(this).addClass("highlight"); }).mouseout( function() {
     jQuery(this).removeClass("highlight"); });
     jQuery('table.sortable tbody tr:odd').addClass('odd');
     jQuery('table.sortable tbody tr:even').addClass('even');
@@ -63,11 +63,11 @@
     <br/><br/>
     <h4>{{=T("%s selected", nrows)}}</h4>
     {{if start>0:}}{{=A(T('previous 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start-100)),_class="btn")}}{{pass}}
-    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}    
+    {{if stop<nrows:}}{{=A(T('next 100 rows'),_href=URL('select',args=request.args[0],vars=dict(start=start+100)),_class="btn")}}{{pass}}
     {{if rows:}}
        <div style="overflow: auto;" width="80%">
        {{linkto=URL('update',args=request.args[0])}}
-       {{upload=URL('download',args=request.args[0])}}    
+       {{upload=URL('download',args=request.args[0])}}
        {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='sortable')}}
        </div>
     {{pass}}
@@ -75,7 +75,7 @@
     <a href="{{=URL('csv',args=request.args[0],vars=dict(query=query))}}" class="btn">{{=T("export as csv file")}}</a>
   {{=formcsv or ''}}
 
-{{elif request.function=='insert':}}  
+{{elif request.function=='insert':}}
   <h2>{{=T("Database")}} {{=A(request.args[0],_href=URL('index'))}}
     {{if hasattr(table,'_primarykey'):}}
       {{fieldname=table._primarykey[0]}}
@@ -83,7 +83,7 @@
       {{tablename=request.args[1]}}
       {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}
       {{=T("Table")}} {{=A(tablename,_href=URL('select',args=dbname,vars=dict(query='%s.%s.%s%s'%(dbname,tablename,fieldname,cond))))}}
-    {{else:}}  
+    {{else:}}
       {{=T("Table")}} {{=A(request.args[1],_href=URL('select',args=request.args[0],vars=dict(query='%s.%s.id>0'%tuple(request.args[:2]))))}}
     {{pass}}
   </h2>
@@ -95,7 +95,7 @@
       {{fieldname=request.vars.keys()[0]}}
       {{dbname=request.args[0]}}
       {{tablename=request.args[1]}}
-      {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}      
+      {{cond = table[fieldname].type in ['string','text'] and '!=""' or '>0'}}
       {{=T("Table")}} {{=A(tablename,_href=URL('select',args=dbname,vars=dict(query='%s.%s.%s%s'%(dbname,tablename,fieldname,cond))))}}
       {{=T("Record")}} {{=A('%s=%s'%request.vars.items()[0],_href=URL('update',args=request.args[:2],vars=request.vars))}}
     {{else:}}
@@ -131,7 +131,7 @@
               dict(ratio=total['ratio'], hits=total['hits'], misses=total['misses']))}}
      </p>
     <p>
-      {{=T("Size of cache:")}} 
+      {{=T("Size of cache:")}}
       {{if object_stats:}}
         {{=T.M("**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}", dict(items=total['objects'], bytes=total['bytes']))}}
         {{if total['bytes'] > 524287:}}
@@ -151,7 +151,7 @@
     </div>
     <br />
     {{pass}}
-        
+
     <h4>{{=T("RAM")}}</h4>
     <p>{{=T.M("Number of entries: **%s**", ram['entries'])}}</p>
     {{if ram['entries'] > 0:}}
@@ -179,16 +179,16 @@
     </div>
     <br />
     {{pass}}
-    
+
     <h4>{{=T("DISK")}}</h4>
     <p>{{=T.M("Number of entries: **%s**", disk['entries'])}}</p>
     {{if disk['entries'] > 0:}}
       <p>
       {{=T.M("Hit Ratio: **%(ratio)s%%** (**%(hits)s** %%{hit(hits)} and **%(misses)s** %%{miss(misses)})",
-            dict(ratio=disk['ratio'], hits=disk['hits'], misses=disk['misses']))}} 
+            dict(ratio=disk['ratio'], hits=disk['hits'], misses=disk['misses']))}}
       </p>
       <p>
-      {{=T("Size of cache:")}} 
+      {{=T("Size of cache:")}}
       {{if object_stats:}}
         {{=T.M("**%(items)s** %%{item(items)}, **%(bytes)s** %%{byte(bytes)}", dict( items=disk['objects'], bytes=disk['bytes']))}}
         {{if disk['bytes'] > 524287:}}
@@ -209,11 +209,11 @@
       <br />
     {{pass}}
   </div>
-    
+
   <div class="list-header">
     <h3>{{=T("Manage Cache")}}</h3>
   </div>
-  
+
   <div class="content">
     <p>
       {{=form}}
@@ -222,3 +222,14 @@
 </div>
 <div class="clear"></div>
 {{pass}}
+
+{{if request.function=='graph_model':}}
+<h2>{{=T("Graph Model")}}</h2>
+  {{if not pgv:}}
+    {{=T('pygraphviz library not found')}}
+  {{elif not databases:}}
+    {{=T("No databases in this application")}}
+  {{else:}}
+    {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
+  {{pass}}
+{{pass}}