The documentation view uses Ext.data.Store instead of the Ext.data.ArrayStore.

controllers/plugin_dbui.py

@@ -224,7 +224,7 @@ def documentations():
     and for the source code.
     
     """
-    from plugin_dbui import get_reference_paths
+    from plugin_dbui import get_reference_paths, Store
 
     # alias
     a = '<a href="%s" target="_blank">%s</a>'
@@ -248,60 +248,77 @@ def documentations():
     if os.path.exists(os.path.join(apath, 'static/docs/jsduck/index.html')):
         jsdoc = a % (URL('static', 'docs/jsduck/index.html'), trJS)
         
-    # configuration of the Ext.data.Array for the documentation
-    cfg = dict()
+    # configuration of the Ext.data.Store for the documentation
+    cfg = Store()
     
-    cfg['fields'] = [{'name': 'code', 'type': 'string'},
-                     {'name': 'developer', 'type': 'string'},
-                     {'name': 'python', 'type': 'string'},
-                     {'name': 'javascript', 'type': 'string'}]
-
-    r1 = (request.application, userdoc, pydoc, jsdoc)
-
-    r2 = (a % ("https://marprod.in2p3.fr/plugin_dbui_book", "plugin_dbui"),
-          a % ("https://marprod.in2p3.fr/plugin_dbui_book/default/chapter/29", trDev),
-          a % (URL('static', 'plugin_dbui/docs/epydoc/index.html'), trPy),
-          a % (URL('static', 'plugin_dbui/docs/jsduck/index.html'), trJS))
+    cfg.fields = [dict(name='code', type='string'),
+                  dict(name='developer', type='string'),
+                  dict(name='python', type='string'),
+                  dict(name='javascript', type='string')]
+
+    r1 = dict(code=request.application, 
+              developer=userdoc, 
+              python=pydoc, 
+              javascript=jsdoc)
+
+    r2 = dict(code=a % ("https://marprod.in2p3.fr/plugin_dbui_book", "plugin_dbui"),
+              developer=a % ("https://marprod.in2p3.fr/plugin_dbui_book/default/chapter/29", trDev),
+              python=a % (URL('static', 'plugin_dbui/docs/epydoc/index.html'), trPy),
+              javascript=a % (URL('static', 'plugin_dbui/docs/jsduck/index.html'), trJS))
      
-    r3 = (a % ("http://web2py.com/", "Web2py"),
-          a % ("http://web2py.com/book", trDev),
-          a % ("http://www.web2py.com/examples/static/epydoc/index.html", trPy),
-          "")
+    r3 = dict(code=a % ("http://web2py.com/", "Web2py"),
+              developer=a % ("http://web2py.com/book", trDev),
+              python=a % ("http://www.web2py.com/examples/static/epydoc/index.html", trPy),
+              javascript="")
  
-    r4 = (a % ("http://www.sencha.com/products/extjs/", "Ext JS"),
-          "",
-          "",
-          a % ("http://docs.sencha.com/extjs/4.2.1/", trJS))
+    r4 = dict(code=a % ("http://www.sencha.com/products/extjs/", "Ext JS"),
+              developer="",
+              python="",
+              javascript=a % ("http://docs.sencha.com/extjs/4.2.1/", trJS))
  
-    r5 = (a % ("http://www.mathjax.org/", "MathJax"),
-          "",
-          "",
-          a % ("http://docs.mathjax.org/", trJS))
+    r5 = dict(code=a % ("http://www.mathjax.org/", "MathJax"),
+              developer="",
+              python="",
+              javascript=a % ("http://docs.mathjax.org/", trJS))
  
-    r6 = (a % ("http://ace.c9.io/#nav=about", "Ace"),
-          "",
-          "",
-          a % ("http://ace.c9.io/#nav=api", trJS))
+    r6 = dict(code=a % ("http://ace.c9.io/#nav=about", "Ace"),
+              developer="",
+              python="",
+              javascript=a % ("http://ace.c9.io/#nav=api", trJS))
  
-    cfg['data'] = [r1, r2, r3, r4, r5, r6]
+    cfg.data = [r1, r2, r3, r4, r5, r6]
         
     cfg_doc = json.dumps(cfg)
 
-    # configuration of the Ext.data.Array for the source code
-    cfg = dict()
-    cfg['fields'] = [{'name': 'code', 'type': 'string'},
-                     {'name': 'source', 'type': 'string'}]
-    
-    r1 = (request.application, "<em>git clone http://marwww.in2p3.fr/~legac/wap/git/%s.git</em>" % request.application)
-    r2 = ("plugin_dbui", "<em>git clone http://marwww.in2p3.fr/~legac/wap/git/web2py_plugin_dbui.git</em>")
-    r3 = ("Web2py", "<em>git clone git://github.com/web2py/web2py.git</em>")
-    r4 = ("Ext JS",
-          "<em>Download from the Ext JS web site.</em><br>" 
-          "<em>In the local directory: %s/static/plugin_extjs/src</em>" % request.application)
-    r5 = ("MathJax", "<em>git clone http://github.com/mathjax/MathJax</em>")
-    r6 = ("Ace", "<em>git clone git://github.com/ajaxorg/ace.git</em>")
+    # configuration of the Ext.data.Store for the source code
+    cfg = Store()
+    cfg.fields = [dict(name='code', type='string'),
+                  dict(name='source', type='string')]
+    
+    r1 = dict(code=request.application, 
+              source="<em>git clone http://www.cppm.in2p3.fr/~legac/wap/git/"
+                     "%s.git</em>" % request.application)
+    
+    r2 = dict(code="plugin_dbui", 
+              source="<em>git clone http://www.cppm.in2p3.fr/~legac/wap/git/"
+                     "web2py_plugin_dbui.git</em>")
+    
+    r3 = dict(code="Web2py", 
+              source="<em>git clone git://github.com/web2py/web2py.git</em>")
+    
+    r4 = dict(code="Ext JS",
+              source="<em>Download from the Ext JS web site. </em><br>" 
+                     "<em>It is also available in the local directory: "
+                     "%s/static/plugin_extjs/src</em>" % request.application)
+    
+    r5 = dict(code="MathJax",
+              source="<em>git clone http://github.com/mathjax/MathJax</em>")
+    
+    r6 = dict(code="Ace", 
+              source="<em>git clone git://github.com/ajaxorg/ace.git</em>")
      
-    cfg['data'] = [r1, r2, r3, r4, r5, r6]
+    cfg.data = [r1, r2, r3, r4, r5, r6]
+    
     cfg_src = json.dumps(cfg)
     
     return dict(cfg_doc=cfg_doc, cfg_src=cfg_src) 

views/plugin_dbui/documentations.html

@@ -6,32 +6,34 @@
     #
     #--------------------------------------------------------------------------
 
-    #
-    # Export python variables to the javascript
-    #
-    jsvars = ["cfgDoc = %s" % cfg_doc,
-              "cfgSrc = %s" % cfg_src]
-
-    jsvars = "    var %s;" % ',\n'.join(jsvars)
-    response.write(SCRIPT(jsvars), escape=False)
-
     #
     # unique identifier for the DIV block associated to the grid
     #
-    divdoc = id(cfg_doc)
-    divsrc = id(cfg_src)
+    grid_doc = "grid-%s" % id(cfg_doc)
+    grid_src = "grid-%s" % id(cfg_src)
 
     #
     # The DIV blocks
     #
     response.write(H2(T("Documentations"), _class="dbui-h2 dbui-small-cap"))
-    response.write(DIV(_id="grid-%s" % divdoc))
+    response.write(DIV(_id=grid_doc))
 
     response.write(H2(T("Open source"), _class="dbui-h2 dbui-small-cap"))
-    response.write(DIV(_id="grid-%s" % divsrc))
+    response.write(DIV(_id=grid_src))
 
     response.write(H2(T("Binary files"), _class="dbui-h2 dbui-small-cap"))
 
+    #
+    # Export python variables to the javascript
+    #
+    jsvars = ["cfgDoc = %s" % cfg_doc,
+              "cfgSrc = %s" % cfg_src,
+              "gridDoc = '%s'" % grid_doc,
+              "gridSrc = '%s'" % grid_src]
+
+    jsvars = "    var %s;" % ',\n'.join(jsvars)
+    response.write(SCRIPT(jsvars), escape=False)
+
 }}
 <div style="width: 570px;">
     <p class="dbui-p" style="margin-left: 7%; margin-right: 7%;">
@@ -45,7 +47,7 @@
 
     Des versions cohérentes sont disponible en utilisant
     le gestionnaire de version <a href="http://git-scm.com/" target="_blank">git</a> :
-    <em>git clone http://marwww.in2p3.fr/~legac/wap/git/plugin_dbui_build.git</em>.
+    <em>git clone http://www.cppm.in2p3.fr/~legac/wap/git/plugin_dbui_build.git</em>.
     </p>
 </div>
 <script>
@@ -54,7 +56,7 @@
     // instantiate the grid for the documentation
     //
     var grid = Ext.create('Ext.grid.Panel', {
-        store: Ext.create('Ext.data.ArrayStore', cfgDoc),
+        store: cfgDoc,
         columns: [
             {text: "code", dataIndex: 'code', width:80},
             {text: "developer", dataIndex: 'developer', flex: 1.8},
@@ -65,14 +67,14 @@
         hideHeaders: true,
         padding: "0 40 0 40",
         width: 570,
-        renderTo: 'grid-{{=divdoc}}'
+        renderTo: gridDoc
     });
 
     //
     // instantiate the grid for source code
     //
     var grid = Ext.create('Ext.grid.Panel', {
-        store: Ext.create('Ext.data.ArrayStore', cfgSrc),
+        store: cfgSrc,
         columns: [
             {text: "code", dataIndex: 'code', width: 80},
             {text: "source", dataIndex: 'source', flex: 2}
@@ -81,7 +83,7 @@
         hideHeaders: true,
         padding: "0 40 0 40",
         width: 570,
-        renderTo: 'grid-{{=divsrc}}'
+        renderTo: gridSrc
     });
 
 </script>
\ No newline at end of file