We want to leave the existing Mariage site fully functional while we convert to the new site, so I've set up a temporary project site where we can work on integrating the new look.

It has, of course, no CSS. The XQuery and some of the XSLT has been converted so that most of the pages more or less work, with the exception of the actual document display. In the process of editing the XQuery I've been able to dispense with a lot of prefixes, now we no longer need to distinguish between SVG and TEI elements. It also strikes me that we should be able to dispense with the old <html_block> pseudo-tag I was using to insert verbatim blocks of XHTML code into documents; instead, we should perhaps use pure XHTML in the correct namespace, with a mechanism that looks like this:

<div class="blockContainer" xmlns="http://www.w3.org/1999/xhtml">
  <p>A paragraph...</p>
  <img...></img>
</div>

with matchers that work like this:

<xsl:template match="xhtml:div[@class='blockContainer']">
  <xsl:copy-of select="*" />
</xsl:template>

I haven't tested this yet, but I'm sure it can be made to work OK, which should simplify things and remove the proprietary container tag I'm currently using.

Once that's done, and the core XSLT has been refined a bit, I need to make sure the search is working (its AJAX functionality will need checking). After that, we'll be ready to start integrating the new look CSS.