Re-jigged the CSS for the text and image display pages so that it is built on top of Greg's CSS, and CSS lower in the hierarchy also maintains the same look and feel. For the text pages, it was fairly straightforward, but for the image pages we had to do a full redesign of the layout, and override the default menu placement and behaviour to keep it out of the way of the image. I think the results are pretty good. There's more to do with the menu, and with the search page and search results display, but we should get that finished tomorrow. Tested on FF, Opera, IE7 and Safari. I would like to make the annotation menu a little clearer too; the difference between the annotation category headers and their child annotation titles is not distinctive enough.
While working on the site CSS, I discovered another set of line elements (<l>
) not enclosed by line-group elements (<lg>
), in "Chat" and "Coquette". Fixed these.
Also while working on the search, I found annotation categories with no title, and misspelled annotation categories, which I also fixed. Fixes have been uploaded into the db and also into the working folder in the Mariage account.
... "phrase exact" searches weren't working. Turned out to be a missing comma.
Added the final bit of functionality to the search: limiting searches to particular image annotation categories:
- Added a JavaScript function to ensure that when an annotation category is selected, then "Gravure" is selected as the document type, since it's the only type of document that does contain annotations.
- Added another function to ensure that when a document type other than "Gravure" is selected, the annotation category selector is set to blank. Thus it should be impossible to search for annotation categories without limiting the document type to Gravure.
- Added annotation category handling to the
find.xq
file which does the XQuery search. This entailed changes to theBuildSearchStringBit
function, since that's the best place to handle it. There are two new scenarios to handle: when there's both a search string and a category constraint, in which case it has to search only within annotations in that category, and when there's no search string but there is a category constraint, in which case it just needs to retrieve a list of documents which contain annotations in that category.
Minimal testing so far, but it seems to be doing the job OK.
Greg and I worked on the XSLT, CSS and HTML for the site to implement the new theme, which we'll probably make available in a choice of colour-schemes to the end user. We worked with the biblio.xq page, which is the most complicated one with the exception of texts and images themselves. It's almost complete, and once it's done (tomorrow, we hope), we'll port the changes into the other pages, and then (hardest of all) into the text and image rendering pages. We're really hoping everything will be done by Friday's Showcase.
Continued working on the XSLT code in preparation for the site redesign, until Lettuce went down. Reported that to the sysops, but no immediate response.
In the process of fixing biblio information in some of the documents, I ran up against a couple of questions:
- Two of the documents, Reconfort des Femmes and Purgatoire, are sourced from the same 19th-century collection. The first included the info that it was from "Tome IV", but there's no volume number in the data for the other one. Is Purgatoire also from Tome IV?
- Purgatoire also lacks an author tag. Is it "anon."?
<biblStruct>
tags to all remaining files that are taken from Cabinet Satyrique, and copied them into the db and onto the server archive.Check out http://lettuce.tapor.uvic.ca/~gregster/mariage/mariage_home.html
Comments needed.
Using the one file I've already fixed, a_une_femme_mariee.xml
, fix the remaining files which use the XInclude feature to include source description metadata (see this post). Make sure each has an appropriate <analytic>
tag.