Changeset 525 for CMIP6dreqbuild

Timestamp:

12/12/15 15:06:35 (6 years ago)

Author:

mjuckes

Message:

Added option of annex to vocabFrameworkSchema

Location:

CMIP6dreqbuild/trunk/src/framework

Files:

• dreqPy/dreq.py (modified) (3 diffs)
• makeTables.py (modified) (1 diff)

CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py

@@ -691 +691 @@
    CMIP6 Data Request
 </div>
-<div id="nav"></div>
+<div id="nav"><div><a href="%s" title="Home">H</a></div></div>
 
 <div id="section">
@@ -734 +734 @@
       bdy = string.join( i.__html__( ghis=self.getHtmlItemStyle ), '\n' )
       oo = open( '%s/u/%s.html' % (odir,i.uid), 'w' )
-      oo.write( self.pageTmpl % (ttl, jsh, '../', bdy ) )
+      oo.write( self.pageTmpl % (ttl, jsh, '../', '../index.html', bdy ) )
       oo.close()
 
@@ -768 +768 @@
       bdy = string.join( msg, '\n' )
       oo = open( '%s/index/%s.html' % (odir,k), 'w' )
-      oo.write( self.pageTmpl % (ttl, '', '../', bdy ) )
+      oo.write( self.pageTmpl % (ttl, '', '../', '../index.html', bdy ) )
       oo.close()
     msg0.append( '</ul>' )
     bdy = string.join( msg0, '\n' )
     oo = open( '%s/index.html' % odir, 'w' )
-    oo.write( self.pageTmpl % (ttl0, '', '', bdy ) )
+    oo.write( self.pageTmpl % (ttl0, '', '', 'index.html', bdy ) )
     oo.close()
     

CMIP6dreqbuild/trunk/src/framework/makeTables.py

@@ -224 +224 @@
       bdy.append( '</ul></body></html>\n' )
       oo = open( '%s/%s.html' % (self.odir,v.label), 'w' )
-      oo.write( dq.pageTmpl % ( title, '', '../', string.join( bdy, '\n' ) ) )
+      oo.write( dq.pageTmpl % ( title, '', '../', '../index.html', string.join( bdy, '\n' ) ) )
       oo.close()
       self.anno[v.label] = '<a href="../t/%s.html">Usage</a>' % v.label