changeset 902:89ba3ffcf552

merge jquery + mvn into default
author robcast
date Tue, 26 Apr 2011 11:38:11 +0200
parents cad6d3d5aeb3 (current diff) 1b627b5c9fad (diff)
children 7779b37d1d05
files client/digitallibrary/META-INF/MANIFEST.MF client/digitallibrary/WEB-INF/digilib-auth.xml client/digitallibrary/WEB-INF/digilib-config.xml client/digitallibrary/WEB-INF/digilib-map.xml client/digitallibrary/WEB-INF/log4j-config.xml client/digitallibrary/WEB-INF/web.xml client/digitallibrary/baselib.js client/digitallibrary/digicat.html client/digitallibrary/digicat.jsp client/digitallibrary/digilib-fail.html client/digitallibrary/digilib-login.html client/digitallibrary/digilib.html client/digitallibrary/digilib.jsp client/digitallibrary/digimage.jsp client/digitallibrary/digimage_img_inc.jsp client/digitallibrary/digimage_tbl_inc.jsp client/digitallibrary/dirInfo-xml.jsp client/digitallibrary/dlContext-xml.jsp client/digitallibrary/dlInfo-js.jsp client/digitallibrary/dlInfo-xml.jsp client/digitallibrary/dllib.js client/digitallibrary/empty.html client/digitallibrary/greyskin/back.png client/digitallibrary/greyskin/back.svg client/digitallibrary/greyskin/baselib.js client/digitallibrary/greyskin/bg.png client/digitallibrary/greyskin/bg.svg client/digitallibrary/greyskin/birds-eye.png client/digitallibrary/greyskin/birds-eye.svg client/digitallibrary/greyskin/blue.png client/digitallibrary/greyskin/brightness-on.png client/digitallibrary/greyskin/brightness-on.svg client/digitallibrary/greyskin/brightness.png client/digitallibrary/greyskin/brightness.svg client/digitallibrary/greyskin/calibration-x.png client/digitallibrary/greyskin/calibration-x.svg client/digitallibrary/greyskin/calibration-y.png client/digitallibrary/greyskin/calibration-y.svg client/digitallibrary/greyskin/cat.png client/digitallibrary/greyskin/cat.svg client/digitallibrary/greyskin/contrast-on.png client/digitallibrary/greyskin/contrast-on.svg client/digitallibrary/greyskin/contrast.png client/digitallibrary/greyskin/contrast.svg client/digitallibrary/greyskin/corona.png client/digitallibrary/greyskin/corona.svg client/digitallibrary/greyskin/debug.js client/digitallibrary/greyskin/delmark.png client/digitallibrary/greyskin/delmark.svg client/digitallibrary/greyskin/diginew.css client/digitallibrary/greyskin/diginew.jsp client/digitallibrary/greyskin/dlMenu.html client/digitallibrary/greyskin/dllib.js client/digitallibrary/greyskin/down.png client/digitallibrary/greyskin/down.svg client/digitallibrary/greyskin/first.png client/digitallibrary/greyskin/first.svg client/digitallibrary/greyskin/firstlast.svg client/digitallibrary/greyskin/fixed.js client/digitallibrary/greyskin/fwd.png client/digitallibrary/greyskin/fwd.svg client/digitallibrary/greyskin/help.png client/digitallibrary/greyskin/help.svg client/digitallibrary/greyskin/last.png client/digitallibrary/greyskin/last.svg client/digitallibrary/greyskin/left.png client/digitallibrary/greyskin/left.svg client/digitallibrary/greyskin/mark-bg-16.png client/digitallibrary/greyskin/mark-bg.png client/digitallibrary/greyskin/mark-bg.svg client/digitallibrary/greyskin/mark-bg_old.svg client/digitallibrary/greyskin/mark.png client/digitallibrary/greyskin/mark.svg client/digitallibrary/greyskin/mirror-horizontal-on.png client/digitallibrary/greyskin/mirror-horizontal-on.svg client/digitallibrary/greyskin/mirror-horizontal.png client/digitallibrary/greyskin/mirror-horizontal.svg client/digitallibrary/greyskin/mirror-vertical-on.png client/digitallibrary/greyskin/mirror-vertical-on.svg client/digitallibrary/greyskin/mirror-vertical.png client/digitallibrary/greyskin/mirror-vertical.svg client/digitallibrary/greyskin/mirror.svg client/digitallibrary/greyskin/options.png client/digitallibrary/greyskin/options.svg client/digitallibrary/greyskin/original-size.png client/digitallibrary/greyskin/original-size.svg client/digitallibrary/greyskin/page.png client/digitallibrary/greyskin/page.svg client/digitallibrary/greyskin/pagewidth.png client/digitallibrary/greyskin/pagewidth.svg client/digitallibrary/greyskin/pixel-by-pixel.png client/digitallibrary/greyskin/pixel-by-pixel.svg client/digitallibrary/greyskin/quality.png client/digitallibrary/greyskin/quality.svg client/digitallibrary/greyskin/reference.png client/digitallibrary/greyskin/reference.svg client/digitallibrary/greyskin/reset.png client/digitallibrary/greyskin/reset.svg client/digitallibrary/greyskin/rgb-on.png client/digitallibrary/greyskin/rgb-on.svg client/digitallibrary/greyskin/rgb.png client/digitallibrary/greyskin/rgb.svg client/digitallibrary/greyskin/right.png client/digitallibrary/greyskin/right.svg client/digitallibrary/greyskin/rightleft.svg client/digitallibrary/greyskin/rotate-on.png client/digitallibrary/greyskin/rotate-on.svg client/digitallibrary/greyskin/rotate.png client/digitallibrary/greyskin/rotate.svg client/digitallibrary/greyskin/ruler-top.gif client/digitallibrary/greyskin/size.png client/digitallibrary/greyskin/size.svg client/digitallibrary/greyskin/trans.gif client/digitallibrary/greyskin/up.png client/digitallibrary/greyskin/up.svg client/digitallibrary/greyskin/zoom-area.png client/digitallibrary/greyskin/zoom-area.svg client/digitallibrary/greyskin/zoom-full.png client/digitallibrary/greyskin/zoom-full.svg client/digitallibrary/greyskin/zoom-in.png client/digitallibrary/greyskin/zoom-in.svg client/digitallibrary/greyskin/zoom-out.png client/digitallibrary/greyskin/zoom-out.svg client/digitallibrary/img/digilib-denied.png client/digitallibrary/img/digilib-denied.svg client/digitallibrary/img/digilib-error.png client/digitallibrary/img/digilib-error.svg client/digitallibrary/img/digilib-logo-small.png client/digitallibrary/img/digilib-logo-sw.svg client/digitallibrary/img/digilib-logo-text1.png client/digitallibrary/img/digilib-logo.png client/digitallibrary/img/digilib-logo.svg client/digitallibrary/img/digilib-notfound.png client/digitallibrary/img/digilib-notfound.svg client/digitallibrary/img/down.gif client/digitallibrary/img/left.gif client/digitallibrary/img/mark1.gif client/digitallibrary/img/mark2.gif client/digitallibrary/img/mark3.gif client/digitallibrary/img/mark4.gif client/digitallibrary/img/mark5.gif client/digitallibrary/img/mark6.gif client/digitallibrary/img/mark7.gif client/digitallibrary/img/mark8.gif client/digitallibrary/img/olinks.gif client/digitallibrary/img/orechts.gif client/digitallibrary/img/right.gif client/digitallibrary/img/ulinks.gif client/digitallibrary/img/up.gif client/digitallibrary/img/urechts.gif client/digitallibrary/oldskin/buttons/back0.gif client/digitallibrary/oldskin/buttons/back1.gif client/digitallibrary/oldskin/buttons/background0.gif client/digitallibrary/oldskin/buttons/background1.gif client/digitallibrary/oldskin/buttons/description0.gif client/digitallibrary/oldskin/buttons/description1.gif client/digitallibrary/oldskin/buttons/digicat0.gif client/digitallibrary/oldskin/buttons/digicat1.gif client/digitallibrary/oldskin/buttons/download0.gif client/digitallibrary/oldskin/buttons/download1.gif client/digitallibrary/oldskin/buttons/fullpage0.gif client/digitallibrary/oldskin/buttons/fullpage1.gif client/digitallibrary/oldskin/buttons/glossar0.gif client/digitallibrary/oldskin/buttons/help0.gif client/digitallibrary/oldskin/buttons/home0.gif client/digitallibrary/oldskin/buttons/home1.gif client/digitallibrary/oldskin/buttons/makepdf0.gif client/digitallibrary/oldskin/buttons/makepdf1.gif client/digitallibrary/oldskin/buttons/mark.gif client/digitallibrary/oldskin/buttons/mark0.gif client/digitallibrary/oldskin/buttons/mark1.gif client/digitallibrary/oldskin/buttons/matrix0.gif client/digitallibrary/oldskin/buttons/matrix1.gif client/digitallibrary/oldskin/buttons/menu.js client/digitallibrary/oldskin/buttons/moveto0.gif client/digitallibrary/oldskin/buttons/moveto1.gif client/digitallibrary/oldskin/buttons/newwindow0.gif client/digitallibrary/oldskin/buttons/newwindow1.gif client/digitallibrary/oldskin/buttons/next0.gif client/digitallibrary/oldskin/buttons/next1.gif client/digitallibrary/oldskin/buttons/nomark.gif client/digitallibrary/oldskin/buttons/page0.gif client/digitallibrary/oldskin/buttons/page1.gif client/digitallibrary/oldskin/buttons/questionmark0.gif client/digitallibrary/oldskin/buttons/questionmark1.gif client/digitallibrary/oldskin/buttons/reference0.gif client/digitallibrary/oldskin/buttons/reference1.gif client/digitallibrary/oldskin/buttons/refresh0.gif client/digitallibrary/oldskin/buttons/refresh1.gif client/digitallibrary/oldskin/buttons/relation0.gif client/digitallibrary/oldskin/buttons/relation1.gif client/digitallibrary/oldskin/buttons/scale0.gif client/digitallibrary/oldskin/buttons/scale1.gif client/digitallibrary/oldskin/buttons/spacer.gif client/digitallibrary/oldskin/buttons/type0.gif client/digitallibrary/oldskin/buttons/type1.gif client/digitallibrary/oldskin/buttons/work0.gif client/digitallibrary/oldskin/buttons/work1.gif client/digitallibrary/oldskin/buttons/zoomarea0.gif client/digitallibrary/oldskin/buttons/zoomarea1.gif client/digitallibrary/oldskin/buttons/zoomin0.gif client/digitallibrary/oldskin/buttons/zoomin1.gif client/digitallibrary/oldskin/buttons/zoomout0.gif client/digitallibrary/oldskin/buttons/zoomout1.gif client/digitallibrary/oldskin/buttons/zoompoint0.gif client/digitallibrary/oldskin/buttons/zoompoint1.gif client/digitallibrary/oldskin/dcMain.jsp client/digitallibrary/oldskin/dcMenu.html client/digitallibrary/oldskin/dclib.js client/digitallibrary/oldskin/dlMenu.html client/digitallibrary/oldskin/pageWin.html client/digitallibrary/pdf/error.jsp client/digitallibrary/pdf/wip.jsp client/digitallibrary/server/dlCache.jsp client/digitallibrary/server/dlConfig.jsp client/digitallibrary/server/dlRequest.jsp client/src/main/webapp/WEB-INF/digilib-config.xml config/build.xml config/tomcat/bin/catalina.sh config/tomcat/bin/rctomcat config/tomcat/conf/server.xml servlet/src/META-INF/MANIFEST.MF servlet/src/digilib/auth/AuthOpException.java servlet/src/digilib/auth/AuthOps.java servlet/src/digilib/auth/AuthOpsImpl.java servlet/src/digilib/auth/HashTree.java servlet/src/digilib/auth/XMLAuthOps.java servlet/src/digilib/image/DocuImage.java servlet/src/digilib/image/DocuImageImpl.java servlet/src/digilib/image/ImageInfoDocuImage.java servlet/src/digilib/image/ImageJobDescription.java servlet/src/digilib/image/ImageLoaderDocuImage.java servlet/src/digilib/image/ImageOpException.java servlet/src/digilib/image/ImageSize.java servlet/src/digilib/image/ImageWorker.java servlet/src/digilib/image/JAIDocuImage.java servlet/src/digilib/image/JAIImageLoaderDocuImage.java servlet/src/digilib/io/AliasingDocuDirCache.java servlet/src/digilib/io/DigilibInfoReader.java servlet/src/digilib/io/Directory.java servlet/src/digilib/io/DocuDirCache.java servlet/src/digilib/io/DocuDirectory.java servlet/src/digilib/io/DocuDirent.java servlet/src/digilib/io/FileOpException.java servlet/src/digilib/io/FileOps.java servlet/src/digilib/io/ImageFile.java servlet/src/digilib/io/ImageFileset.java servlet/src/digilib/io/MetadataMap.java servlet/src/digilib/io/SVGFile.java servlet/src/digilib/io/TextFile.java servlet/src/digilib/io/XMLListLoader.java servlet/src/digilib/io/XMLMetaLoader.java servlet/src/digilib/pdf/PDFFileWorker.java servlet/src/digilib/pdf/PDFStreamWorker.java servlet/src/digilib/pdf/PDFTitlePage.java servlet/src/digilib/servlet/DigilibConfiguration.java servlet/src/digilib/servlet/DigilibRequest.java servlet/src/digilib/servlet/DocumentBean.java servlet/src/digilib/servlet/Initialiser.java servlet/src/digilib/servlet/PDFCache.java servlet/src/digilib/servlet/PDFRequest.java servlet/src/digilib/servlet/Scaler.java servlet/src/digilib/servlet/ServletOps.java servlet/src/digilib/servlet/Texter.java servlet/src/digilib/util/DigilibJobCenter.java servlet/src/digilib/util/NumRange.java servlet/src/digilib/util/OptionsSet.java servlet/src/digilib/util/Parameter.java servlet/src/digilib/util/ParameterMap.java servlet/src/main/java/digilib/servlet/DigilibConfiguration.java
diffstat 733 files changed, 69835 insertions(+), 24017 deletions(-) [+]
line wrap: on
line diff
--- a/client/digitallibrary/META-INF/MANIFEST.MF	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
--- a/client/digitallibrary/WEB-INF/digilib-auth.xml	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Authentication configuration file for Digital Document Library -->
-<auth-config>
-
-  <digilib-paths>
-    <!-- 
-      A user must supply one of the roles under "role"
-      to access the directory "name".
-      Roles under "role" must be separated by comma only (no spaces).  
-    -->
-    <path name="histast/eastwood-collection" role="eastwood-coll" />
-    <path name="ptolemaios_geo" role="ptolemaios-geo" />
-  </digilib-paths>
-
-  <digilib-addresses>
-    <!-- 
-      A computer with an ip address that matches "ip"
-      is automatically granted all roles under "role".
-      The ip address is matched from the left (in full quads).
-      Roles under "role" must be separated by comma only (no spaces). 
-    -->
-    <address ip="127" role="local" />
-    <address ip="130.92.68" role="eastwood-coll,ptolemaios-geo" />
-    <address ip="130.92.151" role="ALL" />
-  </digilib-addresses>
-
-</auth-config>
--- a/client/digitallibrary/WEB-INF/digilib-config.xml	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Digilib servlet config file -->
-
-<digilib-config>
-  <!--  Image to be sent to indicate an error or general failure. -->
-  <parameter name="error-image" value="img/digilib-error.png" />
-
-  <!--  Image to be sent to indicate an authorization failure. -->
-  <parameter name="denied-image" value="img/digilib-denied.png" />
-
-  <!--  Image to be sent to indicate that the request was correct, but the specified image could not be ound. -->
-  <parameter name="notfound-image" value="img/digilib-notfound.png" />
-
-  <!-- List of directories where images are searched.
-       Directories with low-resolution images are LAST!!! in list.
-	   Use OS-specific path separators (":" for Unix, ";" for Windows) --> 
-  <parameter name="basedir-list" value="/docuserver/images:/docuserver/scaled/small:/docuserver/scaled/thumb" />
-
-  <!-- Java class to use for image operations -->
-  <parameter name="docuimage-class" value="digilib.image.ImageLoaderDocuImage" />
-
-  <!-- mimimum amount of scaling done with antialiasing -->
-  <parameter name="subsample-minimum" value="2"/>
-  
-  <!-- default interpolation quality (0=worst) -->
-  <parameter name="default-quality" value="1"/>
-  
-  <!-- is sending whole image files with mo=file allowed? -->
-  <parameter name="sendfile-allowed" value="true" />
-
-  <!-- the a maximum size of any sent image. (0 means no limit) -->
-  <parameter name="max-image-size" value="0" />
-
-  <!-- use safe but slow directory indexing -->
-  <parameter name="safe-dir-index" value="false" />
-
-  <!-- number of working threads -->
-  <parameter name="worker-threads" value="2" />
-
-  <!-- number of waiting requests in queue -->
-  <parameter name="max-waiting-threads" value="20" />
-
-  <!-- Restrict access to authorized users.
-       User authentication and roles are provided by the servlet container 
-       (see tomcat-users.xml).
-       Authorization for resources (directories) is evaluated by the servlet 
-       (see auth-file). -->
-  <parameter name="use-authorization" value="false" />
-
-  <!-- URL location of XML file with authorization requirements. -->
-  <parameter name="auth-file" value="digilib-auth.xml" />
-
-  <!-- Part of URL to indicate authenticated access to Tomcat. -->
-  <parameter name="auth-url-path" value="authenticated" />
-  
-  <!-- use mapping of "virtual directories" to real directories on the server -->
-  <parameter name="use-mapping" value="false"/>
-  
-  <!-- location of XML mapping file -->
-  <parameter name="mapping-file" value="digilib-map.xml"/>
-  
-  <!-- location of logger config file -->
-  <parameter name="log-config-file" value="log4j-config.xml"/>
-
-  <!-- location for PDF files while still in progress -->
-  <parameter name="pdf-temp-dir" value="/tmp/pdf_tmp" />
-  
-  <!-- location for PDF files upon completion -->
-  <parameter name="pdf-cache-dir" value="/tmp/pdf_cache"/>
-
-  <!-- number of PDF generation threads -->
-  <parameter name="pdf-worker-threads" value="1" />
-
-  <!-- number of waiting PDF requests in queue -->
-  <parameter name="pdf-max-waiting-threads" value="20" />
-
-  <!-- number of image generation threads for PDF -->
-  <parameter name="pdf-image-worker-threads" value="1" />
-
-  <!-- number of waiting image requests for PDF in queue -->
-  <parameter name="pdf-image-max-waiting-threads" value="10" />
-
-  <!-- logo for PDFs -->
-  <parameter name="pdf-logo" value="http://digilib.berlios.de/images/digilib-logo-big.png" />
-
-  
-</digilib-config>
--- a/client/digitallibrary/WEB-INF/digilib-map.xml	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- mapping of "virtual" and real directories on digilib server -->
-<digilib-aliases>
-  <mapping link="exp1/archimedes/hutto_dicti_1625" dir="lib2/china/QiQi/Vol1"/>
-  <mapping link="exp1/archimedes/kopernicus" dir="pro1/sundries/kop2"/>
-</digilib-aliases>
\ No newline at end of file
--- a/client/digitallibrary/WEB-INF/log4j-config.xml	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-        
-  <appender name="cons" class="org.apache.log4j.ConsoleAppender">
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
-    </layout>
-  </appender>
-
-  <appender name="log" class="org.apache.log4j.FileAppender">
-    <param name="File" value="digilib-log.txt"/>
-    <param name="Append" value="true"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
-    </layout>
-  </appender>
-
-  <appender name="account" class="org.apache.log4j.FileAppender">
-    <param name="File" value="dl-access-log.txt"/>
-    <param name="Append" value="true"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
-    </layout>
-  </appender>
-
-  <logger name="account.request">
-    <level value ="debug"/>
-    <appender-ref ref="account"/>
-  </logger>  
-
-  <root>
-    <level value ="debug"/>
-    <appender-ref ref="cons"/>
-    <appender-ref ref="log"/>
-  </root>
-
-</log4j:configuration>
--- a/client/digitallibrary/WEB-INF/web.xml	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-<!DOCTYPE web-app 
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" 
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-  <!-- General description of your web application -->
-  <display-name>
-        digilib
-  </display-name>
-  <description>
-        This is the web frontend of the Digital Document Library.
-  </description>
-  <!-- The Initaliser servlet -->
-  <servlet>
-        <servlet-name>
-            Initialiser
-        </servlet-name>
-        <description>
-            The inialisation servlet (must run first).
-        </description>
-        <servlet-class>
-            digilib.servlet.Initialiser
-        </servlet-class>
-        <!-- Load this servlet at server startup time -->
-        <load-on-startup>
-            1
-        </load-on-startup>
-  </servlet>
-  <!-- The Scaler servlet -->
-  <servlet>
-        <servlet-name>
-            Scaler
-        </servlet-name>
-        <description>
-            The servlet to scale the digilib images.
-        </description>
-        <servlet-class>
-            digilib.servlet.Scaler
-        </servlet-class>
-        <!-- Load this servlet at server startup time -->
-        <load-on-startup>
-            5
-        </load-on-startup>
-  </servlet>
-  <!-- The Texter servlet -->
-  <servlet>
-        <servlet-name>
-            Texter
-        </servlet-name>
-        <description>
-            The servlet for text.
-        </description>
-        <servlet-class>
-            digilib.servlet.Texter
-        </servlet-class>
-  </servlet>
-  <!-- The PDFCache servlet -->
-  <servlet>
-        <servlet-name>
-            PDFCache
-        </servlet-name>
-        <description>
-            The servlet for PDF.
-        </description>
-        <servlet-class>
-            digilib.servlet.PDFCache
-        </servlet-class>
-  </servlet>
-  <!-- We want to mess around with the default JSP servlet... -->
-  <servlet>
-        <servlet-name>
-            doc-jsp
-        </servlet-name>
-        <servlet-class>
-            org.apache.jasper.servlet.JspServlet
-        </servlet-class>
-        <!-- parameters to the JSP servlet -->
-        <init-param>
-            <param-name>
-                logVerbosityLevel
-            </param-name>
-            <param-value>
-                WARNING
-            </param-value>
-        </init-param>
-        <load-on-startup>
-            3
-        </load-on-startup>
-  </servlet>
-  <!-- The mapping for the Scaler servlet -->
-  <servlet-mapping>
-        <servlet-name>
-            Scaler
-        </servlet-name>
-        <url-pattern>
-            /servlet/Scaler/*
-        </url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-        <servlet-name>
-            Scaler
-        </servlet-name>
-        <url-pattern>
-            /authenticated/servlet/Scaler/*
-        </url-pattern>
-  </servlet-mapping>
-  <!-- The mapping for the Texter servlet -->
-  <servlet-mapping>
-        <servlet-name>
-            Texter
-        </servlet-name>
-        <url-pattern>
-            /servlet/Texter/*
-        </url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-        <servlet-name>
-            Texter
-        </servlet-name>
-        <url-pattern>
-            /authenticated/servlet/Texter/*
-        </url-pattern>
-  </servlet-mapping>
-  <!-- The mapping for the Texter servlet -->
-  <servlet-mapping>
-        <servlet-name>
-            PDFCache
-        </servlet-name>
-        <url-pattern>
-            /servlet/PDFCache/*
-        </url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-        <servlet-name>
-            PDFCache
-        </servlet-name>
-        <url-pattern>
-            /authenticated/servlet/PDFCache/*
-        </url-pattern>
-  </servlet-mapping>
-   <!-- The mapping for the JSP servlet -->
-  <servlet-mapping>
-        <servlet-name>
-            doc-jsp
-        </servlet-name>
-        <url-pattern>
-            *.jsp
-        </url-pattern>
-  </servlet-mapping>
-  <!-- region for authenticated access -->
-  <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>
-                Authenticated Digilib
-            </web-resource-name>
-            <url-pattern>
-                /authenticated/*
-            </url-pattern>
-        </web-resource-collection>
-        <!-- we need a default user -->
-        <auth-constraint>
-            <role-name>
-                user
-            </role-name>
-        </auth-constraint>
-  </security-constraint>
-  <login-config>
-  <!--
-        <auth-method>BASIC</auth-method>
-        <realm-name>digilib</realm-name> 
-   -->
-        <auth-method>
-            FORM
-        </auth-method>
-        <form-login-config>
-            <form-login-page>
-                /digilib-login.html
-            </form-login-page>
-            <form-error-page>
-                /digilib-fail.html
-            </form-error-page>
-        </form-login-config>
-  </login-config>
-</web-app>
--- a/client/digitallibrary/baselib.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,638 +0,0 @@
-/* Copyright (C) 2003,2004 IT-Group MPIWG, WTWG Uni Bern and others
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
- 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
- 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- 
-Authors: 
-  Christian Luginbuehl, 01.05.2003 (first version)
-  DW 24.03.2004 (Changed for digiLib in Zope)
-  Robert Casties, 22.1.2008
-
-*/
-
-function base_init() {
-    // init function
-    baseScriptVersion = "1.2.4";
-    dlParams = new Object();
-    browserType = getBrowserType();
-}
-
-
-function getInt(n) {
-    // returns always an integer
-    n = parseInt(n);
-    if (isNaN(n)) return 0;
-    return n;
-}
-
-function defined(x) {
-    // returns if x is defined
-    return (typeof arguments[0] != "undefined");
-}
-
-function cropFloat(x) {
-    // auxiliary function to crop senseless precision
-    return parseInt(10000*x)/10000;
-}
-
-function getBrowserType() {
-    // browser sniffer
-    var bt = Object();
-    bt.doDHTML = false;
-    bt.versIE = 0;
-
-    if ((! document.cssonly && document.layers) || document.all || document.getElementById) {
-        var vers = navigator.appVersion.split('MSIE ');
-        vers = vers[vers.length - 1];
-        bt.versIE = getInt(vers);
-        bt.isIE = navigator.userAgent.indexOf('MSIE') >= 0;
-        bt.isMac = navigator.platform.indexOf('Mac') >= 0;
-        bt.isWin = navigator.platform.indexOf('Win') >= 0;
-        bt.isN4 = (navigator.userAgent.indexOf('Mozilla/4.') >= 0) && ! bt.isIE;
-        bt.isIEWin = bt.versIE > 0 && bt.isWin;
-        if (navigator.appVersion.indexOf('MSIE') < 0 || ! bt.isMac || bt.versIE >= 5) {
-            bt.doDHTML = true;
-            bt.isOpera = navigator.userAgent.indexOf(' Opera ') >= 0;
-            bt.isKonq = navigator.userAgent.indexOf(' Konqueror') >= 0;
-        }
-    }
-    return bt;
-}
-
-// fixes for javascript < 1.2
-if (! Array.prototype.push) {
-    Array.prototype.push = function(val) {
-        this[this.length] = val;
-        return this.length;
-    }
-    Array.prototype.pop = function() {
-        var val = this[this.length-1];
-        this.length -= 1;
-        return val;
-    }
-}
-
-
-/* **********************************************
- *     geometry classes
- * ******************************************** */
-
-/*
- * Size class
- */
-function Size(w, h) {
-    this.width = parseFloat(w);
-    this.height = parseFloat(h);
-    return this;
-}
-Size.prototype.toString = function() {
-    return this.width + "x" + this.height;
-}
-
-
-/*
- * Position class
- */
-function Position(x, y) {
-    this.x = parseFloat(x);
-    this.y = parseFloat(y);
-    return this;
-}
-Position.prototype.toString = function() {
-    return this.x + "," + this.y;
-}
-
-/*
- * Rectangle class
- */
-function Rectangle(x, y, w, h) {
-    this.x = parseFloat(x);
-    this.y = parseFloat(y);
-    this.width = parseFloat(w);
-    this.height = parseFloat(h);
-    return this;
-}
-Rectangle.prototype.toString = function() {
-    return this.width+"x"+this.height+"@"+this.x+","+this.y;
-}
-Rectangle.prototype.copy = function() {
-    // returns a copy of this Rectangle
-    return new Rectangle(this.x, this.y, this.width, this.height);
-}
-Rectangle.prototype.getPosition = function() {
-    // returns the position of this Rectangle
-    return new Position(this.x, this.y);
-}
-Rectangle.prototype.getSize = function() {
-    // returns the size of this Rectangle
-    return new Size(this.width, this.height);
-}
-Rectangle.prototype.getArea = function() {
-    // returns the area of this Rectangle
-    return (this.width * this.height);
-}
-Rectangle.prototype.containsPosition = function(pos) {
-    // returns if the given Position lies in this Rectangle
-    return ((pos.x >= this.x)&&(pos.y >= this.y)&&(pos.x <= this.x+this.width)&&(pos.y <= this.y+this.width));
-}
-Rectangle.prototype.intersect = function(rect) {
-    // returns the intersection of the given Rectangle and this one
-    var sec = rect.copy();
-    if (sec.x < this.x) {
-        sec.width = sec.width - (this.x - sec.x);
-        sec.x = this.x;
-    }
-    if (sec.y < this.y) {
-        sec.height = sec.height - (this.y - sec.y);
-        sec.y = this.y;
-    }
-    if (sec.x + sec.width > this.x + this.width) {
-        sec.width = (this.x + this.width) - sec.x;
-    }
-    if (sec.y + sec.height > this.y + this.height) {
-        sec.height = (this.y + this.height) - sec.y;
-    }
-    return sec;
-}
-Rectangle.prototype.fit = function(rect) {
-    // returns a Rectangle that fits into this one (by moving first)
-    var sec = rect.copy();
-    sec.x = Math.max(sec.x, this.x);
-    sec.x = Math.max(sec.x, this.x);
-    if (sec.x + sec.width > this.x + this.width) {
-        sec.x = this.x + this.width - sec.width;
-    }
-    if (sec.y + sec.height > this.y + this.height) {
-        sec.y = this.y + this.height - sec.height;
-    }
-    return sec.intersect(this);
-}
-
-/*
- * Transform class
- *
- * defines a class of affine transformations
- */
-function Transform() {
-    this.m00 = 1.0;
-    this.m01 = 0.0;
-    this.m02 = 0.0;
-    this.m10 = 0.0;
-    this.m11 = 1.0;
-    this.m12 = 0.0;
-    this.m20 = 0.0;
-    this.m21 = 0.0;
-    this.m22 = 1.0;
-    return this;
-}
-Transform.prototype.concat = function(traf) {
-    // add Transform traf to this Transform
-    for (var i = 0; i < 3; i++) {
-        for (var j = 0; j < 3; j++) {
-            var c = 0.0;
-            for (var k = 0; k < 3; k++) {
-                c += traf["m"+i+k] * this["m"+k+j];
-            }
-            this["m"+i+j] = c;
-        }
-    }
-    return this;
-}
-Transform.prototype.transform = function(rect) {
-    // returns transformed Rectangle or Position with this Transform applied
-    var x = this.m00 * rect.x + this.m01 * rect.y + this.m02;
-    var y = this.m10 * rect.x + this.m11 * rect.y + this.m12;
-    if (rect.width) {
-        var width = this.m00 * rect.width + this.m01 * rect.height;
-        var height = this.m10 * rect.width + this.m11 * rect.height;
-        return new Rectangle(x, y, width, height);
-    }
-    return new Position(x, y);
-}
-Transform.prototype.invtransform = function(pos) {
-    // returns transformed Position pos with the inverse of this Transform applied
-    var det = this.m00 * this.m11 - this.m01 * this.m10;
-    var x = (this.m11 * pos.x - this.m01 * pos.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
-    var y = (- this.m10 * pos.x + this.m00 * pos.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
-    return new Position(x, y);
-}
-function getRotation(angle, pos) {
-    // returns a Transform that is a rotation by angle degrees around [pos.x, pos.y]
-    var traf = new Transform();
-    if (angle != 0) {
-        var t = 2.0 * Math.PI * parseFloat(angle) / 360.0;
-        traf.m00 = Math.cos(t);
-        traf.m01 = - Math.sin(t);
-        traf.m10 = Math.sin(t);
-        traf.m11 = Math.cos(t);
-        traf.m02 = pos.x - pos.x * Math.cos(t) + pos.y * Math.sin(t);
-        traf.m12 = pos.y - pos.x * Math.sin(t) - pos.y * Math.cos(t);
-    }
-    return traf;
-}
-function getTranslation(pos) {
-    // returns a Transform that is a translation by [pos.x, pos,y]
-    var traf = new Transform();
-    traf.m02 = pos.x;
-    traf.m12 = pos.y;
-    return traf;
-}
-function getScale(size) {
-    // returns a Transform that is a scale by [size.width, size.height]
-    var traf = new Transform();
-    traf.m00 = size.width;
-    traf.m11 = size.height;
-    return traf;
-}
-
-
-/* **********************************************
- *     parameter routines
- * ******************************************** */
-
-function newParameter(name, defaultValue, detail) {
-    // create a new parameter with a name and a default value
-    if (defined(dlParams[name])) {
-        alert("Fatal: An object with name '" + name + "' already exists - cannot recreate!");
-        return false;
-    } else {
-        dlParams[name] = new Object();
-        dlParams[name].defaultValue = defaultValue;
-        dlParams[name].hasValue = false;
-        dlParams[name].value = defaultValue;
-        dlParams[name].detail = detail;
-        return dlParams[name];
-    }
-}
-
-function getParameter(name) {
-    // returns the named parameter value or its default value
-    if (defined(dlParams[name])) {
-        if (dlParams[name].hasValue) {
-            return dlParams[name].value;
-        } else {
-            return dlParams[name].defaultValue;
-        }
-    } else {
-        return null;
-    }
-}
-
-function setParameter(name, value, relative) {
-    // sets parameter value (relative values with +/- unless literal)
-    if (defined(dlParams[name])) {
-    	if ((relative)&&(value.slice)) {
-	    	var sign = value.slice(0,1);
-			if (sign == '+') {
-				dlParams[name].value = parseFloat(dlParams[name].value) + parseFloat(value.slice(1));
-			} else if (sign == '-') {
-				dlParams[name].value = parseFloat(dlParams[name].value) - parseFloat(value.slice(1));
-			} else {
-	        	dlParams[name].value = value;
-	        }
-	    } else {
-	        dlParams[name].value = value;
-	    }
-        dlParams[name].hasValue = true;
-        return true;
-    }
-    return false;
-}
-
-function hasParameter(name) {
-    // returns if the parameter's value has been set
-    if (defined(dlParams[name])) {
-        return dlParams[name].hasValue;
-    }
-    return false;
-}
-
-function getAllParameters(detail) {
-    // returns a string of all parameters in query format
-    if (! detail) {
-        detail = 255;
-    }
-    var params = new Array();
-    for (param in dlParams) {
-        if (((dlParams[param].detail & detail) > 0)&&(dlParams[param].hasValue)) {
-            var val = getParameter(param);
-            if (val != "") {
-                params.push(param + "=" + val);
-            }
-        }
-    }
-    return params.join("&");
-}
-
-function parseParameters(query) {
-    // gets parameter values from query format string
-    var params = query.split("&");
-    for (var i = 0; i < params.length; i++) {
-        var keyval = params[i].split("=");
-        if (keyval.length == 2) {
-            setParameter(keyval[0], keyval[1]);
-        }
-    }
-}
-
-
-/* **********************************************
- *     HTML/DOM routines
- * ******************************************** */
-
-function getElement(tagid, quiet) {
-    // returns the element object with the id tagid
-    var e;
-    if (document.getElementById) {
-        e = document.getElementById(tagid);
-    } else if (document.all) {
-        alert("document.all!");
-        e = document.all[tagid];
-    } else if (document.layers) {
-        e = document.layers[tagid];
-    } 
-    if (e) {
-        return e;
-    } else {
-        if (! quiet) {
-            alert("unable to find element: "+tagid);
-        }
-        return null;
-    }
-}
-
-function getElementPosition(elem) {
-    // returns a Position with the position of the element
-    var x = 0;
-    var y = 0;
-    if (defined(elem.offsetParent)) {
-        // use .offsetLeft for most browsers
-        var e = elem;
-        while (e) {
-            if (browserType.isIE) {
-                if (browserType.isMac) {
-                    // IE for Mac extraspecial
-                    if (e.offsetParent.tagName == "BODY") {
-                        x += e.clientLeft;
-                        y += e.clientTop;
-                        break;
-                    }
-                } else {
-                    // special for IE
-                    if ((e.tagName != "TABLE") && (e.tagName != "BODY")) {
-                        x += e.clientLeft;
-                        y += e.clientTop;
-                    }
-                }
-            }
-            x += e.offsetLeft;
-            y += e.offsetTop;
-            e = e.offsetParent;
-        }
-    } else if (defined(elem.x)) {
-        // use .x for other (which?)
-        x = elem.x;
-        y = elem.y;
-    } else if (defined(elem.pageX)) {
-        // use pageX for N4
-        x = elem.pageX;
-        y = elem.pageY;
-    } else {
-        alert("unable to get position of "+elem+" (id:"+elem.id+")");
-    }
-    return new Position(getInt(x), getInt(y));
-}
-
-function getElementSize(elem) {
-    // returns a Rectangle with the size of the element
-    var width = 0;
-    var height = 0;
-    if (defined(elem.offsetWidth)) {
-        width = elem.offsetWidth;
-        height = elem.offsetHeight;
-    } else if (defined(elem.width)) {
-        width = elem.width;
-        height = elem.height;
-    } else if (defined(elem.clip.width)) {
-        width = elem.clip.width;
-        height = elem.clip.height;
-    } else {
-        alert("unable to get size of "+elem+" (id:"+elem.id+")");
-    }
-    return new Size(getInt(width), getInt(height));
-}
-
-function getElementRect(elem) {
-    // returns a Rectangle with the size and position of the element
-    var pos = getElementPosition(elem);
-    var size = getElementSize(elem);
-    return new Rectangle(pos.x, pos.y, size.width, size.height);
-}
-
-function moveElement(elem, rect) {
-    // moves and sizes the element
-    if (elem.style) {
-        if (defined(rect.x)) {
-            elem.style.left = Math.round(rect.x) + "px";
-            elem.style.top = Math.round(rect.y) + "px";
-        }
-        if (defined(rect.width)) {
-            elem.style.width = Math.round(rect.width) + "px";
-            elem.style.height = Math.round(rect.height) + "px";
-        }
-    } else if (document.layers) {
-        if (defined(rect.x)) {
-            elem.pageX = getInt(rect.x);
-            elem.pageY = getInt(rect.y);
-        }
-        if (defined(rect.width)) {
-            elem.clip.width = getInt(rect.width);
-            elem.clip.height = getInt(rect.height);
-        }
-    } else {
-        alert("moveelement: no style nor layer property!");
-        return false;
-    }
-    return true;
-}
-
-function showElement(elem, show) {
-    // shows or hides the element
-    if (elem.style) {
-        if (show) {
-            elem.style.visibility = "visible";
-        } else {
-            elem.style.visibility = "hidden";
-        }
-    } else if (defined(elem.visibility)) {
-        if (show) {
-            elem.visibility = "show";
-        } else {
-            elem.visibility = "hide";
-        }
-    } else {
-        alert("showelement: no style nor layer property!");
-    }
-    return true;
-}
-
-function isElementVisible(elem) {
-    // returns of the is shown or hidden
-    if (elem.style) {
-        return (elem.style.visibility == "visible");
-    } else if (defined(elem.visibility)) {
-        return (elem.visibility == "show");
-    } else {
-        alert("iselementvisible: no style nor layer property!");
-    }
-}
-
-function evtPosition(evt) {
-    // returns the on-screen Position of the Event 
-    var x;
-    var y;
-    evt = (evt) ? evt : window.event;
-    if (!evt) {
-        alert("no event found! "+evt);
-        return;
-    }
-    if (defined(evt.pageX)) {
-        x = parseInt(evt.pageX);
-        y = parseInt(evt.pageY);
-    } else if (defined(evt.clientX)) {
-        x = parseInt(document.body.scrollLeft+evt.clientX);
-        y = parseInt(document.body.scrollTop+evt.clientY);
-    } else {
-        alert("evtPosition: don't know how to deal with "+evt);
-    }
-    return new Position(x, y);
-}
-
-function registerEvent(type, elem, handler) {
-    // register the given event handler on the indicated element
-    if (elem.addEventListener) {
-        elem.addEventListener(type, handler, false);
-    } else {
-        if (type == "mousedown") {
-            if (elem.captureEvents) {
-                elem.captureEvents(Event.MOUSEDOWN);
-            }
-            elem.onmousedown = handler;
-        } else if (type == "mouseup") {
-            if (elem.captureEvents) {
-                elem.captureEvents(Event.MOUSEUP);
-            }
-            elem.onmouseup = handler;
-        } else if (type == "mousemove") {
-            if (elem.captureEvents) {
-                elem.captureEvents(Event.MOUSEMOVE);
-            }
-            elem.onmousemove = handler;
-        } else if (type == "keypress") {
-            if (elem.captureEvents) {
-                elem.captureEvents(Event.KEYPRESS);
-            }
-            elem.onkeypress = handler;
-        } else {
-            alert("registerEvent: unknown event type "+type);
-            return false;
-        }
-    }
-    return true;
-}
-
-function unregisterEvent(type, elem, handler) {
-    // unregister the given event handler from the indicated element
-    if (elem.removeEventListener) {
-        elem.removeEventListener(type, handler, false);
-    } else {
-        if (type == "mousedown") {
-            if (elem.releaseEvents) {
-                elem.releaseEvents(Event.MOUSEDOWN);
-            }
-            elem.onmousedown = null;
-        } else if (type == "mouseup") {
-            if (elem.releaseEvents) {
-                elem.releaseEvents(Event.MOUSEUP);
-            }
-            elem.onmouseup = null;
-        } else if (type == "mousemove") {
-            if (elem.releaseEvents) {
-                elem.releaseEvents(Event.MOUSEMOVE);
-            }
-            elem.onmousemove = null;
-        } else if (type == "keypress") {
-            if (elem.releaseEvents) {
-                elem.releaseEvents(Event.KEYPRESS);
-            }
-            elem.onkeypress = null;
-        } else {
-            alert("unregisterEvent: unknown event type "+type);
-            return false;
-        }
-    }
-    return true;
-}
-
-
-// old registerXXYY API for compatibility
-function registerMouseDown(elem, handler) {
-    return registerEvent("mousedown", elem, handler);
-}
-function unregisterMouseDown(elem, handler) {
-    return unregisterEvent("mousedown", elem, handler);
-}
-function registerMouseMove(elem, handler) {
-    return registerEvent("mousemove", elem, handler);
-}
-function unregisterMouseMove(elem, handler) {
-    return unregisterEvent("mousemove", elem, handler);
-}
-function registerKeyDown(handler) {
-    return registerEvent("keypress", elem, handler);
-}
-
-
-function getWinSize() {
-    // returns a Size with the current window size (mostly from www.quirksmode.org)
-    var wsize = new Size(100, 100);
-    if (defined(self.innerHeight))  {
-        // all except Explorer
-        if ((self.innerWidth == 0)||(self.innerHeight == 0)) {
-            // Safari 1.2 (and other) bug
-            if (parent) {
-                wsize.height = parent.innerHeight;
-                wsize.width = parent.innerWidth;
-            }
-        } else {
-            wsize.width = self.innerWidth;
-            wsize.height = self.innerHeight;
-        }
-    } else if (document.documentElement && document.documentElement.clientHeight) {
-        // Explorer 6 Strict Mode
-        wsize.width = document.documentElement.clientWidth;
-        wsize.height = document.documentElement.clientHeight;
-    } else if (document.body) {
-        // other Explorers
-        wsize.width = document.body.clientWidth;
-        wsize.height = document.body.clientHeight;
-    }
-    return wsize;
-}
-
-function openWin(url, name, params) {
-    // open browser window
-    var ow = window.open(url, name, params);
-    ow.focus();
-}
--- a/client/digitallibrary/digicat.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-<title>Digital Library Redirect</title>
-</head>
-
-<script LANGUAGE="JavaScript">
-
-<!-- Beginning of JavaScript --------
-
-//this.location = "http://"+location.host+"/docuserver/digitallibrary/digicat.jsp"+location.search;
-
-this.location.replace(this.location.href.replace(/\.html/, ".jsp"));
-
-// -- End of JavaScript code -------------- -->
-
-</SCRIPT>
-
-<body>
-<h1>Digital Library Redirect</h1>
-
-<p>You should automatically be redirected to the Digital Library page.
-    (<tt>digicat.<b>jsp</b></tt>)</p>
-
-<p>If this doesn't happen make shure JavaScript is enabled in your browser. 
-    The Digital Library pages need JavaScript to work. If your problem still 
-    remains, please contact the administrator.</p>
-
-<hr>
-<address>robert.casties@philo.unibe.ch</address>
-</body> </html>
--- a/client/digitallibrary/digicat.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<%@ page language="java" %><%!
-// authentication stuff - robert
-// -----------------------------
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%><%
-
-// parsing the query
-// -----------------
-
-digilib.servlet.DigilibRequest dcRequest = new digilib.servlet.DigilibRequest(request);
-// check if authentication is needed and redirect if necessary
-docBean.doAuthentication(dcRequest, response);
-
-// set number of pages  
-dcRequest.setValue("pt", docBean.getNumPages(dcRequest));
-String baseUrl = dcRequest.getAsString("base.url");
-%>
-<html>
-<head>
-<title>Digital Document Library - Digicat</title>
-</head>
-
-<frameset cols="*,90" border="0">
-  <frame name="mainFrame" src="oldskin/dcMain.jsp?<%= dcRequest.getAsString() %>" scrolling="auto">
-  <frame name="rightFrame" src="oldskin/dcMenu.html" scrolling="no" noresize>
-</frameset>
-
-</html>
--- a/client/digitallibrary/digilib-fail.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html> <head>
-<title>Login to digilib</title>
-</head>
-
-<body>
-<h1>Login to digilib failed</h1>
-
-<p>The name and password are incorrect!</p>
-
-<p>You can use the browser's &quot;Back&quot; button and try again.</p>
-
-</body>
-</html>
--- a/client/digitallibrary/digilib-login.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html> <head>
-<title>Login to digilib</title>
-</head>
-
-<body>
-
-<h2>This document requires authentication</h2>
-
-<p>Please enter the name and the password to access this document.<p>
-
-<form method=POST action=j_security_check>
-<table>
-  <tr>
-    <td>Name:</td>
-    <td><input type="text" name="j_username"></td>
-  </tr>
-  <tr>
-    <td>Password:</td>
-    <td><input type="password" name="j_password"></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td><input type="SUBMIT" value="  OK  "></td>
-  </tr>
-  </table>
-</form>
-
-</body>
-</html>
--- a/client/digitallibrary/digilib.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-<title>Digital Library Redirect</title>
-</head>
-
-<script LANGUAGE="JavaScript">
-<!-- Beginning of JavaScript --------
-
-// this.location = "http://"+location.host+"/docuserver/digitallibrary/digilib.jsp"+location.search;
-
-this.location.replace(this.location.href.replace(/\.html/, ".jsp"));
-
-// -- End of JavaScript code -------------- -->
-</script>
-
-<body>
-<h1>Digital Library Redirect</h1>
-
-<p>You should automatically be redirected to the Digital Library page. 
-    (<tt>digilib.<b>jsp</b></tt>)</p>
-
-<p>If this doesn't happen make shure JavaScript is enabled in your browser. 
-    The Digital Library pages need JavaScript to work. If your problem still 
-    remains, please contact the administrator.</p>
-
-<hr>
-<address>robert.casties@philo.unibe.ch</address>
-</body> </html>
--- a/client/digitallibrary/digilib.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<%@ page language="java" %><%!
-// authentication stuff - robert
-// -----------------------------
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%><%
-
-// parsing the query
-// -----------------
-
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-// check if authentication is needed and redirect if necessary
-docBean.doAuthentication(dlRequest, response);
-    
-String digiURL = "digimage.jsp?" + dlRequest.getAsString();
-
-%><html>
-<head>
-<title>Digital Document Library</title>
-</head>
-
-<frameset cols="*,90" border="0" onload="pageFrame.show()">
-  <frame name="mainFrame" src="<%= digiURL %>" scrolling="auto">
-  <frameset rows="25,*" border="0">
-    <frame name="pageFrame" src="oldskin/pageWin.html" scrolling="no" noresize>
-    <frame name="rightFrame" src="oldskin/dlMenu.html" scrolling="no" noresize>
-  </frameset>
-</frameset>
-
-</html>
--- a/client/digitallibrary/digimage.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-<%@ page language="java" %><%!
-// -- JSP init -------------
-
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-// -- end of JSP init -------------
-%><%
-// -- JSP request -------------
-
-// parsing the query
-// -----------------
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-docBean.setRequest(dlRequest);
-// check if authentication is needed and redirect if necessary
-docBean.doAuthentication(response);
-// add number of pages
-dlRequest.setValue("pt", docBean.getNumPages());
-// store objects for jsp:include
-pageContext.setAttribute("docBean", docBean, PageContext.REQUEST_SCOPE);
-%><html>
-<head>
-    <title>Digital Document Library (L1)</title>
-    <script type="text/javascript" src="baselib.js"></script>
-    <script type="text/javascript" src="dllib.js"></script>
-<script type="text/javascript">
-  base_init();
-  var dlTarget = window.name;
-  var baseUrl = '<%= dlRequest.getAsString("base.url") %>';
-  var toolbarEnabledURL = window.location.href;
-  newParameter('fn', '', 1);
-  newParameter('pn', '1', 1);
-  newParameter('ws', '1.0', 2);
-  newParameter('mo', '', 2);
-  newParameter('wx', '0.0', 4);
-  newParameter('wy', '0.0', 4);
-  newParameter('ww', '1.0', 4);
-  newParameter('wh', '1.0', 4);
-  newParameter('brgt', '0.0', 4);
-  newParameter('cont', '0.0', 4);
-  newParameter('rot', '0.0', 4);
-  newParameter('rgba', '', 4);
-  newParameter('rgbm', '', 4);
-  newParameter('ddpi', '', 8);
-  newParameter('ddpix', '', 8);
-  newParameter('ddpiy', '', 8);
-  newParameter('mk', '', 16);
-  newParameter('pt', '0', 32);
-  setParameter('pt', '<%= dlRequest.getAsString("pt") %>');
-  document.id='digilib';
-  dl_param_init();
-</script>
-</head>
-<body bgcolor="#666666" onload="dl_init();">
-<% if (dlRequest.hasOption("clop", "noarrows")) {
-%><jsp:include page="digimage_img_inc.jsp" /><%
-} else {
-%><jsp:include page="digimage_tbl_inc.jsp" /><%
-}
-%>
-
- <div id="dot0" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark1.gif" border="0"></div>
- <div id="dot1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark2.gif" border="0"></div>
- <div id="dot2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark3.gif" border="0"></div>
- <div id="dot3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark4.gif" border="0"></div>
- <div id="dot4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark5.gif" border="0"></div>
- <div id="dot5" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark6.gif" border="0"></div>
- <div id="dot6" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark7.gif" border="0"></div>
- <div id="dot7" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark8.gif" border="0"></div>
- <div id="eck1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/olinks.gif" border="0"></div>
- <div id="eck2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/orechts.gif" border="0"></div>
- <div id="eck3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/ulinks.gif" border="0"></div>
- <div id="eck4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/urechts.gif" border="0"></div>
-
-</body>
-
-</html>
--- a/client/digitallibrary/digimage_img_inc.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<%@ page language="java" %><%
-// retrieve objects from context
-digilib.servlet.DocumentBean docBean = (digilib.servlet.DocumentBean) pageContext.getAttribute("docBean", pageContext.REQUEST_SCOPE);
-digilib.servlet.DigilibRequest dlRequest = docBean.getRequest();
-String ua = request.getHeader("User-Agent");
-boolean isN4 = ((ua.indexOf("Mozilla/4.") > -1)&&(ua.indexOf("MSIE") == -1));
-%>
-<%
-    if (isN4) {
-%><ilayer name="scaler"><%
-	    } else {
-%><div id="scaler"><%
-	    }
-%>
-<script type="text/javascript">
-var ps = bestPicSize(getElement('scaler'), 10);
-document.write('<img id="pic" src="<%= dlRequest.getAsString("base.url") + "/servlet/Scaler?" + dlRequest.getAsString('s') %>&dw='+ps.width+'&dh='+ps.height+'" />');
-</script>
-<%   
-    if (isN4) {
-%></ilayer><%
-	    } else {
-%></div><%
-	    }
-%>
--- a/client/digitallibrary/digimage_tbl_inc.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<%@ page language="java" %><%
-// retrieve objects from context
-digilib.servlet.DocumentBean docBean = (digilib.servlet.DocumentBean) pageContext.getAttribute("docBean", pageContext.REQUEST_SCOPE);
-digilib.servlet.DigilibRequest dlRequest = docBean.getRequest();
-String ua = request.getHeader("User-Agent");
-boolean isN4 = ((ua.indexOf("Mozilla/4.") > -1)&&(ua.indexOf("MSIE") == -1));
-%>
-<table border="0"  cellpadding="0" cellspacing="0">
-  <tr>
-    <td></td>
-    <td align="center"><%
-      if (docBean.canMoveUp()) {
-        %><a href="javascript:moveBy(0, -0.5)"><img src="img/up.gif" border="0" /></a><%
-      }
-      %></td>
-      <td></td>
-  </tr>
-  <tr>
-    <td valign="center"><%
-      if (docBean.canMoveLeft()) {
-        %><a href="javascript:moveBy(-0.5, 0)"><img src="img/left.gif" border="0" /></a><%
-      }
-      %></td>
-	  <td>
-<%
-	  if(isN4) {
-	      %><ilayer name="scaler"><%
-		  } else {
-	      %><div id="scaler" style="visibility:visible"><%
-		  }
-%>
-<script type="text/javascript">
-var ps = bestPicSize(getElement('scaler'), 10);
-document.write('<img id="pic" src="<%=
-  dlRequest.getAsString("base.url") + "/servlet/Scaler?" + dlRequest.getAsString('s')
-%>&dw='+ps.width+'&dh='+ps.height+'" />');
-</script>
-<% 
-    if(isN4) {
-	%></ilayer><%
-	    } else {
-	%></div><%
-	    }
-%>
-    </td>
-    <td valign="center"><%
-      if (docBean.canMoveRight()) {
-        %><a href="javascript:moveBy(0.5, 0)"><img src="img/right.gif" border="0" /></a><%
-      }
-      %></td>
-  </tr>
-  <tr>
-    <td></td>
-    <td align="center"><%
-      if (docBean.canMoveDown()) {
-        %><a href="javascript:moveBy(0, 0.5)"><img src="img/down.gif" border="0" /></a><%
-      }
-      %></td>
-    <td></td>
-  </tr>
-</table>
--- a/client/digitallibrary/dirInfo-xml.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<%@page import="digilib.io.FileOps"%><%@ page language="java" %><%!
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%><?xml version="1.0" encoding="UTF-8" ?>
-<%
-// process request
-// get digilib config
-digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
-// parsing the query
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-// dir cache
-digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-// get directory
-digilib.io.DocuDirectory dir = dirCache.getDirectory(dlRequest.getFilePath());
-FileOps.FileClass fc = FileOps.FileClass.IMAGE;
-int dirSize = dir.size(fc);
-
-%><!-- Automatically generated XML snippet with directory info -->
-<dir><% if (dir != null) { %>
-  <size><%= dirSize %></size>
-  <name><%= dir.getDirName() %></name>
-  <fsname><%= dir.getDir().getPath() %></fsname> 
-<%
-    if (!dlRequest.hasOption("mo", "dir")) {
-      for (int i = 0; i < dirSize; i++) {
-        digilib.io.DocuDirent f = dir.get(i, fc);
-        String fn = (f != null) ? f.getName() : "null";
-%>  <file>
-    <index><%= i+1 %></index>
-    <name><%= digilib.io.FileOps.basename(fn) %></name>
-    <fsname><%= fn %></fsname>
-  </file>
-<%
-      } // for 
-    } // if not dironly
-  } // if dir 
-%></dir>
--- a/client/digitallibrary/dlContext-xml.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<%@ page language="java" %><%!
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%><?xml version="1.0" encoding="UTF-8" ?>
-<%
-// process request
-// get digilib config
-digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
-// parsing the query
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-// dir cache
-digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-
-%><!-- Automatically generated XML snippet with document context -->
-<result>
-<%
-int pn = dlRequest.getAsInt("pn");
-String fn = dlRequest.getFilePath();
-String ctx = "";
-digilib.io.DocuDirent f = dirCache.getFile(fn, pn, digilib.io.FileOps.FileClass.IMAGE);
-if (f != null) {
-    //ctx = "hasfile:"+f.getName();
-    f.checkMeta();
-    java.util.HashMap meta = f.getFileMeta();
-    if (meta != null) {
-	//ctx = "JSP:hasmeta!";
-	if (meta.containsKey("context")) {
-	    ctx = (String) meta.get("context");
-	}
-    }
-}
-%><%= ctx %>
-</result>
--- a/client/digitallibrary/dlInfo-js.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<%@ page language="java" %>
-<%!
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%><%
-// parsing the query
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-docBean.setRequest(dlRequest);
-%>
-// Automatically generated JavaScript snippet with parameters
-<%
-    Object[] keys = dlRequest.getParams().keySet().toArray();
-    java.util.Arrays.sort(keys);
-    int l = keys.length;
-    for (int i = 0; i < l; i++) {
-	String key = (String) keys[i];
-	String val = dlRequest.getAsString(key);
-	if (val.length() == 0) {
-	    val = "";
-	}
-	%>var dl_<%= key %> = "<%= val %>";
-<%
-       }
-%>
--- a/client/digitallibrary/dlInfo-xml.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<%@ page language="java" %><%!
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%><?xml version="1.0" encoding="UTF-8" ?>
-<%
-// process request
-// get digilib config
-digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
-// parsing the query
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-docBean.setRequest(dlRequest);
-
-%><!-- Automatically generated XML snippet with document parameters -->
-<document-parameters>
-<%
-    Object[] keys = dlRequest.getParams().keySet().toArray();
-    java.util.Arrays.sort(keys);
-    int l = keys.length;
-    for (int i = 0; i < l; i++) {
-	String key = (String) keys[i];
-	String val = dlRequest.getAsString(key);
-	if (val.length() == 0) {
-	    val = "";
-	}
-%>  <parameter name="<%= key %>" value="<%= val %>"/>
-<%
-       }
-%></document-parameters>
--- a/client/digitallibrary/dllib.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,616 +0,0 @@
-/* Copyright (C) 2003,2004 IT-Group MPIWG, WTWG Uni Bern and others
- 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
- 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
- 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- 
-Authors:
-  Christian Luginbuehl, 01.05.2003 (first version)
-  DW 24.03.2004 (Changed for digiLib in Zope)
-  Robert Casties, 8.11.2005
-
-  ! Requires baselib.js !
-
-*/
-
-
-function identify() {
-        // used for identifying a digilib instance
-        // Relato uses that function - lugi
-        return "Digilib 0.6";
-}
-
-
-/*
- * more parameter handling
- */
-
-function parseArea() {
-    // returns area Rectangle from current parameters
-    return new Rectangle(getParameter("wx"), getParameter("wy"), getParameter("ww"), getParameter("wh"));
-}
-
-function setParamFromArea(rect) {
-    // sets digilib wx etc. from rect
-    setParameter("wx", cropFloat(rect.x));
-    setParameter("wy", cropFloat(rect.y));
-    setParameter("ww", cropFloat(rect.width));
-    setParameter("wh", cropFloat(rect.height));
-    return true;
-}
-
-function parseTrafo(elem) {
-    // returns Transform from current dlArea and picsize
-    var picsize = getElementRect(elem);
-    var trafo = new Transform();
-    // subtract area offset and size
-    trafo.concat(getTranslation(new Position(-dlArea.x, -dlArea.y)));
-    trafo.concat(getScale(new Size(1/dlArea.width, 1/dlArea.height)));
-    // scale to screen size
-    trafo.concat(getScale(picsize));
-    trafo.concat(getTranslation(picsize));
-    // rotate
-    //trafo.concat(getRotation(- getParameter("rot"), new Position(0.5*picsize.width, 0.5*picsize.height)));
-    // mirror
-    //if (hasFlag("hmir")) {
-    //trafo.m00 = - trafo.m00;
-    //}
-    //if (hasFlag("vmir")) {
-    //trafo.m11 = - trafo.m11;
-    //}
-    return trafo;
-}
-
-
-function parseMarks() {
-    // returns marks array from current parameters
-    var marks = new Array();
-    var ma;
-    var mk = getParameter("mk");
-    if (mk.indexOf(";") >= 0) {
-        // old format with ";"
-        ma = mk.split(";");
-    } else {
-        ma = mk.split(",");
-    }
-    for (var i = 0; i < ma.length ; i++) {
-        var pos = ma[i].split("/");
-        if (pos.length > 1) {
-            marks.push(new Position(pos[0], pos[1]));
-        }
-    }
-    return marks;
-}
-
-function getAllMarks() {
-    // returns a string with all marks in query format
-    var marks = new Array();
-    for (var i = 0; i < dlMarks.length; i++) {
-        marks.push(cropFloat(dlMarks[i].x) + "/" + cropFloat(dlMarks[i].y));
-    }
-    return marks.join(",");
-}
-
-function addMark(pos) {
-    // add a mark
-    dlMarks.push(pos);
-    setParameter("mk", getAllMarks());
-    return true;
-}
-
-function deleteMark() {
-    // delete the last mark
-    dlMarks.pop();
-    setParameter("mk", getAllMarks());
-    return true;
-}
-
-function hasFlag(mode) {
-    // returns if mode flag is set
-    return (dlFlags[mode]);
-}
-
-function addFlag(mode) {
-    // add a mode flag
-    dlFlags[mode] = mode;
-    setParameter("mo", getAllFlags());
-    return true;
-}
-
-function removeFlag(mode) {
-    // remove a mode flag
-    if (dlFlags[mode]) {
-        delete dlFlags[mode];
-    }
-    setParameter("mo", getAllFlags());
-    return true;
-}
-
-function toggleFlag(mode) {
-    // change a mode flag
-    if (dlFlags[mode]) {
-        delete dlFlags[mode];
-    } else {
-        dlFlags[mode] = mode;
-    }
-    setParameter("mo", getAllFlags());
-    return true;
-}
-
-function getAllFlags() {
-    // returns a string with all flags in query format
-    var fa = new Array();
-    for (var f in dlFlags) {
-        if ((f != "")&&(dlFlags[f] != null)) {
-            fa.push(f);
-        }
-    }
-    return fa.join(",");
-}
-
-function parseFlags() {
-    // sets dlFlags from the current parameters
-    var flags = new Object();
-    var fa = getParameter("mo").split(",");
-    for (var i = 0; i < fa.length ; i++) {
-        var f = fa[i];
-        if (f != "") {
-            flags[f] = f;
-        }
-    }
-    return flags;
-}    
-
-
-function bestPicSize(elem, inset) {
-    // returns a Size with the best image size for the given element
-    if (! defined(inset)) {
-        inset = 25;
-    }
-    var ws = getWinSize();
-    var es = getElementPosition(elem);
-    if (es) {
-        ws.width = ws.width - es.x - inset;
-        ws.height = ws.height - es.y - inset;
-    }
-    return ws;
-}
-
-function setDLParam(e, s, relative) {
-	// sets parameter based on HTML event
-	var nam;
-    var val;
-    if (s.type && (s.type == "select-one")) {
-        nam = s.name;
-        val = s.options[s.selectedIndex].value;
-    } else if (s.name && s.value) {
-        nam = s.name;
-        val = s.value;
-    }
-    if (nam && val) {
-        setParameter(nam, val, relative);
-        display();
-    } else {
-        alert("ERROR: unable to process event!");
-    }
-    return true;
-}
-
-
-/* **********************************************
- *     digilib specific routines
- * ******************************************** */
-
-
-function dl_param_init() {
-    // parameter initialisation before onload
-    if (!baseScriptVersion) {
-        base_init();
-    }
-    dlScriptVersion = "1.2b";
-    dlArea = new Rectangle(0.0, 0.0, 1.0, 1.0);
-    dlMaxArea = new Rectangle(0.0, 0.0, 1.0, 1.0);
-    dlTrafo = new Transform();
-    dlMarks = new Array();
-    dlFlags = new Object();
-    elemScaler = null;
-    picElem = null;
-    ZOOMFACTOR = Math.sqrt(2);
-
-    // put the query parameters (sans "?") in the parameters array
-    parseParameters(location.search.slice(1));
-    // treat special parameters
-    dlMarks = parseMarks();
-    dlArea = parseArea();
-    dlFlags = parseFlags();
-}
-
-
-function dl_init() {
-    // initalisation on load
-    if (!dlScriptVersion) {
-        dl_param_init();
-    }
-    elemScaler = getElement("scaler", true);
-    picElem = getElement("pic", true);
-    if (picElem == null && elemScaler) {
-        // in N4 pic is in the scaler layer
-        picElem = elemScaler.document.images[0];
-    }
-    if ((!elemScaler)||(!picElem)) {
-        alert("Sorry, digilib doesn't work here!");
-        return false;
-    }
-    // give a name to the window containing digilib
-    if (defined(dlTarget)&&(dlTarget)) {
-        window.name = dlTarget;
-    } else {
-        window.name = "digilib";
-    }
-    // put the query parameters (sans "?") in the parameters array
-    parseParameters(location.search.slice(1));
-    // treat special parameters
-    dlMarks = parseMarks();
-    dlArea = parseArea();
-    dlFlags = parseFlags();
-    // wait for image to load and display marks
-    renderMarks();
-    // done
-    focus();
-    return;
-}
-
-
-function display(detail) {
-    // redisplay the page
-    if (! detail) {
-        detail = 255;
-    }
-    var queryString = getAllParameters(detail);
-    location.href = location.protocol + "//" + location.host + location.pathname + "?" + queryString;
-}
-
-
-/* **********************************************
- *     interactive digilib functions
- * ******************************************** */
-
-
-function renderMarks() {
-    // put the visible marks on the image
-    var mark_count = dlMarks.length;
-    // make shure the image is loaded so we know its size
-    if (defined(picElem.complete) && picElem.complete == false && ! browserType.isN4 ) {
-        setTimeout("renderMarks()", 100);
-    } else {
-        dlTrafo = parseTrafo(picElem);
-        for (var i = 0; i < 8; i++) {
-            var me = getElement("dot"+i);
-            if (i < mark_count) {
-                if (dlArea.containsPosition(dlMarks[i])) {
-                    var mpos = dlTrafo.transform(dlMarks[i]);
-                    // suboptimal to place -5 pixels and not half size of mark-image
-                    mpos.x = mpos.x -5;
-                    mpos.y = mpos.y -5;
-                    moveElement(me, mpos);
-                    showElement(me, true);
-                }
-            } else {
-                // hide the other marks
-                showElement(me, false);
-            }
-        }
-    }
-}
-
-
-function setMark(reload) {
-    // add a mark where clicked
-    if ( dlMarks.length > 7 ) {
-        alert("Only 8 marks are possible at the moment!");
-        return;
-    }
-    window.focus();
-
-    function markEvent(evt) {
-        // event handler adding a new mark
-        unregisterEvent("mousedown", elemScaler, markEvent);
-        var p = dlTrafo.invtransform(evtPosition(evt));
-        addMark(p);
-        if (defined(reload)&&(!reload)) {
-            // don't redisplay
-            renderMarks();
-            return;
-        }
-        display();
-    }
-
-    // starting event capture
-    registerEvent("mousedown", elemScaler, markEvent);
-}
-
-
-function removeMark(reload) {
-    // remove the last mark
-    deleteMark();
-    if (defined(reload)&&(!reload)) {
-        // don't redisplay
-        renderMarks();
-        return;
-    }
-    display();
-}
-
-
-function zoomArea() {
-    var click = 1;
-    var pt1, pt2;
-    var eck1pos, eck2pos, eck3pos, eck4pos;
-    window.focus();
-    var eck1 = getElement("eck1");
-    var eck2 = getElement("eck2");
-    var eck3 = getElement("eck3");
-    var eck4 = getElement("eck4");
-
-    function zoomClick(evt) {
-        // mouse click handler
-        if (click == 1) {
-            // first click -- start moving
-            click = 2;
-            pt1 = evtPosition(evt);
-            pt2 = pt1;
-            eck1pos = pt1;
-            eck2pos = new Position(pt1.x - 12, pt1.y);
-            eck3pos = new Position(pt1.x, pt1.y - 12);
-            eck4pos = new Position(pt1.y - 12, pt1.y - 12);
-            moveElement(eck1, eck1pos);
-            moveElement(eck2, eck2pos);
-            moveElement(eck3, eck3pos);
-            moveElement(eck4, eck4pos);
-            showElement(eck1, true);
-            showElement(eck2, true);
-            showElement(eck3, true);
-            showElement(eck4, true);
-            // show moving
-            registerEvent("mousemove", elemScaler, zoomMove);
-            registerEvent("mousemove", eck4, zoomMove);
-            // enable drag-to-zoom
-            registerEvent("mouseup", elemScaler, zoomClick);
-            registerEvent("mouseup", eck4, zoomClick);
-        } else {
-            // second click -- end moving
-            pt2 = evtPosition(evt);
-            showElement(eck1, false);
-            showElement(eck2, false);
-            showElement(eck3, false);
-            showElement(eck4, false);
-            unregisterEvent("mousemove", elemScaler, zoomMove);
-            unregisterEvent("mousemove", eck4, zoomMove);
-            unregisterEvent("mousedown", elemScaler, zoomClick);
-            unregisterEvent("mousedown", eck4, zoomClick);
-            var p1 = dlTrafo.invtransform(pt1);
-            var p2 = dlTrafo.invtransform(pt2);
-            var ww = p2.x-p1.x;
-            var wh = p2.y-p1.y;
-            if ((ww > 0)&&(wh > 0)) {
-                setParameter("wx", cropFloat(p1.x));
-                setParameter("wy", cropFloat(p1.y));
-                setParameter("ww", cropFloat(ww));
-                setParameter("wh", cropFloat(wh));
-                parseArea();
-                // zoomed is always fit
-                setParameter("ws", 1);
-                display();
-            }
-        }
-    }
-
-    function zoomMove(evt) {
-        // mouse move handler
-        pt2 = evtPosition(evt);
-        // restrict marks to move right and down
-        eck1pos = pt1;
-        eck2pos = new Position(Math.max(pt1.x, pt2.x)-12, pt1.y);
-        eck3pos = new Position(pt1.x, Math.max(pt1.y, pt2.y)-12);
-        eck4pos = new Position(Math.max(pt1.x, pt2.x)-12, Math.max(pt1.y, pt2.y)-12);
-        moveElement(eck1, eck1pos);
-        moveElement(eck2, eck2pos);
-        moveElement(eck3, eck3pos);
-        moveElement(eck4, eck4pos);
-    }
-
-    // starting event capture
-    registerEvent("mousedown", elemScaler, zoomClick);
-    registerEvent("mousedown", eck4, zoomClick);
-}
-
-function zoomBy(factor) {
-    // zooms by the given factor
-    var newarea = dlArea.copy();
-    newarea.width /= factor;
-    newarea.height /= factor;
-    newarea.x -= 0.5 * (newarea.width - dlArea.width);
-    newarea.y -= 0.5 * (newarea.height - dlArea.height);
-    newarea = dlMaxArea.fit(newarea);
-    setParamFromArea(newarea);
-    display();
-}
-
-
-function zoomFullpage() {
-    // zooms out to show the whole image
-    setParameter("wx", 0.0);
-    setParameter("wy", 0.0);
-    setParameter("ww", 1.0);
-    setParameter("wh", 1.0);
-    display();
-}
-
-
-function moveCenter() {
-    // move visible area so that it's centered around the clicked point
-    if ( (dlArea.width == 1.0) && (dlArea.height == 1.0) ) {
-        // nothing to do
-        return;
-    }
-    window.focus();
-
-    function moveCenterEvent(evt) {
-        // move to handler
-        unregisterEvent("mousedown", elemScaler, moveCenterEvent);
-        var pt = dlTrafo.invtransform(evtPosition(evt));
-        var newarea = new Rectangle(pt.x-0.5*dlArea.width, pt.y-0.5*dlArea.height, dlArea.width, dlArea.height);
-        newarea = dlMaxArea.fit(newarea);
-        // set parameters
-        setParamFromArea(newarea);
-        parseArea();
-        display();
-    }
-
-    // starting event capture
-    registerEvent("mousedown", elemScaler, moveCenterEvent);
-}
-
-function moveBy(movx, movy) {
-    // move visible area by movx and movy (in units of ww, wh)
-    if ((dlArea.width == 1.0)&&(dlArea.height == 1.0)) {
-        // nothing to do
-        return;
-    }
-    var newarea = dlArea.copy();
-    newarea.x += parseFloat(movx)*dlArea.width;
-    newarea.y += parseFloat(movy)*dlArea.height;
-    newarea = dlMaxArea.fit(newarea);
-    // set parameters
-    setParamFromArea(newarea);
-    parseArea();
-    display();
-}
-
-function getRef() {
-    // returns a reference to the current digilib set
-    if (! baseUrl) {
-        var baseUrl = location.protocol + "//" + location.host + location.pathname;
-    }
-    var hyperlinkRef = baseUrl;
-    var par = getAllParameters(7+16); // all without ddpi, pt
-    if (par.length > 0) {
-        hyperlinkRef += "?" + par;
-    }
-    return hyperlinkRef;
-}
-
-function getRefWin(type, msg) {
-    // shows an alert with a reference to the current digilib set
-    if (! msg) {
-        msg = "Link for HTML documents";
-    }
-    prompt(msg, getRef());
-}
-
-function getQuality() {
-	// returns the current q setting
-    for (var i = 0; i < 3; i++) {
-        if (hasFlag("q"+i)) {
-        	return i;
-        }
-    }
-    return 1
-}
-
-function setQuality(qual) {
-    // set the image quality
-    for (var i = 0; i < 3; i++) {
-        removeFlag("q"+i);
-        if (i == qual) {
-            addFlag("q"+i);
-        }
-    }
-    setParameter("mo", getAllFlags());
-    display();
-}    
-
-function setQualityWin(msg) {
-	// dialog for setting quality
-	if (! msg) {
-		msg = "Quality (0..2)";
-	}
-	var q = getQuality();
-	var newq = window.prompt(msg, q);
-	if (newq) {
-		setQuality(newq);
-	}
-}
-
-function mirror(dir) {
-    // mirror the image horizontally or vertically
-    if (dir == "h") {
-        toggleFlag("hmir");
-    } else {
-        toggleFlag("vmir");
-    }
-    setParameter("mo", getAllFlags());
-    display();
-}
-
-function gotoPage(gopage, keep) {
-	// goto given page nr (+/-: relative)
-	var oldpn = parseInt(getParameter("pn"));
-	// try setParameter with relative value
-	setParameter("pn", gopage, true);
-	// check the result
-	var pn = parseInt(getParameter("pn"));
-	if (pn < 1) {
-		alert("No such page! (Page number too low)");
-		setParameter("pn", oldpn);
-		return;
-	}
-	if (hasParameter("pt")) {
-		pt = parseInt(getParameter("pt"))
-		if (pn > pt) {
-			alert("No such page! (Page number too high)");
-			setParameter("pn", oldpn);
-			return;
-		}
-	}
-	if (keep) {
-		display(15+32); // all, no mark
-	} else {	
-		display(3+32); // fn, pn, ws, mo + pt
-	}
-}
-
-function gotoPageWin() {
-	// dialog to ask for new page nr
-	var pn = getParameter("pn");
-	var gopage = window.prompt("Go to page", pn);
-	if (gopage) {
-		gotoPage(gopage);
-	}
-}
-
-function setParamWin(param, text, relative) {
-	// dialog to ask for new parameter value
-	var val = getParameter(param);
-	var newval = window.prompt(text, val);
-	if (newval) {
-		setParameter(param, newval, relative);
-		display();
-	}
-}
-
-function showOptions(show) {
-	// show or hide option div
-	var elem = getElement("dloptions");
-	showElement(elem, show);
-}
\ No newline at end of file
--- a/client/digitallibrary/empty.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-</head>
-
-<body>
-</body>
-</html>
Binary file client/digitallibrary/greyskin/back.png has changed
--- a/client/digitallibrary/greyskin/back.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="back.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\back.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="22"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 31.75 13.75 L 31.75 33.3125 L 14.75 23.3125 L 31.75 13.75 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 31.25,13.678571 L 31.25,33.25 L 14.25,23.25 L 31.25,13.678571 z "
-       id="path2474" />
-  </g>
-</svg>
--- a/client/digitallibrary/greyskin/baselib.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,981 +0,0 @@
-/* Copyright (C) 2003-2006 IT-Group MPIWG, WTWG Uni Bern and others
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
- 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
- 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- 
-Authors: 
-  Christian Luginbuehl, 01.05.2003 (first version)
-  DW 24.03.2004 (Changed for digiLib in Zope)
-  Robert Casties, 2.11.2004 (almost complete rewrite)
-  Martin Raspe, 12.12.2005 (changes for Digilib NG)
-  Robert Casties, 3.9.2009
-*/
-
-// was: function base_init() {
-baseLibVersion = "2.011";
-browserType = getBrowserType();
-
-sliders = {};
-activeSlider = null;
-
-function getInt(n) {
-    // returns always an integer
-    n = parseInt(n);
-    return (isNaN(n)) ? 0 : n;
-}
-
-function defined(x) {
-    // returns if x is defined
-    return (typeof arguments[0] != "undefined");
-}
-
-function cropFloat(x) {
-    // auxiliary function to crop senseless precision
-    return parseInt(10000 * x) / 10000;
-}
-
-function getBrowserType() {
-    // browser sniffer
-    var bt = Object();
-    bt.doDHTML = false;
-    bt.versIE = 0;
-
-    if ((! document.cssonly && document.layers) || document.all || document.getElementById) {
-        var vers = navigator.appVersion.split('MSIE ');
-        vers = vers[vers.length - 1];
-        bt.versIE = getInt(vers);
-        bt.isIE = navigator.userAgent.indexOf('MSIE') >= 0;
-        bt.isMac = navigator.platform.indexOf('Mac') >= 0;
-        bt.isWin = navigator.platform.indexOf('Win') >= 0;
-        bt.isN4 = (navigator.userAgent.indexOf('Mozilla/4.') >= 0) && ! bt.isIE;
-        bt.isIEWin = bt.versIE > 0 && bt.isWin;
-        if (navigator.appVersion.indexOf('MSIE') < 0 || ! bt.isMac || bt.versIE >= 5) {
-            bt.doDHTML = true;
-            bt.isOpera = navigator.userAgent.indexOf(' Opera ') >= 0;
-            bt.isKonq = navigator.userAgent.indexOf(' Konqueror') >= 0;
-        }
-    }
-    return bt;
-}
-
-// fixes for javascript < 1.2
-if (! Array.prototype.push) {
-    Array.prototype.push = function(val) {
-        this[this.length] = val;
-        return this.length;
-    }
-    Array.prototype.pop = function() {
-        var val = this[this.length-1];
-        this.length -= 1;
-        return val;
-    }
-}
-
-
-/* **********************************************
- *     geometry classes
- * ******************************************** */
-
-/*
- * Size class
- */
-function Size(w, h) {
-    this.width = parseFloat(w);
-    this.height = parseFloat(h);
-    return this;
-}
-Size.prototype.toString = function() {
-    return this.width + "x" + this.height;
-}
-Size.prototype.equals = function(other) {
-	return (this.width == other.width
-        &&  this.height == other.height)
-    }
-
-/*
- * Position class
- */
-function Position(x, y) {
-    this.x = parseFloat(x);
-    this.y = parseFloat(y);
-    return this;
-}
-Position.prototype.toString = function() {
-    return this.x + "," + this.y;
-}
-Position.prototype.equals = function(other) {
-	return (this.x == other.x
-        &&  this.y == other.y)
-}
-/*
- * Rectangle class
- */
-function Rectangle(x, y, w, h) {
-	if (typeof x == "object") {
-		// assume x and y are Position
-		this.x = x.x;
-		this.y = x.y;
-		this.width = y.x - x.x;
-		this.height = y.y - x.y;
-		return this;
-	}
-    this.x = parseFloat(x);
-    this.y = parseFloat(y);
-    this.width = parseFloat(w);
-    this.height = parseFloat(h);
-    return this;
-}
-Rectangle.prototype.toString = function() {
-    return this.width+"x"+this.height+"@"+this.x+","+this.y;
-}
-Rectangle.prototype.copy = function() {
-    // returns a copy of this Rectangle
-    return new Rectangle(this.x, this.y, this.width, this.height);
-}
-Rectangle.prototype.getPosition = function() {
-    // returns the position of this Rectangle
-    return new Position(this.x, this.y);
-}
-Rectangle.prototype.getPt1 = Rectangle.prototype.getPosition;
-// returns the upper left corner position
-
-Rectangle.prototype.getPt2 = function() {
-    // returns the lower right corner position of this Rectangle
-    return new Position(this.x + this.width, this.y + this.height);
-}
-Rectangle.prototype.setPt1 = function(pos) {
-    // sets the upper left corner to position pos
-    this.x = pos.x;
-    this.y = pos.y;
-    return this;
-}
-Rectangle.prototype.setPt2 = function(pos) {
-    // sets the lower right corner to position pos
-    this.width = pos.x - this.x;
-    this.height = pos.y - this.y;
-    return this;
-}
-Rectangle.prototype.getCenter = function() {
-    // returns the center position of this Rectangle
-    return new Position(this.x + this.width / 2, this.y + this.height / 2);
-}
-Rectangle.prototype.setCenter = function(pos) {
-    // moves this Rectangle's center to position pos
-    this.x = pos.x - this.width / 2;
-    this.y = pos.y - this.height / 2;
-    return this;
-}
-Rectangle.prototype.getSize = function() {
-    // returns the size of this Rectangle
-    return new Size(this.width, this.height);
-}
-Rectangle.prototype.equals = function(other) {
-    // equal props
-    return (this.getPosition().equals(other.getPosition())
-        &&  this.getSize().equals(other.getSize())
-        );
-}
-Rectangle.prototype.getArea = function() {
-    // returns the area of this Rectangle
-    return (this.width * this.height);
-}
-Rectangle.prototype.normalize = function() {
-    // eliminates negative width and height
-    var p = this.getPt2();
-    this.x = Math.min(this.x, p.x);
-    this.y = Math.min(this.y, p.y);
-    this.width = Math.abs(this.width);
-    this.height = Math.abs(this.height);
-    return this;
-}
-Rectangle.prototype.containsPosition = function(pos) {
-    // returns if Position "pos" lies inside of this rectangle
-    return ((pos.x >= this.x)
-        && (pos.y >= this.y)
-    && (pos.x <= this.x + this.width)
-    && (pos.y <= this.y + this.width)
-    );
-}
-Rectangle.prototype.containsRect = function(rect) {
-    // returns if rectangle "rect" is contained in this rectangle
-    return (this.containsPosition(rect.getPt1()) 
-        && this.containsPosition(rect.getPt2()));
-}
-Rectangle.prototype.stayInside = function(rect) {
-    // changes this rectangle's x/y values so it stays inside of rectangle rect
-    // keeping the proportions
-    if (this.x < rect.x) this.x = rect.x;
-    if (this.y < rect.y) this.y = rect.y;
-    if (this.x + this.width > rect.x + rect.width) 
-        this.x = rect.x + rect.width - this.width;
-    if (this.y + this.height > rect.y + rect.height)
-        this.y = rect.y + rect.height - this.height;
-    return this;
-}
-Rectangle.prototype.clipTo = function(rect) {
-    // clips this rectangle so it stays inside of rectangle rect
-    var p1 = rect.getPt1();
-    var p2 = rect.getPt2();
-    var this2 = this.getPt2();
-    this.setPt1(new Position(Math.max(this.x, p1.x), Math.max(this.y, p1.y)));
-    this.setPt2(new Position(Math.min(this2.x, p2.x), Math.min(this2.y, p2.y)));
-    return this;
-}
-Rectangle.prototype.intersect = function(rect) {
-    // returns the intersection of the given Rectangle and this one
-    // FIX ME: not really, it should return null if there is no overlap 
-    var sec = rect.copy();
-    if (sec.x < this.x) {
-        sec.width = sec.width - (this.x - sec.x);
-        sec.x = this.x;
-    }
-    if (sec.y < this.y) {
-        sec.height = sec.height - (this.y - sec.y);
-        sec.y = this.y;
-    }
-    if (sec.x + sec.width > this.x + this.width) {
-        sec.width = (this.x + this.width) - sec.x;
-    }
-    if (sec.y + sec.height > this.y + this.height) {
-        sec.height = (this.y + this.height) - sec.y;
-    }
-    return sec;
-}
-Rectangle.prototype.fit = function(rect) {
-    // returns a Rectangle that fits into this one (by moving first)
-    var sec = rect.copy();
-    sec.x = Math.max(sec.x, this.x);
-    sec.y = Math.max(sec.y, this.x);
-    if (sec.x + sec.width > this.x + this.width) {
-        sec.x = this.x + this.width - sec.width;
-    }
-    if (sec.y + sec.height > this.y + this.height) {
-        sec.y = this.y + this.height - sec.height;
-    }
-    return sec.intersect(this);
-}
-
-/*
- * Transform class
- *
- * defines a class of affine transformations
- */
-function Transform() {
-    this.m00 = 1.0;
-    this.m01 = 0.0;
-    this.m02 = 0.0;
-    this.m10 = 0.0;
-    this.m11 = 1.0;
-    this.m12 = 0.0;
-    this.m20 = 0.0;
-    this.m21 = 0.0;
-    this.m22 = 1.0;
-    return this;
-}
-Transform.prototype.concat = function(traf) {
-    // add Transform traf to this Transform
-    for (var i = 0; i < 3; i++) {
-        for (var j = 0; j < 3; j++) {
-            var c = 0.0;
-            for (var k = 0; k < 3; k++) {
-                c += traf["m"+i+k] * this["m"+k+j];
-            }
-            this["m"+i+j] = c;
-        }
-    }
-    return this;
-}
-Transform.prototype.transform = function(rect) {
-    // returns transformed Rectangle or Position with this Transform applied
-    var x = this.m00 * rect.x + this.m01 * rect.y + this.m02;
-    var y = this.m10 * rect.x + this.m11 * rect.y + this.m12;
-    if (rect.width) {
-        // transform the other corner points
-        var pt2 = rect.getPt2();
-        var x2 = this.m00 * pt2.x + this.m01 * pt2.y + this.m02;
-        var y2 = this.m10 * pt2.x + this.m11 * pt2.y + this.m12;
-        var width = x2 - x;
-        var height = y2 - y;
-        return new Rectangle(x, y, width, height);
-    }
-    return new Position(x, y);
-}
-Transform.prototype.invtransform = function(rect) {
-    // returns transformed Rectangle or Position with the inverse of this Transform applied
-    var det = this.m00 * this.m11 - this.m01 * this.m10;
-    var x = (this.m11 * rect.x - this.m01 * rect.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
-    var y = (- this.m10 * rect.x + this.m00 * rect.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
-    if (rect.width) {
-        /* transforming width and height like points seems to be wrong 
-        var width = (this.m11 * rect.width - this.m01 * rect.height - this.m11 * this.m02 + this.m01 * this.m12) / det;
-        var height = (- this.m10 * rect.width + this.m00 * rect.height + this.m10 * this.m02 - this.m00 * this.m12) / det;
-        */
-        // transform the other corner points
-        var pt2 = rect.getPt2();
-        var x2 = (this.m11 * pt2.x - this.m01 * pt2.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
-        var y2 = (- this.m10 * pt2.x + this.m00 * pt2.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
-        var width = x2 - x;
-        var height = y2 - y;
-        return new Rectangle(x, y, width, height);
-    }
-    return new Position(x, y);
-}
-function getRotation(angle, pos) {
-    // returns a Transform that is a rotation by angle degrees around [pos.x, pos.y]
-    var traf = new Transform();
-    if (angle != 0) {
-        var t = 2.0 * Math.PI * parseFloat(angle) / 360.0;
-        traf.m00 = Math.cos(t);
-        traf.m01 = - Math.sin(t);
-        traf.m10 = Math.sin(t);
-        traf.m11 = Math.cos(t);
-        traf.m02 = pos.x - pos.x * Math.cos(t) + pos.y * Math.sin(t);
-        traf.m12 = pos.y - pos.x * Math.sin(t) - pos.y * Math.cos(t);
-    }
-    return traf;
-}
-Transform.prototype.getRotation = getRotation;
-function getTranslation(pos) {
-    // returns a Transform that is a translation by [pos.x, pos,y]
-    var traf = new Transform();
-    traf.m02 = pos.x;
-    traf.m12 = pos.y;
-    return traf;
-}
-Transform.prototype.getTranslation = getTranslation;
-function getScale(size) {
-    // returns a Transform that is a scale by [size.width, size.height]
-    var traf = new Transform();
-    traf.m00 = size.width;
-    traf.m11 = size.height;
-    return traf;
-}
-Transform.prototype.getScale = getScale;
-
-
-/*
- *  parameters class
- */
-
-function Parameters() {
-	this.params = new Object();
-	this.PARAM_ALL = 65535;
-	return this;
-}
-Parameters.prototype.define = function(name, defaultValue, detail) {
-    // create a new parameter with a name and a default value
-    if (!this.params[name]) this.params[name] = new Object();
-    this.params[name].defaultValue = defaultValue;
-    this.params[name].hasValue = false;
-    this.params[name].value = defaultValue;
-    this.params[name].detail = detail;
-    return this.params[name];
-}
-Parameters.prototype.reset = function(name) {
-    // resets the given parameter to its default value
-    if (!this.params[name]) {
-    		alert("Could not reset non-existing parameter '" + name + "'");
-		return false;
-    }
-    this.params[name].hasValue = false;
-    this.params[name].value = this.params[name].defaultValue;
-    return this.params[name];
-}
-Parameters.prototype.resetAll = function() {
-    // resets all parameters to their default values
-    for (var p in this.params) {
-    		this.reset(p);
-    	}
-    return true;
-}
-Parameters.prototype.remove = function(name) {
-    if (!defined(this.params[name])) return false;
-    delete this.params[name];
-    return true;
-}
-Parameters.prototype.get = function(name) {
-    // returns the named parameter value or its default value
-    if (!defined(this.params[name])) return null;
-    return this.params[name].hasValue ? this.params[name].value : this.params[name].defaultValue;
-}
-Parameters.prototype.set = function(name, value, relative) {
-    // sets parameter value (relative values with +/- if relative=true)
-    if (!defined(this.params[name])) return null;
-    var p = this.params[name];
-    if (relative && value.slice) {
-    		// value is a string -- check if it starts with +/-
-        var sign = value.slice(0, 1);
-        if (sign == '+') {
-            p.value = parseFloat(p.value) + parseFloat(value.slice(1));
-        } else if (sign == '-') {
-            p.value = parseFloat(p.value) - parseFloat(value.slice(1));
-        } else {
-            p.value = value;
-        }
-    } else {
-    		p.value = value;
-    	}
-    p.hasValue = true;
-    return p.value;
-}
-Parameters.prototype.isSet = function(name) {
-    // returns if the parameter's value has been set
-    if (!defined(this.params[name])) return null;
-    return this.params[name].hasValue;
-}
-Parameters.prototype.getAll = function(detail) {
-    // returns a string of all parameters in query format
-    if (!detail) detail = this.PARAM_ALL;
-    var pa = new Array();
-    for (p in this.params) {
-        if (((this.params[p].detail & detail) > 0)
-        && (this.params[p].hasValue)) {
-            var val = this.params[p].value;
-            if (val != "") {
-                pa.push(p + "=" + val);
-            }
-        }
-    }
-    return pa.join("&");
-}
-Parameters.prototype.parse = function(query) {
-    // gets parameter values from query format string
-    var pa = query.split("&");
-    for (var i = 0; i < pa.length; i++) {
-        var keyval = pa[i].split("=");
-        if (keyval.length == 2) {
-            this.set(keyval[0], keyval[1]);
-        }
-    }
-}
-
-/*
- * Flags class
- *
- * Flags are (hash-) collections of unique strings.
- */
-function Flags() {
-    this.flags = new Object();
-    return this;
-}
-Flags.prototype.define = function(name, detail) {
-    // create a new flag with a name and detail level
-    this.flags[name] = new Object();
-    this.flags[name].set = false;
-    this.flags[name].detail = detail;
-    return this.flags[name];
-}
-Flags.prototype.get = function(name) {
-	return (this.flags[name]) ? this.flags[name].set : false;
-}
-Flags.prototype.set = function(name, value) {
-	if (!defined(value)) value = true;
-	if (!this.flags[name]) this.flags[name] = new Object;
-	this.flags[name].set = value;
-}
-Flags.prototype.reset = function(name) {
-	if (!this.flags[name]) this.flags[name] = new Object;
-	this.flags[name].set = false;
-}
-Flags.prototype.toggle = function(name) {
-	if (!this.flags[name]) this.flags[name] = new Object;
-	this.flags[name].set = !this.flags[name].set;
-}
-Flags.prototype.resetAll = function() {
-	for (var f in this.flags) {
-		this.flags[f].set = false;
-	}
-}
-Flags.prototype.parse = function(query, sep) {
-    // sets the flags from the string query
-    if (!sep) sep = ",";
-    var fa = query.split(sep);
-    for (var i = 0; i < fa.length ; i++) {
-        var f = fa[i];
-        if (f != "") {
-            this.set(f);
-        }
-    }
-}
-Flags.prototype.getAll = function(detail, sep) {
-    // returns a string of all flags in query format
-    if (!detail) detail = 255;
-    if (!sep) sep = ",";
-    var fa = new Array();
-    for (f in this.flags) {
-        if (this.flags[f].set) {
-        		// if the flag has a detail level it must match
-        		// otherwise we assume detail=128
-        		if (this.flags[f].detail) {
-	        		if ((this.flags[f].detail & detail) > 0) {
-	        			fa.push(f);
-	        		}
-	        	} else {
-        		  	if ((detail & 128) > 0) {
-        				fa.push(f);
-        			}
-        		}
-        	}
-    }
-    return fa.join(sep);
-}
-
-
-/* **********************************************
- *     HTML/DOM routines
- * ******************************************** */
-
-function getElement(tagid, quiet) {
-    // returns the element object with the id tagid
-    var e;
-    if (document.getElementById) {
-        e = document.getElementById(tagid);
-    } else if (document.all) {
-        alert("document.all!");
-        e = document.all[tagid];
-    } else if (document.layers) {
-        e = document.layers[tagid];
-    } 
-    if (e) {
-        return e;
-    } else {
-        if (! quiet) {
-            alert("unable to find element: "+tagid);
-        }
-        return null;
-    }
-}
-
-function getElementPosition(elem) {
-    // returns a Position with the position of the element
-    var x = 0;
-    var y = 0;
-    if (defined(elem.offsetLeft)) {
-        var e = elem;
-        while (e) {
-            if (browserType.isIE) {
-                if (browserType.isMac) {
-                    if (e.offsetParent.tagName == "BODY") {
-                        // IE for Mac extraspecial
-                        x += e.clientLeft;
-                        y += e.clientTop;
-                        break;
-                    }
-                } else {
-                    if ((e.tagName != "TABLE") && (e.tagName != "BODY")) {
-                        x += e.clientLeft;
-                        y += e.clientTop;
-                    }
-                }
-            }
-            x += e.offsetLeft;
-            y += e.offsetTop;
-            e = e.offsetParent;
-        }
-    } else if (defined(elem.x)) {
-        // use .x for other (which?)
-        x = elem.x;
-        y = elem.y;
-    } else if (defined(elem.pageX)) {
-        // use pageX for N4
-        x = elem.pageX;
-        y = elem.pageY;
-    } else {
-        alert("unable to get position of " + elem + " (id:" + elem.id + ")");
-    }
-    return new Position(getInt(x), getInt(y));
-}
-
-function getElementSize(elem) {
-    // returns a Rectangle with the size of the element
-    var width = 0;
-    var height = 0;
-    if (defined(elem.offsetWidth)) {
-        width = elem.offsetWidth;
-        height = elem.offsetHeight;
-    } else if (defined(elem.width)) {
-        width = elem.width;
-        height = elem.height;
-    } else if (defined(elem.clip.width)) {
-        width = elem.clip.width;
-        height = elem.clip.height;
-    } else {
-        alert("unable to get size of " + elem + " (id:" + elem.id + ")");
-    }
-    return new Size(getInt(width), getInt(height));
-}
-
-function getElementRect(elem) {
-    // returns a Rectangle with the size and position of the element
-    // FIX ME: what about borders?
-    var pos = getElementPosition(elem);
-    var size = getElementSize(elem);
-    return new Rectangle(pos.x, pos.y, size.width, size.height);
-}
-
-function moveElement(elem, rect) {
-    // moves and sizes the element
-    if (elem.style) {
-        if (defined(rect.x)) {
-            elem.style.left = Math.round(rect.x) + "px";
-            elem.style.top = Math.round(rect.y) + "px";
-        }
-        if (defined(rect.width)) {
-            elem.style.width = Math.round(rect.width) + "px";
-            elem.style.height = Math.round(rect.height) + "px";
-        }
-    } else if (document.layers) {
-        if (defined(rect.x)) {
-            elem.pageX = getInt(rect.x);
-            elem.pageY = getInt(rect.y);
-        }
-        if (defined(rect.width)) {
-            elem.clip.width = getInt(rect.width);
-            elem.clip.height = getInt(rect.height);
-        }
-    } else {
-        alert("moveElement(): element has no style or layer property!");
-        return false;
-    }
-    return true;
-}
-
-function showElement(elem, show) {
-    // shows or hides the element
-    if (elem.style)
-        elem.style.visibility = show ? "visible" : "hidden";
-    else if (defined(elem.visibility))
-        elem.visibility = show ? "show" : "hide";
-    else
-        alert("showElement(): element has no style or layer property!");
-    return true;
-}
-
-function evtPosition(evt) {
-    // returns the on-screen Position of the Event 
-    var x;
-    var y;
-    evt = (evt) ? evt : window.event;
-    if (!evt) {
-        alert("no event found! " + evt);
-        return;
-        }
-    if (defined(evt.pageX)) {
-        x = parseInt(evt.pageX);
-        y = parseInt(evt.pageY);
-    } else if (defined(evt.clientX)) {
-        x = parseInt(document.body.scrollLeft + evt.clientX);
-        y = parseInt(document.body.scrollTop  + evt.clientY);
-    } else {
-        alert("evtPosition(): don't know how to deal with " + evt);
-        }
-    return new Position(x, y);
-}
-
-function registerEvent(type, elem, handler) {
-    // register the given event handler on the indicated element
-    if (elem.addEventListener) {
-        elem.addEventListener(type, handler, false);    // bubble
-        }
-    else if (elem.attachEvent) {
-        elem.attachEvent("on" + type, handler);
-        }
-    else if (elem.captureEvents) {
-        if (Event) { 
-            t = type.toUpperCase();
-            elem.captureEvents(Event[t]);
-            elem[ "on" + type ] = handler;
-            }
-        }
-    else {
-        alert("Could not register event of type " + type);
-        return false;
-        }
-    return true;
-    }
-    
-function unregisterEvent(type, elem, handler) {
-    // unregister the given event handler from the indicated element
-    if (elem.removeEventListener) {
-        elem.removeEventListener(type, handler, false);
-            }
-    else if (elem.detachEvent) {
-        elem.detachEvent("on" + type, handler);
-        }
-    else if (elem.releaseEvents) {
-        if (Event) { 
-            t = type.toUpperCase();
-            elem.releaseEvents(Event[t]);
-            elem[ "on" + type ] = null;
-            }
-        }
-    else {
-        alert("Could not register event of type " + type);
-        return false;
-        }
-    return true;
-}
-
-function registerEventById(type, id, handler) {
-    registerEvent(type, getElement(id), handler);
-    }
-
-function unregisterEventById(type, id, handler) {
-    unregisterEvent(type, getElement(id), handler);
-    }
-
-function stopEvent(e) {
-    if (!e) var e = window.event;
-    e.cancelBubble = true;
-    if (e.stopPropagation) e.stopPropagation();
-    return false;
-}
-
-function getEventSrc(e) {
-    if (e.target) return e.target;
-    if (e.srcElement) return e.srcElement;
-}
-
-// old registerXXYY API for compatibility
-function registerMouseDown(elem, handler) {
-    return registerEvent("mousedown", elem, handler);
-}
-function unregisterMouseDown(elem, handler) {
-    return unregisterEvent("mousedown", elem, handler);
-}
-function registerMouseMove(elem, handler) {
-    return registerEvent("mousemove", elem, handler);
-}
-function unregisterMouseMove(elem, handler) {
-    return unregisterEvent("mousemove", elem, handler);
-}
-function registerKeyDown(handler) {
-    return registerEvent("keypress", elem, handler);
-}
-
-
-function getWinSize() {
-    // returns a Size with the current window size (mostly from www.quirksmode.org)
-    var wsize = new Size(100, 100);
-    if (defined(self.innerHeight))  {
-        // all except Explorer
-        if ((self.innerWidth == 0)||(self.innerHeight == 0)) {
-            // Safari 1.2 (and other) bug
-            if (parent) {
-                wsize.height = parent.innerHeight;
-                wsize.width = parent.innerWidth;
-            }
-        } else {
-            wsize.width = self.innerWidth;
-            wsize.height = self.innerHeight;
-        }
-    } else if (document.documentElement && document.documentElement.clientHeight) {
-        // Explorer 6 Strict Mode
-        wsize.width = document.documentElement.clientWidth;
-        wsize.height = document.documentElement.clientHeight;
-    } else if (document.body) {
-        // other Explorers
-        wsize.width = document.body.clientWidth;
-        wsize.height = document.body.clientHeight;
-    }
-    return wsize;
-}
-
-function getWinRect() {
-    var size = getWinSize();
-    return new Rectangle(0, 0, size.width, size.height);
-}
-    
-function openWin(url, name, params) {
-    // open browser window
-    var ow = window.open(url, name, params);
-    ow.focus();
-}
-
-/* **********************************************
- *     cookie class
- * ******************************************** */
-
-function Cookie() {
-    return this.read();
-}
-
-Cookie.prototype.read = function() {
-    var s = document.cookie;
-    var lines = s.split("; ");  // semicolon and space for all browsers?
-    for (var i in lines) {
-        var line = lines[i];
-        var sep = line.indexOf("=");
-        if (sep != -1) this.add(
-            line.substr(0, sep),
-            line.substr(sep + 1)
-            );
-        }
-	return this;
-}
-
-Cookie.prototype.store = function() {
-    var lines = new Array();
-    for (var i in this) {
-        var item = this[i];
-        if (typeof(item) == typeof(lines)) // Array
-            lines.push(i + "=" + item.join(","));
-        else if (typeof(item) != "function") // single item
-            lines.push(i + "=" + item);
-        }
-    // var s = lines.join(";")
-	for (line in lines) document.cookie = lines[line];
-    return this;
-	}
-
-Cookie.prototype.add = function(key, value) {
-    value = value.toString();
-    if (value.indexOf(",") == -1) 
-            this[key] = value;  // single value
-        else
-            this[key] = value.split(",");   // list of values
-    return this[key];
-    }
-
-Cookie.prototype.get = function(key) {
-    return this[key];
-    }
-
-Cookie.prototype.addbool = function(key, value) {
-    this[key] = Boolean(value).toString();
-    return this[key];
-    }
-
-Cookie.prototype.getbool = function(key) {
-    var val = this[key];
-    return (val > "") && (val != "0") && (val != "false");
-    }
-
-Cookie.prototype.remove = function(key) {
-    delete this[key];
-    }
-
-function Slider(id, valMin, valMax, valStart, stepSize, onChange) {
-    // a (horizontal) slider widget
-    this.id = id;
-    this.elem   = getElement(id);
-    this.slider = getElement(id + "-slider");   // the slider handle
-    this.input  = getElement(id + "-input", 1); // optional input field
-    this.bar    = getElement(id + "-bar");      // the slider bar 
-    this.barRect = getElementRect(this.bar);
-    this.sliderRect = getElementRect(this.slider);
-    this.xMin = this.barRect.x;
-    this.xMax = this.xMin + this.barRect.width; 
-    this.xDiff = this.xMax - this.xMin; 
-    this.Y = this.barRect.getCenter().y;        // middle axis of bar 
-    this.valMin = valMin;
-    this.valMax = valMax;
-    this.valDiff = Math.abs(valMax - valMin);
-    this.valStart = valStart;
-    this.value = valStart;
-    this.stepSize = stepSize;
-    this.valueLabel  = getElement(id + "-value", 1);
-    this.valMinLabel = getElement(id + "-valmin", 1);
-    this.valMaxLabel = getElement(id + "-valmax", 1);
-    this.onChange = onChange ? onChange : function() {};
-    this.update();
-    this.activate();
-    sliders[id + '-slider'] = this; // make a handle to the object
-    return this;
-    }
-
-Slider.prototype.show = function(show) {
-    showElement(this.elem, show);
-    this.activate();
-    }
-    
-Slider.prototype.activate = function() {
-    this.setupEvents();
-    }
-
-Slider.prototype.deactivate = function() {
-    unregisterEvent("mousedown", this.slider, this.onDragStart);
-    }
-
-Slider.prototype.reset = function() {
-    this.setValue(this.startVal);
-    }
-
-Slider.prototype.setValue = function(newVal) {
-    // sets slider to new value and updates
-    this.value = newVal;
-    this.update();
-    }
-
-Slider.prototype.calcValue = function() {
-    // calculates value from slider position
-    var xSlider = this.sliderRect.getCenter().x - this.xMin;
-    this.value = xSlider * this.valDiff / this.xDiff;
-    return this.value;
-    }
-
-Slider.prototype.update = function() {
-    // updates slider position to new value
-    var xSlider = this.value * this.xDiff / this.valDiff;
-    moveElement(this.slider, this.sliderRect.setCenter(
-        new Position(xSlider + this.xMin, this.Y)));
-    var strVal = this.value.toString();
-    if (this.valueLabel) this.valueLabel.innerHTML = strVal;
-    if (this.input) this.input.value = strVal;
-    }
-
-Slider.prototype.setupEvents = function() {
-    // installs all event callbacks
-    registerEvent("mousedown", this.slider, this.onDragStart);
-    }
-
-Slider.prototype.onDragStart = function(evt) {
-    var slider = sliders[this.id];
-    activeSlider = slider;
-    unregisterEvent("mousedown", slider.slider, slider.onDragStart);
-    registerEvent("mousemove", document, slider.onDrag);
-    registerEvent("mouseup",   document, slider.onDragEnd);
-    slider.startPos = evtPosition(evt);
-    slider.startX = slider.sliderRect.getCenter().x;
-    return stopEvent(evt);
-    }
-
-Slider.prototype.onDrag = function(evt) {
-    var slider = activeSlider;
-    var pos = evtPosition(evt);
-    var currX = slider.slider
-    var newX = pos.x - slider.startPos + slider.startX;
-    if (newX < slider.xMin) newX = slider.xMin;
-    if (newX > slider.xMax) newX = slider.xMax;
-    moveElement(slider.slider, slider.sliderRect.setCenter(
-        new Position(newX, slider.Y)));
-    return stopEvent(evt);
-    }
-
-Slider.prototype.onDragEnd = function(evt) {
-    var slider = activeSlider;
-    unregisterEvent("mousemove", document, slider.onDrag);
-    unregisterEvent("mouseup",   document, slider.onDragEnd);
-    slider.onChange(slider.calcValue());
-    activeSlider = null;
-    return stopEvent(evt);
-    }
-
-Slider.prototype.onInputChange = function() {
-    var slider = activeSlider;
-    slider.onChange(s.value);
-    }
-
-// :tabSize=4:indentSize=4:noTabs=true:
-
Binary file client/digitallibrary/greyskin/bg.png has changed
--- a/client/digitallibrary/greyskin/bg.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg7651"
-   sodipodi:version="0.32"
-   inkscape:version="0.42.2"
-   sodipodi:docbase="/Volumes/User/Users/casties/Desktop/web-devel/digibutton"
-   sodipodi:docname="bg.svg">
-  <defs
-     id="defs7653" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8.0000000"
-     inkscape:cy="8.0000000"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="688"
-     inkscape:window-height="481"
-     inkscape:window-x="8"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata7656">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.44078943;stroke:none;stroke-width:1.5000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="rect7659"
-       width="12.000000"
-       height="11.432178"
-       x="2.0000000"
-       y="2.0000000"
-       inkscape:export-xdpi="15.000000"
-       inkscape:export-ydpi="15.000000" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/birds-eye.png has changed
--- a/client/digitallibrary/greyskin/birds-eye.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="birds-eye.svg"
-   inkscape:export-filename="C:\digilib\greyskin\birds-eye.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="35.156972"
-     inkscape:cy="33.422353"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1024"
-     inkscape:window-height="749"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 24.5,21.513718 C 23.529478,19.451202 20.04955,17.297524 17.924811,17.280601 C 14.551956,17.154256 13.115556,19.712673 9.7679007,19.880851 C 9.175544,19.995079 7.3045086,19.191243 8.1201307,20.071917 C 9.3529217,21.839129 13.189646,20.035951 15.217464,19.753732 C 17.989372,19.514959 19.047506,20.331214 21.808507,21.214122 C 23.64299,22.764883 23.175698,25.542255 24.233985,26.252244 M 24.5,21.513718 C 25.470522,19.451202 28.636456,17.422524 30.761195,17.405601 C 34.13405,17.279256 35.444825,19.982025 38.792481,20.150203 C 39.384927,20.264152 41.696015,19.191654 40.879073,20.071761 C 39.651613,21.816668 35.758369,19.964307 33.748194,19.710782 C 30.869949,19.485317 29.793252,19.993322 26.924411,20.883904 C 24.731743,21.503029 26.059266,25.524828 24.171484,26.157098"
-       id="path2398"
-       sodipodi:nodetypes="cccccccccccccc" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/blue.png has changed
Binary file client/digitallibrary/greyskin/brightness-on.png has changed
--- a/client/digitallibrary/greyskin/brightness-on.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="brightness-on.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness-on.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <g
-       id="g2978"
-       style="fill:#ffffff;fill-opacity:0.98214287">
-      <path
-         transform="translate(-10.42857,10.28571)"
-         d="M 44.857142 12.5 A 10.214286 10.214286 0 1 1  24.428571,12.5 A 10.214286 10.214286 0 1 1  44.857142 12.5 z"
-         sodipodi:ry="10.214286"
-         sodipodi:rx="10.214286"
-         sodipodi:cy="12.5"
-         sodipodi:cx="34.642857"
-         id="path2955"
-         style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <g
-         id="g2968"
-         style="fill:#ffffff;fill-opacity:0.98214287">
-        <rect
-           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2959"
-           width="2.4285715"
-           height="33"
-           x="23"
-           y="6" />
-        <rect
-           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2966"
-           width="2.4285715"
-           height="33"
-           x="-24"
-           y="7.500001"
-           transform="matrix(0,-1,1,0,0,0)" />
-      </g>
-      <g
-         transform="matrix(0.707107,0.707107,-0.707107,0.707107,23.26192,-10.5061)"
-         id="g2972"
-         style="display:inline;fill:#ffffff;fill-opacity:0.98214287">
-        <rect
-           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2974"
-           width="2.4285715"
-           height="33"
-           x="23"
-           y="6" />
-        <rect
-           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2976"
-           width="2.4285715"
-           height="33"
-           x="-24"
-           y="7.500001"
-           transform="matrix(0,-1,1,0,0,0)" />
-      </g>
-    </g>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/brightness.png has changed
--- a/client/digitallibrary/greyskin/brightness.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="brightness.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <g
-       id="g3803"
-       style="fill:#919191;fill-opacity:1">
-      <path
-         transform="translate(-10.42857,10.28571)"
-         d="M 44.857142 12.5 A 10.214286 10.214286 0 1 1  24.428571,12.5 A 10.214286 10.214286 0 1 1  44.857142 12.5 z"
-         sodipodi:ry="10.214286"
-         sodipodi:rx="10.214286"
-         sodipodi:cy="12.5"
-         sodipodi:cx="34.642857"
-         id="path2955"
-         style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <g
-         id="g2968"
-         style="fill:#919191;fill-opacity:1">
-        <rect
-           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2959"
-           width="2.4285715"
-           height="33"
-           x="23"
-           y="6" />
-        <rect
-           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2966"
-           width="2.4285715"
-           height="33"
-           x="-24"
-           y="7.500001"
-           transform="matrix(0,-1,1,0,0,0)" />
-      </g>
-      <g
-         transform="matrix(0.707107,0.707107,-0.707107,0.707107,23.26192,-10.5061)"
-         id="g2972"
-         style="display:inline;fill:#919191;fill-opacity:1">
-        <rect
-           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2974"
-           width="2.4285715"
-           height="33"
-           x="23"
-           y="6" />
-        <rect
-           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           id="rect2976"
-           width="2.4285715"
-           height="33"
-           x="-24"
-           y="7.500001"
-           transform="matrix(0,-1,1,0,0,0)" />
-      </g>
-    </g>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/calibration-x.png has changed
--- a/client/digitallibrary/greyskin/calibration-x.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="calibration-x.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.791667"
-     inkscape:cx="24"
-     inkscape:cy="24.142434"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <rect
-       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1503"
-       width="0.093103863"
-       height="10.204791"
-       x="9.2002144"
-       y="18.706682" />
-    <rect
-       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1505"
-       width="0.093103863"
-       height="10.204791"
-       x="24.200214"
-       y="18.706682" />
-    <rect
-       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1507"
-       width="0.093103863"
-       height="10.204791"
-       x="39.200214"
-       y="18.706682" />
-    <rect
-       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1511"
-       width="0.22194758"
-       height="3.6609969"
-       x="32.124527"
-       y="18.653526" />
-    <rect
-       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect1513"
-       width="0.22194758"
-       height="3.6609969"
-       x="16.653526"
-       y="18.653526" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/calibration-y.png has changed
--- a/client/digitallibrary/greyskin/calibration-y.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="calibration-y.svg"
-   inkscape:export-filename="C:\digilib\greyskin\calibration-y.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.791667"
-     inkscape:cx="24"
-     inkscape:cy="25.408925"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <g
-       id="g1515"
-       transform="matrix(0,-1,1,0,0.437689,47.54928)">
-      <rect
-         y="18.706682"
-         x="9.2002144"
-         height="10.204791"
-         width="0.093103863"
-         id="rect1503"
-         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="18.706682"
-         x="24.200214"
-         height="10.204791"
-         width="0.093103863"
-         id="rect1505"
-         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="18.706682"
-         x="39.200214"
-         height="10.204791"
-         width="0.093103863"
-         id="rect1507"
-         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="18.653526"
-         x="32.124527"
-         height="3.6609969"
-         width="0.22194758"
-         id="rect1511"
-         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="18.653526"
-         x="16.653526"
-         height="3.6609969"
-         width="0.22194758"
-         id="rect1513"
-         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/cat.png has changed
--- a/client/digitallibrary/greyskin/cat.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="cat.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\cat.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.188034"
-     inkscape:cx="21.038579"
-     inkscape:cy="24.285714"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="vertical"
-       position="11.857143"
-       id="guide2331" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="36.735676"
-       id="guide2333" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       d="M 23.0625 3.53125 C 13.169888 4.224269 5.3749998 12.649853 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 C 23.358917 3.5352791 23.265829 3.5262514 23.1875 3.53125 C 23.148642 3.5337298 23.101295 3.5285323 23.0625 3.53125 z M 13.34375 10.5 L 22.15625 10.5 L 22.15625 20.90625 L 13.34375 20.90625 L 13.34375 10.5 z M 26.6875 10.5 L 35.5 10.5 L 35.5 20.90625 L 26.6875 20.90625 L 26.6875 10.5 z M 13.46875 24.65625 L 22.3125 24.65625 L 22.3125 35.0625 L 13.46875 35.0625 L 13.46875 24.65625 z M 26.75 24.65625 L 35.5625 24.65625 L 35.5625 35.0625 L 26.75 35.0625 L 26.75 24.65625 z "
-       id="path2396" />
-    <rect
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect2338"
-       width="8.8160076"
-       height="10.410372"
-       x="13.144758"
-       y="10.5" />
-    <rect
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect2340"
-       width="8.8160076"
-       height="10.410372"
-       x="26.5"
-       y="10.5" />
-    <rect
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect2342"
-       width="8.8160076"
-       height="10.410372"
-       x="13.287616"
-       y="24.642857" />
-    <rect
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect2344"
-       width="8.8160076"
-       height="10.410372"
-       x="26.541136"
-       y="24.642857" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline" />
-</svg>
Binary file client/digitallibrary/greyskin/contrast-on.png has changed
--- a/client/digitallibrary/greyskin/contrast-on.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="brightness-on.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness-on.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.375 13.03125 C 18.128391 13.497684 14 17.914036 14 23.28125 C 14 28.716305 18.221162 33.19164 23.5625 33.5625 L 23.5625 13.03125 C 23.497118 13.035814 23.440041 13.025468 23.375 13.03125 z "
-       id="path2882" />
-    <path
-       style="opacity:1;color:#000000;fill:#fefefe;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 25.625,13.001808 C 30.871609,13.468242 35,17.884594 35,23.251808 C 35,28.686863 30.778838,33.162198 25.4375,33.533058 L 25.4375,13.001808 C 25.502882,13.006372 25.559959,12.996026 25.625,13.001808 z "
-       id="path2891" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/contrast.png has changed
--- a/client/digitallibrary/greyskin/contrast.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="brightness.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="opacity:1;color:#000000;fill:#7f7f7f;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 23.375 13.03125 C 18.128391 13.497684 14 17.914036 14 23.28125 C 14 28.716305 18.221162 33.19164 23.5625 33.5625 L 23.5625 13.03125 C 23.497118 13.035814 23.440041 13.025468 23.375 13.03125 z "
-       id="path2882" />
-    <path
-       style="opacity:1;color:#000000;fill:#d2d2d2;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 25.625,13.001808 C 30.871609,13.468242 35,17.884594 35,23.251808 C 35,28.686863 30.778838,33.162198 25.4375,33.533058 L 25.4375,13.001808 C 25.502882,13.006372 25.559959,12.996026 25.625,13.001808 z "
-       id="path2891" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/corona.png has changed
--- a/client/digitallibrary/greyskin/corona.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg472"
-   sodipodi:version="0.32"
-   width="210mm"
-   height="210mm"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="corona1.svg"
-   inkscape:version="0.43"
-   inkscape:export-filename="C:\Digilib\greyskin\corona1.png"
-   inkscape:export-xdpi="3.8699999"
-   inkscape:export-ydpi="3.8699999">
-  <metadata
-     id="metadata2508">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs474">
-    <linearGradient
-       id="linearGradient6383">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6385" />
-      <stop
-         id="stop6391"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop6387" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient496">
-      <stop
-         style="stop-color:#fcfcfc;stop-opacity:0.47741935;"
-         offset="0"
-         id="stop497" />
-      <stop
-         id="stop2526"
-         offset="0.83177572"
-         style="stop-color:#bdbdbd;stop-opacity:0.2;" />
-      <stop
-         style="stop-color:#404040;stop-opacity:0;"
-         offset="1"
-         id="stop498" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient485">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.50196081;"
-         offset="0"
-         id="stop486" />
-      <stop
-         id="stop2514"
-         offset="0.26168224"
-         style="stop-color:#474747;stop-opacity:0.5032258;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.48387095;"
-         offset="1"
-         id="stop487" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient477">
-      <stop
-         style="stop-color:#ffcb39;stop-opacity:1;"
-         offset="0"
-         id="stop478" />
-      <stop
-         id="stop6394"
-         offset="0.86915886"
-         style="stop-color:#ffe59c;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffcb39;stop-opacity:0;"
-         offset="1"
-         id="stop479" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient477"
-       id="radialGradient480"
-       cx="0.53846157"
-       cy="0.50000000"
-       fx="0.53846157"
-       fy="0.50000000"
-       r="0.66683644"
-       gradientUnits="objectBoundingBox"
-       spreadMethod="pad" />
-    <radialGradient
-       xlink:href="#linearGradient485"
-       id="radialGradient484"
-       cx="293.69321"
-       cy="685.94305"
-       fx="284.35916"
-       fy="748.98859"
-       r="291.13598"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       gradientTransform="matrix(0.203097,0.358167,-0.311967,0.176899,355.5512,235.3307)" />
-    <radialGradient
-       xlink:href="#linearGradient496"
-       id="radialGradient489"
-       cx="0.49386612"
-       cy="0.48700377"
-       fx="0.49386612"
-       fy="0.48700377"
-       r="0.71423900"
-       gradientUnits="objectBoundingBox"
-       spreadMethod="pad" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient496"
-       id="radialGradient2522"
-       cx="565.23035"
-       cy="576.22406"
-       fx="555.30066"
-       fy="573.31244"
-       r="227.42172"
-       gradientTransform="matrix(-0.541407,-0.758332,1.163093,-0.830405,141.165,1490.071)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient485"
-       id="radialGradient3671"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.203097,0.358167,-0.311967,0.176899,355.5512,235.3307)"
-       spreadMethod="pad"
-       cx="310.76443"
-       cy="786.34125"
-       fx="301.43039"
-       fy="849.38678"
-       r="291.13599" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient496"
-       id="radialGradient3673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.69009,-0.652739,0.900015,-0.951537,391.167,1497.043)"
-       cx="562.72363"
-       cy="597.58929"
-       fx="562.72363"
-       fy="597.58929"
-       r="227.42172" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient477"
-       id="radialGradient6381"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.592132,0.954487,-0.942161,0.584474,329.2198,8.028518)"
-       spreadMethod="pad"
-       cx="288.15497"
-       cy="136.10474"
-       fx="288.15503"
-       fy="136.10484"
-       r="291.13599" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     inkscape:zoom="0.50262434"
-     inkscape:cx="365.2634"
-     inkscape:cy="286.5522"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="121"
-     inkscape:window-y="101"
-     inkscape:current-layer="layer5" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="glass"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient6381);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-       id="path476"
-       d="M 707.05579 362.61322 A 335.4404 335.44043 0 1 1  36.174988,362.61322 A 335.4404 335.44043 0 1 1  707.05579 362.61322 z"
-       sodipodi:cx="371.61539"
-       sodipodi:cy="362.61322"
-       sodipodi:rx="335.4404"
-       sodipodi:ry="335.44043"
-       transform="matrix(0,1.142349,-1.142349,0,790.2569,-58.43568)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.01823568;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path6426"
-       sodipodi:cx="372.04724"
-       sodipodi:cy="366.07858"
-       sodipodi:rx="274.55893"
-       sodipodi:ry="260.63202"
-       d="M 646.60617 366.07858 A 274.55893 260.63202 0 1 1  97.488312,366.07858 A 274.55893 260.63202 0 1 1  646.60617 366.07858 z"
-       transform="translate(5.968672,5.968672)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="draw"
-     style="display:inline" />
-</svg>
--- a/client/digitallibrary/greyskin/debug.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-var Debug = null;
-var _now = {};
-
-function element(name, content) {
-	var E = document.createElement(name);
-	if (content) {
-		if (content.nodeType) // it's a node
-			E.appendChild(content)
-		else // it's text
-			E.appendChild(document.createTextNode(content))
-		};
-	return E;
-	}
-	
-function appendElement(node, name, content) {
-	if (node == null || ! node.appendChild)
-        return node;
-	return node.appendChild(element(name,content));
-	}
-
-function getDebug() {
-	if (Debug == null) {
-		Debug = document.getElementById('debug');
-		if (Debug == null) {
-			Debug = appendElement(document.body, 'div');
-			Debug.setAttribute('class', 'debug');
-			Debug.setAttribute('id', 'debug');
-			Debug.innerhtml = '<h3>Debug</h3>';
-			};
-		};
-	return Debug;
-	}
-
-function debug() {
-	var D = getDebug();
-	// return alertObject(D);
-	var msg = "";
-	for (var i = 0; i<arguments.length; i++) msg += arguments[i] + " ";
-	return appendElement(D, "p", msg);
-	}
-
-function debugObject(obj, exclude) {
-	if (exclude == null)
-	    exclude = '';
-	var noConst = exclude.indexOf('const') > -1;
-	var A = new Array();
-	for (var prop in obj) A.push(prop); 
-	A.sort();
-	var D = getDebug();
-	var T = appendElement(D, "table");
-	for (var i = 0; i < A.length; i++) {
-		var key = A[i];
-		var value = obj[key];
-		var type = typeof(value);
-		// exclude specified types
-		if (exclude.indexOf(type) > -1)
-			continue;
-		// exclude uppercase-only properties (= constants)
-		if (noConst && key.search(/^[A-Z0-9_]+$/) > -1)
-			continue;
-		var TR = appendElement(T, "tr");
-		appendElement(TR, "td", element("b", key));
-		appendElement(TR, "td", type); 
-		appendElement(TR, "td", value + ""); 
-		if (type == "function") 
-			appendElement(TR, "td", value.toSource());
-		};
-	}
-
-function strObject(obj) {
-	var res = "";
-	var A = new Array();
-	try {
-		for (var i in obj) A[i] = typeof(obj[i]);
-		}
-	catch(e) { typ = "unknown" };
-    var count = 0;
-	for (var item in A) {
-		count++;
-        typ = A[item];
-		res += item + " (" + typ + "): ";
-		if (typ != "function") res += obj[item];
-		res += "\t";
-        if (count % 4 == 0)
-            res += "\n";
-		}
-	return res;
-	}
-
-function alertObject(obj) {
-	return alert(strObject(obj));
-	}
-
-function alertHTML(obj) {
-	if (obj)
-        return alert(obj.tagName + ".innerHTML:\n" + obj.innerHTML);
-	}
-
-function serialize(xmlobject) {
-	return (new XMLSerializer()).serializeToString(xmlobject);
-	}
-	
-function startTime(s) {
-	_now[s] = new Date();
-	}
-	
-function elapsedTime(s) {
-	var diff = new Date(new Date - _now[s]);
-	debug(s + ": " + diff.getSeconds() + "." + diff.getMilliseconds() + " sec.");
-	}
-
Binary file client/digitallibrary/greyskin/delmark.png has changed
--- a/client/digitallibrary/greyskin/delmark.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="delmark.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\delmark.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="60"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52965354;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <rect
-       style="opacity:1;color:#000000;fill:#818181;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:1.01823568;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2405"
-       width="18.981764"
-       height="18.981375"
-       x="14.573074"
-       y="13.296871" />
-    <text
-       xml:space="preserve"
-       style="font-size:23.58337593px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="15.091353"
-       y="33.00325"
-       id="text2403"
-       transform="scale(1.074523,0.930646)"><tspan
-         sodipodi:role="line"
-         id="tspan2405"
-         x="15.091353"
-         y="33.00325">1</tspan></text>
-    <rect
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2510"
-       width="30.717447"
-       height="2.8014932"
-       x="-14.440524"
-       y="-34.634766"
-       transform="matrix(0.707107,-0.707107,-0.707107,-0.707107,0,0)" />
-  </g>
-</svg>
--- a/client/digitallibrary/greyskin/diginew.css	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-/* Styles for Digilib NG */
-/* (c) 2005 by Martin Raspe <hertzhaft@biblhertz.it> */
-/* Bibliotheca Hertziana (Max-Planck-Institute for Art History), Rome */
-
-body {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: 8pt;
-	margin-left: 8px;
-	margin-top: 8px;
-	padding: 0px;
-	}
-
-code {
-	font-family: monospace;
-	color: blue;
-	}
-
-pre	{ color: #006060; }
-
-
-a.icon {
-	margin: 0px;
-	padding: 0px;
-	}
-
-a.arrow {
-	display: block;
-	position: absolute;
-	border: none;
-	z-index: 50;
-	background-repeat: no-repeat;
-	background-position: center;
-	}
-
-a#up:hover {
-	background-image: url('up.png');
-	}
-
-a#down:hover {
-	background-image: url('down.png');
-	}
-
-a#left:hover {
-	background-image: url('left.png');
-	}
-
-a#right:hover {
-	background-image: url('right.png');
-	}
-
-/* Images */
-
-img.logo {
-	border: none;
-	}
-
-img.png {
-	border: none;
-	}
-
-img.png:hover {
-	background-image: url('corona.png');
-	}
-	
-img#bird-image {
-	border: none;
-	position: fixed;
-	bottom: 8px;
-	right:  48px;
-	visibility: hidden;
-	z-index: 1;
-	}
-
-/* DIVs */
-
-div.button {
-	padding: 0px;
-	}
-
-div.separator {
-	margin-bottom: 4px;
-	border-top: 2px solid lightgrey;
-	}
-
-div.mark {
-	position: absolute;
-	color: white;
-	background: url('mark-bg-16.png');
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size:11px;
-	height: 15px;
-	width: 16px;
-	padding-top: 1px;
-	text-align: center;
-	z-index: 10;
-	visibility: hidden;
-	/* filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='mark-bg-16.png') */
-	}
-		
-div#bg {
-	position: absolute;
-	background-color: grey;
-    background-repeat:no-repeat;
-    cursor: move;
-    visibility: hidden;
-}
-	
-div#scaler {
-    margin-right: 50px;
-    /*	position: absolute;
-	left: 8px;
-	top: 8px;
-	bottom: 8px;
-	right: 44px;
-*/	/* overflow: auto; */
-	}
-
-div#scaler img {
-    cursor: default;
-}
-
-div#overlay, div#bird-overlay {
-	position: fixed;
-	background-color: transparent;
-	border: none;
-	z-index: 100;
-	visibility: hidden;
-	/* box-sizing: border-box;
-	-moz-box-sizing: border-box; */
-	}
-
-div#buttons {
-	position: fixed;
-	right: 5px;
-	top: 5px;
-	padding: 3px;
-/*	background-color: #E0E0E0; */
-    background-color: lightgrey;	 
-  }
-
-div#dloptions {
-	position: fixed;
-	right: 5px;
-	top: 5px;
-	padding: 3px;
-/*	background-color: #E0E0E0; */
-    background-color: lightgrey;
-	visibility: hidden;
-	}
-
-div#zoom {
-	position: absolute;
-	/* border: 2px solid #ffa060; */
-	border: 2px solid #ff0000;
-	z-index: 200;
-	visibility: hidden;
-	/* box-sizing: border-box;
-	-moz-box-sizing: border-box; */
-	}
-
-div#bird-area {
-	position: fixed;
-	/* border: 2px solid #ffa060; */
-	border: 2px solid #ff0000;
-	background-color: transparent;
-	/* box-sizing: border-box;
-	-moz-box-sizing: border-box; */
-	z-index: 10;
-	visibility: hidden;
-	}
-
-div#calibration {
-	background: url('blue.png');
-	position: absolute;
-	top: 0px;
-	width: 400px;
-	padding: 0px;
-	visibility: hidden;
-	z-index: 1000;
-	}
-
-div#calibration div {
-	width: 100%;
-	height: 100%;
-	margin: 0px;
-	padding: 0px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	text-align: center;
-	color: lightcyan;
-	border: 1px solid lightcyan;
-	background: url('ruler-top.gif') 0px -1px repeat-x;
-	z-index: 1001;
-	}
-
-p.cm {
-	font-weight: bold;
-	}
-
-div.popup-menu {
-	position: absolute;
-	top: 0px;
-	padding: 0px 2px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	border: 2px solid lightcyan;
-	background-color: lightgrey;
-	text-align: center;
-	visibility: hidden;
-	z-index: 1005;
-	}
-
-div.popup-menu p {
-	margin: 2px 0px;
-	padding: 0px;
-	}
-
-div.popup-menu p:hover {
-	background-color: #ffa060;
-	}
-
-div.popup-menu a {
-	text-decoration: none;
-	color: black;
-	}
-
-div#about {
-	position: absolute;
-	width: 200px;
-	top: 100px;
-	left: 350px;
-	height: 200px;
-	padding: 0px 2px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	border: 2px solid lightcyan;
-	background-color: lightgrey;
-	text-align: center;
-	visibility: hidden;
-	z-index: 1000;
-	}
-
-div#about p {
-	margin: 6px;
-	}
-
-	
-/* DEBUG elements */
-
-div#debug {
-	position: absolute;
-	width: 150px;
-	top: 50px;
-	right: 36px;
-	bottom: 50px;
-	overflow: auto;
-	padding: 0px 2px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	color: lightgreen;
-	border: 1px dotted black;
-	background-color: transparent;
-	visibility: hidden;
-	}
-
-div#debug p.debug, h1 {
-	font-weight: bold;
-	color: lightcyan;
-	}
-
-div#debug p, h1 {
-	margin: 0px;
-	padding: 2px 0px;
-	font-size: 9px;
-	background-color: black;
-	}	
-
-
--- a/client/digitallibrary/greyskin/diginew.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,618 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%@ page language="java" pageEncoding="UTF-8"%><%!
-	// -- JSP init -------------
-	
-	// create DocumentBean instance for all JSP requests
-	digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-	
-	// initialize DocumentBean instance in JSP init
-	public void jspInit() {
-	    try {
-            // set servlet init-parameter
-		    docBean.setConfig(getServletConfig());
-	    } catch (javax.servlet.ServletException e) {
-		    System.out.println(e);
-	    }
-	}
-	// -- end of JSP init -------------
-%><%
-	// -- JSP request -------------
-	
-	// parsing the query
-	// -----------------
-	digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-	docBean.setRequest(dlRequest);
-	// check if authentication is needed and redirect if necessary
-	docBean.doAuthentication(response);
-	// add number of pages
-	dlRequest.setValue("pt", docBean.getNumPages());
-	// store objects for jsp:include
-	pageContext.setAttribute("docBean", docBean, PageContext.REQUEST_SCOPE);
-
-%><html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Digital Document Library NG</title>
-	
-	<link rel="stylesheet" type="text/css" href="diginew.css" />
-	
-<!-- <script type="text/javascript" src="debug.js"></script> -->
-
-	<script type="text/javascript" src="baselib.js"></script>
-	
-	<script type="text/javascript" src="dllib.js"></script>
-
-	<script language="JavaScript">
-
-	var jspVersion = "diginew.jsp 1.023";
-	var cookie = new Cookie();
-	// alert(strObject(cookie));
-
-	var isOptionDivVisible = cookie.getbool("isOptionDivVisible");
-	var isBirdDivVisible = cookie.getbool("isBirdDivVisible");
-	var isAboutDivVisible = false;
-	var isSizeMenuVisible = false;
-    var isScaleMenuVisible = false;
-	var isOriginalSize = false;
-	var isPixelByPixel = false;
-	var dlTarget = window.name;
-	var baseUrl = '<%= dlRequest.getAsString("base.url") %>';
-	var toolbarEnabledURL = window.location.href;
-	var waited = 0;
-
-	function toggleOptionDiv() {
-		isOptionDivVisible = !isOptionDivVisible;
-		cookie.addbool("isOptionDivVisible", isOptionDivVisible);
-		showOptions(isOptionDivVisible);
-		}
-
-	function toggleBirdDiv() {
-		isBirdDivVisible = !isBirdDivVisible;
-		cookie.addbool("isBirdDivVisible", isBirdDivVisible);
-		showBirdDiv(isBirdDivVisible);
-		}
-
-	function toggleAboutDiv() {
-		isAboutDivVisible = !isAboutDivVisible;
-		showAboutDiv(isAboutDivVisible);
-		}
-
-	function toggleSizeMenu() {
-		isSizeMenuVisible = !isSizeMenuVisible;
-		showMenu("size-menu", "size", isSizeMenuVisible);
-		}
-
-    function toggleScaleMenu() {
-        isScaleMenuVisible = !isScaleMenuVisible;
-        showMenu("scale-menu", "scale", isScaleMenuVisible);
-        }
-
-	function setOnImage(id, src, value) {
-	// replace img src and display "on" status
-		var elem = getElement(id);
-		elem.src = src;
-		if (value)
-			elem.title += ": " + value;
-		else
-			elem.title += ": on";
-		}
-
-	// change icons if image functions are on
-	function reflectImageStatus() {
-		if (hasFlag("hmir")) setOnImage("hmir", "mirror-horizontal-on.png");
-		if (hasFlag("vmir")) setOnImage("vmir", "mirror-vertical-on.png");
-		if (hasParameter("brgt"))
-			setOnImage("brgt", "brightness-on.png", getParameter("brgt"));
-		if (hasParameter("cont"))
-			setOnImage("cont", "contrast-on.png", getParameter("cont"));
-		if (hasParameter("rot"))
-			setOnImage("rot", "rotate-on.png", getParameter("rot"));
-		if (hasParameter("rgb"))
-			setOnImage("rgb", "rgb-on.png", getParameter("rgb"));
-		}
-    
-
-	// initialize digilib; called by body.onload
-	function onBodyLoad() {
-		document.id = 'digilib';
-        dl.onLoad();
-        dl.showOptions(isOptionDivVisible);
-        reflectImageStatus(); // adjust icons
-	}
-
-	function onBodyUnload() {
-		// alert(strObject(cookie));
-		cookie.store();
-		}
-
-	</script>
-</head>
-
-<body onload="onBodyLoad();" onunload="onBodyUnload();">
- <!-- slot for the scaled image -->
- 
- <div id="bg"></div>
- 
- <div id="scaler">
-	<img id="pic"></img>
- </div>
-
- <!-- sensitive overlay for zoom area etc -->
- <div id="overlay"></div>
- <div id="bird-overlay"></div>
- 
- <!-- the zoom area selection rectangle -->
- <div id="zoom"></div>
- 
- <!-- the bird's eye overview image -->
- <img id="bird-image"></img>
-
- <!-- the bird's eye select area -->
- <div id="bird-area"></div>
-
- <!-- the arrows -->
- <a class="arrow" id="up"    href="javascript:moveBy(0, -0.5)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
- <a class="arrow" id="down"  href="javascript:moveBy(0, 0.5)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
- <a class="arrow" id="left"  href="javascript:moveBy(-0.5, 0)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
- <a class="arrow" id="right" href="javascript:moveBy(0.5, 0)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
-
- <!-- the about window -->
- <div id="about" class="about" onclick="toggleAboutDiv()">
- 	<p>Digilib Graphic Viewer</p>
- 	<a href="http://digilib.berlios.de" target="_blank" >
- 		<img class="logo" src="../img/digilib-logo-text1.png" title="digilib"></img>
-	</a>
-	<p id="digilib-version"></p>
-	<p id="jsp-version"></p>
-	<p id="baselib-version"></p>
-	<p id="dllib-version"></p>
- </div>
-
- <!-- the calibration div -->
- <div id="calibration">
- 	<div>
- 	<p class="cm">measure the length of this scale on your screen</p>
-	</div>
- </div>
-
- <!-- the size menu -->
- <div id="size-menu" class="popup-menu">
-	<p><a href="javascript:setSize(1)">1 x</a></p>
-	<p><a href="javascript:setSize(1.41)">1.41 x</a></p>
-	<p><a href="javascript:setSize(2)">2 x</a></p>
-	<p><a href="javascript:setSize(3)">3 x</a></p>
-	<div id="sizes-bar">
-		<div id="sizes-slider"></div>
-	</div>
-	<p id="sizes-value"></p>
- </div>
-
-<!-- the scale menu -->
- <div id="scale-menu" class="popup-menu">
-  <p><a href="javascript:setScale('fit')">fit to screen</a></p>
-  <p><a href="javascript:setScale('pixel')">pixel by pixel</a></p>
-  <p><a href="javascript:setScale('original')">original size</a></p>
- </div>
-
- <!-- the buttons -->
- <div id="buttons">
-	<div class="separator">
-	</div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:getRefWin()"
-			>
-
-			<img
-				class="png"
-				id="reference"
-				title="get a reference URL"
-				src="reference.png"
-			>
-		</a> 
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:dl.zoomBy(1.4)"
-			>
-
-			<img
-				class="png"
-				id="zoom-in"
-				title="zoom in"
-				src="zoom-in.png"
-			>
-	</a> 
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:zoomBy(0.7)"
-			>
-
-			<img
-				class="png"
-				id="zoom-out"
-				title="zoom out"
-				src="zoom-out.png"
-			>
-	</a> 
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:zoomArea()"
-			>
-
-			<img
-				class="png"
-				id="zoom-area"
-				title="zoom area"
-				src="zoom-area.png"
-			>
-		</a> 
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:zoomFullpage()"
-			>
-
-			<img
-				class="png"
-				id="zoom-full"
-				title="view the whole image"
-				src="zoom-full.png"
-			>
-	</a> 
-	</div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:zoomFullpage('width')"
-			>
-
-			<img
-				class="png"
-				id="page-width"
-				title="page width"
-				src="pagewidth.png"
-			>
-		</a> 
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:gotoPage('-1')"
-			>
-
-			<img
-				class="png"
-				id="back"
-				title="goto previous image"
-				src="back.png"
-			>
-	</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:gotoPage('+1')"
-			>
-
-			<img
-				class="png"
-				id="fwd"
-				title="goto next image"
-				src="fwd.png"
-			>
-	</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:gotoPageWin()"
-			>
-
-			<img
-				class="png"
-				id="page"
-				title="specify image"
-				src="page.png"
-			>
-	</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:toggleBirdDiv()"
-			>
-
-			<img
-				class="png"
-				id="bird"
-				title="show bird's eye view"
-				src="birds-eye.png"
-			>
-		</a>
-	</div>
-	
-	<div class="separator">
-	</div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:toggleAboutDiv()"
-			>
-
-			<img
-				class="png"
-				id="help"
-				title="about Digilib"
-				src="help.png"
-			>
-		</a>
-	</div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:resetImage()"
-			>
-
-			<img
-				class="png"
-				id="help"
-				title="reset image"
-				src="reset.png"
-			>
-		</a>
-	</div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:toggleOptionDiv()"
-			>
-
-			<img
-				class="png"
-				id="options"
-				title="more options"
-				src="options.png"
-			>
-		</a>
-	</div>
-
-	<div class="separator">
-	</div>
-</div>
-
-<!-- options div -->
-
-<div id="dloptions">
-	<div class="separator">
-	</div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:setMark();"
-			>
-
-			<img
-				class="png"
-				id="mark"
-				title="set a mark"
-				src="mark.png"
-			>
-		</a> 
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:removeMark()"
-			>
-
-			<img
-				class="png"
-				id="delmark"
-				title="delete the last mark"
-				src="delmark.png"
-				>
-		</a> 
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:mirror('h')"
-			>
-
-			<img
-				class="png"
-				id="hmir"
-				title="mirror horizontally"
-				src="mirror-horizontal.png"
-			>
-		</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:mirror('v')"
-			>
-
-			<img
-				class="png"
-				id="vmir"
-				title="mirror vertically"
-				src="mirror-vertical.png"
-			>
-		</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:setParamWin('rot', 'Rotate (0..360) clockwise')"
-			>
-
-			<img
-				class="png"
-				id="rot"
-				title="rotate image"
-				src="rotate.png"
-			>
-		</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:setParamWin('brgt', 'Brightness (-255..255)')"
-			>
-
-			<img
-				class="png"
-				id="brgt"
-				title="set brightness"
-				src="brightness.png"
-			>
-		</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:setParamWin('cont', 'Contrast (0..8)')"
-			>
-
-			<img
-				class="png"
-				id="cont"
-				title="set contrast"
-				src="contrast.png"
-			>
-		</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:setParamWin('rgb', '...')"
-			>
-
-			<img
-				class="png"
-				id="rgb"
-				title="set rgb values"
-				src="rgb.png"
-			>
-		</a>
-	</div>
-	
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:setQualityWin('Quality (0..2)')"
-			>
-
-			<img
-				class="png"
-				id="quality"
-				title="set image quality"
-				src="quality.png"
-			>
-		</a>
-	</div>
-	
-  <div class="button">
-    <a
-      class="icon"
-      href="javascript:toggleSizeMenu()"
-      >
-
-      <img
-        class="png"
-        id="size"
-        title="set page size"
-        src="size.png"
-      >
-    </a>
-  </div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:calibrate('x')"
-			>
-
-			<img
-				class="png"
-				id="calibration-x"
-				title="calibrate screen x-ratio"
-				src="calibration-x.png"
-			>
-		</a>
-	</div>
-  
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:toggleScaleMenu()"
-			>
-
-			<img
-				class="png"
-				id="scale"
-				title="change image scale"
-				src="original-size.png"
-			>
-		</a>
-	</div>
-
-	<div class="separator">
-	</div>
-
-	<div class="button">
-		<a
-			class="icon"
-			href="javascript:toggleOptionDiv()"
-			>
-
-			<img
-				class="png"
-				id="options-1"
-				title="hide options"
-				src="options.png"
-			>
-		</a>
-	</div>
-
-	<div class="separator">
-	</div>
-
-</div>
-
-<div class="debug" id="debug"><p class="debug">Debug</p></div>
-
-</body>
-
-</html>
--- a/client/digitallibrary/greyskin/dlMenu.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-body { margin: 3px; background-color: #f0f0f0 }
-.menu {position:absolute; visibility:hidden}
-img { border: none }
-
-.item1 {position:absolute; left:33; width:50; height:14; clip:rect(0,50,14,0); visibility:hidden}
-.item2 {position:absolute; left:43; width:40; height:14; clip:rect(0,40,14,0); visibility:hidden}
-.item3 {position:absolute; left:3; width:80; height:14; clip:rect(0,80,14,0); visibility:hidden}
-.logo { margin-left: 5px; margin-top: 10px; }
-
-.text {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none}
-</style>
-<script language="JavaScript" src="../oldskin/buttons/menu.js"></script>
-
-<script language="JavaScript">
-// because on a netscape 4.xx bug (messing up with layers on resize) we cache the window
-// resize event and redisplay the navigation frame
-if (document.layers && !document.getElementById) {
-    window.onresize = function() {parent.rightFrame.location.reload();}
-}
-
-/**
- * overriding 'page' in navigation.js
- */
-function page(page, details) {
-
-    var pn = parseInt(parent.mainFrame.getParameter("pn"));
-    var pt = parseInt(parent.mainFrame.getParameter("pt"));
-
-    if ( details == null ) {
-	details = 1;
-    }
-  
-    if ( page && page.indexOf('-') == 0 ) {
-	if ( pn > 1 ) {
-	    page = Math.max(pn - parseInt(page.slice(1)), 1);
-	    parent.mainFrame.setParameter("pn", page);
-	    display(details);
-	} else {
-	    alert("You are already on the first page!");
-	}
-
-    } else if ( page && page.indexOf('+') == 0 ) {
-	if ( pn < pt ) {
-	    page = Math.min(pn + parseInt(page.slice(1)), pt);
-	    parent.mainFrame.setParameter("pn", page);
-	    display(details);
-	} else {
-	    alert("You are already on the last page!");
-	}
-    } else if ( page && page == parseInt(page) ) {
-	if ( (page > 0) && (page <= pt) ) {
-	    parent.mainFrame.setParameter("pn", page);
-	    display(details);
-	} else {
-	    alert ("Illegal page number (should be 1 - " + pt + ")!");
-	}
-    }
-}
-
-/*
- * new display function to refresh the pagesTotal frame
- */
-
-function display(detail) {
-    parent.pageFrame.show();
-    parent.mainFrame.display(detail);
-}
-
-
-function askPage() {
-    do {
-	p = prompt("Goto Page:", 1);
-    } while ((p != null) && (p < 1));
-    page(p);
-}
-
-function showRef(select) {
-    var hyperlinkRef = parent.mainFrame.baseUrl + "/digilib.jsp?";
-    hyperlinkRef += parent.mainFrame.getAllParameters();
-    if ( select == 0 ) {
-	prompt("Link for LaTeX-documents", "\\href{" + hyperlinkRef + "}{TEXT}");
-    } else if ( select == 1 ) {
-	prompt("Link for HTML-documents", hyperlinkRef);
-    }
-}
-
-function setSize(size) {
-    parent.mainFrame.setParameter('ws', size);
-    display();
-}
-
-function digicat() {
-    var fn = parent.mainFrame.getParameter("fn");
-    var pn = parent.mainFrame.getParameter("pn");
-    var url = parent.mainFrame.baseUrl + "/digicat.jsp?fn=" + fn + "&pn=" + pn;
-    win = window.open(url, "digicat");
-    win.focus();
-}
-
-// boolean variable to either show or not show the additional help
-// change in the menuitem its original mark
-var showHelp = false;
-
-// variable to tell if while changing to another page it should keep the area
-// change in the menuitem its original mark (1 = false, 2 = true)
-var keepArea = 2;
-
-
-// variable that store the texts for contexthelp
-var helpText = new Array();
-
-helpText[0]  = "'back'-button|Click on this button to load the previous image (usually the next page from a manuscript).";
-helpText[1]  = "'next'-button|Click on this button to load the next image (usually the next page from a manuscript).";
-helpText[2]  = "'page'-button|After clicking 'page' you will be prompted for a specific page you want to see.<br>Note that the page number refers to the same serie you are in now.";
-helpText[3]  = "'digicat'-button|Click here to open a new window containing thumbnails of the current series pages to navigate.";
-helpText[4]  = "'mark'-button|You can set marks into the picture. After hitting 'mark' you have to click on the desired picures location, a numbered mark appears.<br>Check out 'reference' to make these marks (up to 8) visible for others.";
-helpText[5]  = "'reference'-button|Choose LaTeX or HTML mode to get a link for the actual (zoomed) picture with all set marks.<br>This link can easily be included in a TeX- or HTML-formatted document/page.";
-helpText[6]  = "'zoom area'-button|With 'zoom area' you can zoom into any rectangular field for the current picture.<br>After clicking on the button click on the image to set any corner (ex. topleft), release the mousebutton and move the mouse until you have the desired size, then click again.";
-helpText[7]  = "'zoom in'-button|Clicking on 'zoom in' zooms in around the current center.";
-helpText[8]  = "'zoom out'-button|Clicking on 'zoom out' zooms out around the current center.";
-helpText[9]  = "'full page'-button|To gain the original unzoomed picture, click on 'full page'.<br>Note that any set marks are still saved at their positions.";
-helpText[10] = "'size'-button|By clicking on one of the menu entries you can select the size of the currently displayed picture in relation to your browser window.<br>Note: a scale factor of '1.0' means that the picture fits right into the working area, while '2.0' means that it will be twice as high and wide.";
-helpText[11] = "'?'-button|In its menu you are able change options like the visibility of this contextsensitive help, with 'Keep area' digilib keeps its current zoom area when changing to another page.";
-
-</script>
-</head>
-
-<body onload="preloadImages()" onunload="closeContextHelp()">
-
-<a href="javascript:page('-1', keepArea)" onmouseover="highlightButton(1)" onmouseout="awayButton(0)"><img src="left.png" title="next image"></a><br>
-<a href="javascript:page('+1', keepArea)" onmouseover="overButton(1)" onmouseout="awayButton(1)"><img src="right.png" title="previous image"></a><br>
-<a href="javascript:askPage()" onmouseover="overButton(2)" onmouseout="awayButton(2)"><img src="page.png" title="select image by index"></a><br>
-<a href="javascript:digicat()" onmouseover="overButton(3)" onmouseout="awayButton(3)"><img src="cat.png" title="image catalogue"></a><br><br>
-<a href="javascript:parent.mainFrame.setMark(false);" onmouseover="overButton(4)" onmouseout="awayButton(4)"><img src="mark.png" title="set a mark"></a><br>
-<a href="javascript:hideMenu(); showMenu(1)" onmouseover="overButton(5)" onmouseout="awayButton(5)"><img src="reference.png" title="get an URL to this view"></a><br><br>
-<a href="javascript:parent.mainFrame.zoomArea()" onmouseover="overButton(6)" onmouseout="awayButton(6)"><img src="zoom-area.png" title="zoom to selected area"></a><br>
-<a href="javascript:parent.mainFrame.zoomBy(1.4142)" onmouseover="overButton(7)" onmouseout="awayButton(7)"><img src="zoom-in.png" title="zoom in"></a><br>
-<a href="javascript:parent.mainFrame.zoomBy(0.7071)" onmouseover="overButton(8)" onmouseout="awayButton(8)"><img src="zoom-out.png" title="zoom out"></a><br>
-<a href="javascript:parent.mainFrame.zoomFullpage()" onmouseover="overButton(9)" onmouseout="awayButton(9)"><img src="zoom-full.png" title="full image"></a><br><br>
-<a href="javascript:hideMenu(); showMenu(2)" onmouseover="overButton(10)" onmouseout="awayButton(10)"><img src="size.png" title="set image size"></a><br><br>
-<a href="javascript:hideMenu(); showMenu(3)" onmouseover="overButton(11)" onmouseout="awayButton(11)"><img src="buttons/questionmark0.gif" ></a><br><br>
-
-<div id="menu1" class="menu" style="top:201; left:31; width:54; height:33; clip:rect(0,54,33,0)"></div>
- <div id="menu11" class="item1" style="top:203"><center><a href="#" class="text" onClick="hideMenu(); showRef(0); return false;" onmouseover="overItem(11)" onmouseout="awayItem(11)">LaTeX</a></center></div>
- <div id="menu12" class="item1" style="top:218"><center><a href="#" class="text" onClick="hideMenu(); showRef(1); return false;" onmouseover="overItem(12)" onmouseout="awayItem(12)">HTML</a></center></div>
-
-<div id="menu2" class="menu" style="top:379; left:41; width:44; height:93; clip:rect(0,44,93,0)"></div>
- <div id="menu21" class="item2" style="top:381"><center><a href="#" class="text" onClick="hideMenu(); setSize(0.7); return false;" onmouseover="overItem(21)" onmouseout="awayItem(21)">0.7</a></center></div>
- <div id="menu22" class="item2" style="top:396"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.0); return false;" onmouseover="overItem(22)" onmouseout="awayItem(22)">1.0</a></center></div>
- <div id="menu23" class="item2" style="top:411"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.5); return false;" onmouseover="overItem(23)" onmouseout="awayItem(23)">1.5</a></center></div>
- <div id="menu24" class="item2" style="top:426"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.0); return false;" onmouseover="overItem(24)" onmouseout="awayItem(24)">2.0</a></center></div>
- <div id="menu25" class="item2" style="top:441"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.5); return false;" onmouseover="overItem(25)" onmouseout="awayItem(25)">2.5</a></center></div>
- <div id="menu26" class="item2" style="top:456"><center><a href="#" class="text" onClick="hideMenu(); setSize(3.0); return false;" onmouseover="overItem(26)" onmouseout="awayItem(26)">3.0</a></center></div>
-
-<div id="menu3" class="menu" style="top:430; left:1; width:84; height:33; clip:rect(0,84,33,0)"></div>
- <div id="menu31" class="item3" style="top:432"><center><a href="#" class="text" onclick="changeMark(31); hideMenu(); changeHelp(); return false;" onmouseover="overItem(31)" onmouseout="awayItem(31)"><img id="mark31" src="buttons/nomark.gif" >Contexthelp</a></center></div>
- <div id="menu32" class="item3" style="top:447"><center><a href="#" class="text" onclick="changeMark(32); keepArea = (keepArea == 1) ? 2 : 1; return false;" onmouseover="overItem(32)" onmouseout="awayItem(32)"><img id="mark32" src="buttons/mark.gif" >Keep&nbsp;area</a></center></div>
- <div id="logo" class="logo">
- 	<a href="http://digilib.berlios.de" target="_blank" >
- 		<img  src="../img/digilib-logo-text1.png" title="digilib"></img>
-	</a>
- </div>
-
-<script language="Javascript">
-// initial background color of the menues (has to be done like this, 
-// otherwise menues in ns4 you will have wrong dimensions)
-changeBc("menu1", "#666666");
-changeBc("menu2", "#666666");
-changeBc("menu3", "#666666");
-</script>
-</body>
-</html>
--- a/client/digitallibrary/greyskin/dllib.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1045 +0,0 @@
-/* Copyright (C) 2003,2004 IT-Group MPIWG, WTWG Uni Bern and others
- 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
- 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
- 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- 
-Authors:
-  Christian Luginbuehl, 01.05.2003 (first version)
-  DW 24.03.2004 (Changed for digiLib in Zope)
-  Robert Casties, 8.11.2005
-  Martin Raspe <hertzhaft@biblhertz.it>, 12.12.2005
-  Robert Casties, 4.9.2009
-  
-  ! Requires baselib.js !
-*/
-digilibVersion = "Digilib NG";
-dllibVersion = "2.042";
-
-function identify() {
-        // used for identifying a digilib instance
-        // Relato uses that function - lugi
-        return digilibVersion;
-}
-
-function createMarkDiv(index) {
-    var div = document.createElement("div");
-    div.className = "mark";
-    div.id = "mark" + index;
-    div.innerHTML = index + 1;
-    document.body.appendChild(div);
-    return div;
-}
-
-function bestPicSize(elem, inset) {
-    // returns a Size with the best image size for the given element
-    if (! defined(inset)) {
-        inset = 0; 
-        // original value was 25 
-        // digilib seems to use the available space better without inset
-        }
-    var ws = getWinSize();
-    var es = getElementPosition(elem);
-    if (es) {
-        ws.width = ws.width - es.x - inset;
-        ws.height = ws.height - es.y - inset;
-    }
-    return ws;
-}
-
-
-/****************************************************
- * digilib specific classes (must be defined first)
- ****************************************************/
- 
-/*
- * Marks class
- */ 
-function Marks() {
-	return this;
-}
-// Marks inherits from Array
-Marks.prototype = new Array();
-Marks.prototype.parse = function(query) {
-	this.length = 0;
-    if (query.indexOf(";") >= 0) {
-        var pa = query.split(";");    // old format with ";"
-    } else {
-        var pa = query.split(",");    // new format
-    }
-    for (var i = 0; i < pa.length ; i++) {
-        var pos = pa[i].split("/");
-        if (pos.length > 1) this.push(new Position(pos[0], pos[1]));
-    }
-}
-Marks.prototype.getAll = function() {
-    var ma = new Array();
-    for (var i = 0; i < this.length; i++) {
-        ma.push(cropFloat(this[i].x) + "/" + cropFloat(this[i].y));
-   	}
-    return ma.join(",");
-}
-Marks.prototype.addEvent = function(evt, digilib) {
-    // add a mark from a screen event
-    if (!digilib) digilib = dl;
-    var pos = digilib.trafo.invtransform(evtPosition(evt));
-    this.push(pos);
-}
-
-/*
- * DLParameters -- digilib parameter class
- */
-function DLParameters() {
-	// flags for parameter sets
-	this.PARAM_FILE = 1;
-	this.PARAM_MODE = 2;
-	this.PARAM_DIM = 4;
-	this.PARAM_IMAGE = 8;
-	this.PARAM_DPI = 16;
-	this.PARAM_SIZE = 32;
-	this.PARAM_MARK = 64;
-	this.PARAM_PAGES = 128;
-	this.PARAM_CLIENT = 256;
-	/* request parameters */
-	with (this) {
-	// file
-	    define('fn', '',    PARAM_FILE);
-	    define('pn', '1',   PARAM_FILE);
-	// mode
-	    define('mo', '',    PARAM_MODE);
-	// relative dimensions of zoomed image
-	    define('wx', '0.0', PARAM_DIM);
-	    define('wy', '0.0', PARAM_DIM);
-	    define('ww', '1.0', PARAM_DIM);
-	    define('wh', '1.0', PARAM_DIM);
-	// image manipulation
-	    define('brgt', '0.0', PARAM_IMAGE);
-	    define('cont', '0.0', PARAM_IMAGE);
-	    define('rot',  '0.0', PARAM_IMAGE);
-	    define('rgba', '',    PARAM_IMAGE);
-	    define('rgbm', '',    PARAM_IMAGE);
-	// resolution
-	    define('ddpi',  '', PARAM_DPI);
-	    define('ddpix', '', PARAM_DPI);
-	    define('ddpiy', '', PARAM_DPI);
-	// marks
-	    define('mk', '', PARAM_MARK);
-	// pages total
-	    define('pt', '0', PARAM_PAGES);
-	// size
-	    define('ws', '1.0', PARAM_SIZE);
-	    // client side options
-	    define('clop', '', PARAM_CLIENT);
-	}
-	return this;
-}
-DLParameters.prototype = new Parameters();
-// move the inherited getAll because we need it later
-DLParameters.prototype._getAll = Parameters.prototype.getAll;
-DLParameters.prototype.getAll = function(paDetail, moDetail, digilib) {
-	if (!digilib) digilib = dl;
-	// get Flags and Marks first
-    var mo = digilib.flags.getAll(moDetail);
-    this.set("mo", mo);
-    var clop = digilib.opts.getAll();
-    this.set("clop", clop);
-    var mk = digilib.marks.getAll();
-    this.set("mk", mk);
-    var ret = this._getAll(paDetail);
-	return ret;
-}
-
-/*
- * DLModes -- digilib flags class
- */
-function DLFlags() {
-    // flags for mode sets
-    this.MODE_QUAL = 1;
-    this.MODE_SIZE = 2;
-    this.MODE_MIR = 4;
-    this.MODE_OTHER = 128;
-    this.MODE_ALL = 255;
-    /* mode flags */
-    with (this) {
-        define('q0', MODE_QUAL);
-        define('q1', MODE_QUAL);
-        define('q2', MODE_QUAL);
-        define('fit',   MODE_SIZE);
-        define('clip',  MODE_SIZE);
-        define('osize', MODE_SIZE);
-        define('vmir', MODE_MIR);
-        define('hmir', MODE_MIR);
-    }
-    return this;
-}
-// inherits from Flags
-DLFlags.prototype = new Flags();
-
-
-/*
- * Digilib -- digilib base class
- */
-function Digilib() {
-    if (!baseLibVersion) alert("ERROR: baselib.js not loaded!");
-    /* constants */
-    this.MAX_AREA = new Rectangle(0.0, 0.0, 1.0, 1.0);
-    // default inset (for scalerImg relativ to scalerDiv 
-    this.INSET = 40; // because of scrollbars of main window and scaler [Firefox bug?]
-    // mouse drag area that counts as one click 
-    this.MIN_AREA_SIZE = 3 * 3 + 1;
-    // standard zoom factor
-    this.ZOOMFACTOR = Math.sqrt(2);
-    // bird's eye view dimensions
-    this.BIRD_MAXX = 200;
-    this.BIRD_MAXY = 200;
-    // witdh of arrow bars
-    this.ARROW_WIDTH = 32;
-    // width of calibration bar
-    this.CALIBRATION_WIDTH = 64;
-    /* variables */
-    this.fitOnlyWidth = false;
-    this.fitOnlyHeight = false;
-    this.trafo = null;
-    // page elements
-    this.scalerDiv = null;
-    this.scalerImg = null;
-    this.buttons1Div = null;
-    this.buttons2Div = null;
-    /* parse parameters */
-    this.params = new DLParameters();
-    // put the query parameters (sans "?") in the parameters array
-    this.params.parse(location.search.slice(1));
-    // treat special parameters
-    this.area = this.parseArea();
-    this.marks = new Marks();
-    this.marks.parse(this.params.get("mk"));
-    this.flags = new DLFlags();
-    this.flags.parse(this.params.get("mo"));
-    this.opts = new Flags();
-    this.opts.parse(this.params.get("clop"));
-    return this;
-}
-Digilib.prototype.setDLParam = function(e, s, relative) {
-    // sets parameter based on HTML event
-    var nam;
-    var val;
-    if (s.type && (s.type == "select-one")) {
-        nam = s.name;
-        val = s.options[s.selectedIndex].value;
-    } else if (s.name && s.value) {
-        nam = s.name;
-        val = s.value;
-    }
-    if (nam && val) {
-        dl.params.set(nam, val, relative);
-        display();
-    } else {
-        alert("ERROR: unable to process event!");
-    }
-    return true;
-}
-Digilib.prototype.parseArea = function() {
-    // returns area Rectangle from current parameters
-    return new Rectangle(
-        this.params.get("wx"),
-        this.params.get("wy"),
-        this.params.get("ww"),
-        this.params.get("wh"));
-}
-Digilib.prototype.setParamFromArea = function(rect) {
-    // sets digilib wx etc. from rect
-    this.params.set("wx", cropFloat(rect.x));
-    this.params.set("wy", cropFloat(rect.y));
-    this.params.set("ww", cropFloat(rect.width));
-    this.params.set("wh", cropFloat(rect.height));
-    return true;
-}
-
-Digilib.prototype.parseTrafo = function(elem) {
-    // returns Transform from current dlArea and picsize
-    var picsize = getElementRect(elem);
-    var trafo = new Transform();
-    // subtract area offset and size
-    trafo.concat(trafo.getTranslation(new Position(-this.area.x, -this.area.y)));
-    trafo.concat(trafo.getScale(new Size(1/this.area.width, 1/this.area.height)));
-    // scale to screen size
-    trafo.concat(trafo.getScale(picsize));
-    trafo.concat(trafo.getTranslation(picsize));
-    // FIX ME: Robert, kannst Du mal nachsehen, ob das folgende tut, was es soll?
-    // oder gibt es dafuer neuen Code? -- ROC: Bisher funktioniert es nicht!
-    // rotate
-    //var rot = getRotation(- dl.params.get("rot"), new Position(0.5*picsize.width, 0.5*picsize.height));
-    //trafo.concat(rot);
-    // mirror
-    //if (hasFlag("hmir")) trafo.m00 = - trafo.m00; // ??
-    //if (hasFlag("vmir")) trafo.m11 = - trafo.m11; // ??
-    return trafo;
-}
-
-Digilib.prototype.onLoad = function() {
-    // initialize digilib; called by body.onload
-    this.scalerDiv = getElement("scaler", true);
-    this.scalerImg = getElement("pic", true);
-    this.buttons1Div = getElement("buttons", true);
-    this.buttons2Div = getElement("options", true);
-    /*
-     * if (this.scalerImg == null && this.scalerDiv) { // in N4 pic is in the
-     * scaler layer this.scalerImg = this.scalerDiv.document.images[0]; }
-     */
-    if ((!this.scalerImg)||(!this.scalerDiv)) {
-        alert("Sorry, digilib doesn't work here!");
-        return false;
-    }
-    // fix fixed menus
-    var ms1 = getElementSize(this.buttons1Div);
-    var ms2 = getElementSize(this.buttons2Div);
-    var maxh = (ms1.height > ms2.height) ? ms1.height : ms2.height;
-    var wins = getWinSize();
-    if ((wins.height <= maxh) || (browserType.isIE && (browserType.versIE < 7))) {
-        // unlock fixed menus to absolute if window is too small or IE
-        this.buttons1Div.style.position = "absolute";
-        this.buttons2Div.style.position = "absolute";
-    }
-    this.setScalerImage();	// setzt auch onImgLoad
-    this.setBirdImage();	// laedt das Bird's Eye Bild
-}
-
-Digilib.prototype.setScalerImage = function() {
-    // set the scaler image source (needs the browser size)
-    var picsize = bestPicSize(this.scalerDiv);
-    var menusize = getElementSize(this.buttons1Div);
-    // subtract menu width
-    picsize.width -= menusize.width;
-    picsize.height -= this.INSET;
-    // compose Scaler URL
-    var src = "../servlet/Scaler?" 
-        + this.params.getAll(this.params.PARAM_ALL & ~(this.params.PARAM_MARK | this.params.PARAM_PAGES));
-    if (this.opts.get('fitwidth')) {
-        src += "&dw=" + picsize.width;
-    } else if (this.opts.get('fitheight')) {
-        src += "&dh=" + picsize.height;
-    } else {
-        src += "&dw=" + picsize.width + "&dh=" + picsize.height;
-    }
-    // debug(src);
-    this.scalerImg.onload = onImgLoad;
-    this.scalerImg.src = src;
-
-    var digilib = this;
-    // this is a local callback function that can use the current scope
-
-    function onImgLoad() {
-        if (! digilib)
-            return;
-        // make sure the image is loaded so we know its size
-        /* this test seems to have problems sometimes :-(
-	    if (defined(digilib.scalerImg.complete) && !digilib.scalerImg.complete) {
-			alert("ERROR: the image seems not to be complete in onImgLoad!?");
-		} */
-        digilib.trafo = digilib.parseTrafo(digilib.scalerImg);
-        // display marks
-        digilib.renderMarks();
-        digilib.showBirdDiv(isBirdDivVisible);
-        digilib.showArrows();		// show arrow overlays for zoom navigation
-        //digilib.moveCenter(true);	// click to move point to center
-        // new Slider("sizes", 1, 5, 2);
-        
-        //Drag Image (8.9.2009)
-        if (!digilib.isFullArea())
-            registerEvent("mousedown", digilib.scalerDiv, dragImage);
-
-        focus();
-    }
-}
-
-Digilib.prototype.renderMarks = function() {
-    // make sure the image is loaded so we know its size
-    if (!this.trafo) {
-        alert("ERROR: trafo missing, cannot render marks!");
-        return;
-    }
-    // debugProps(dlArea, "dlArea");
-    for (var i = 0; i < this.marks.length; i++) {
-        var div = getElement("mark" + i, true) || createMarkDiv(i);
-        var mark = this.marks[i];
-        // debugProps(mark, "mark");
-        if (this.area.containsPosition(mark)) {
-            var mpos = this.trafo.transform(mark);
-            // debugProps(mark, "mpos");
-            // better not hide the marked spot (MR)
-            // suboptimal to place -5 pixels and not half size of mark-image
-            // mpos.x = mpos.x -5;
-            // mpos.y = mpos.y -5;
-            moveElement(div, mpos);
-            showElement(div, true);
-        } else {
-            // hide the other marks
-            showElement(div, false);
-        }
-    }
-}
-
-Digilib.prototype.display = function(detail, moDetail) {
-    // redisplay the page
-    var queryString = this.params.getAll(detail, moDetail);
-	location.href
-        = location.protocol + "//"
-    	    + location.host
-    	    + location.pathname
-        + "?" + queryString;
-}
-
-/* **********************************************
- *     interactive digilib functions
- * ******************************************** */
-
-Digilib.prototype.setMark = function() {
-    // add a mark where clicked
-    window.focus();
-    this.moveCenter(false);
-    
-    // start event capturing
-    registerEvent("mousedown", this.scalerDiv, markEvent);
-
-    // our own reference to this for the local function
-    var digilib = this;
-	
-    function markEvent(evt) {
-    // event handler adding a new mark
-        unregisterEvent("mousedown", digilib.scalerDiv, markEvent);
-        digilib.marks.addEvent(evt);
-        digilib.display();
-        return stopEvent(evt);
-    }
-    
-}
-
-Digilib.prototype.removeMark = function() {
-    // remove the last mark
-    this.marks.pop();
-    this.display();
-}
-
-Digilib.prototype.resetImage = function() {
-    // reset the image to its original state
-    this.display(this.params.PARAM_FILE); // keep only fn/pn
-}
-
-Digilib.prototype.dragImage = function(evt) {
-    // drag the image and load a new detail on mouse up
-    // makes sense only when zoomed
-    if (this.isFullArea())
-        return;
-    if(evt.preventDefault) evt.preventDefault(); // no Firefox drag and drop
-	var digilib = this; // our own reference to this for the local function
-    var startPos = evtPosition(evt);
-    var pic = this.scalerImg;
-    var picRect = getElementRect(pic);
-     // fit the grey div to the scaler image
-    var div = getElement("bg");
-    var dx = 0;
-    var dy = 0;
-    moveElement(div, picRect);
-    // hide the scaler image, show it as background of div instead
-    showElement(pic, false); 
-    showElement(div, true);
-    div.style.backgroundImage = "url(" + pic.src + ")";
-    div.style.cursor = "move";
-    // start event capturing
-    registerEvent("mousemove", document, moveDragEvent);
-    registerEvent("mouseup", document, moveEndEvent);
-    window.focus();
-
-	function moveDragEvent(evt) {
-    // mousemove handler: drag
-        var pos = evtPosition(evt);
-        // don't use Firefox Drag and Drop feature 
-        if(evt.preventDefault) evt.preventDefault();
-        dx = pos.x - startPos.x;
-        dy = pos.y - startPos.y;
-        // move the background image to the new position
-        div.style.backgroundPosition = dx + "px " + dy + "px";
-        return stopEvent(evt);
-	    }
-
-	function moveEndEvent(evt) {
-    // mouseup handler: reload digilib
-        div.style.cursor = "default";
-        unregisterEvent("mousemove", document, moveDragEvent);
-        unregisterEvent("mouseup", document, moveEndEvent);
-        // calculate relative offset
-        var x = -dx / pic.width;
-        var y = -dy / pic.height;
-        stopEvent(evt);
-        if (dx == 0 && dy == 0)
-            return // no movement
-        // reload with scaler image showing the new ausschnitt
-        return digilib.moveBy(x, y);
-    }
-}
-
-Digilib.prototype.zoomArea = function() {
-    var pt1, pt2;
-    var zoomdiv = getElement("zoom");
-    var overlay = getElement("overlay");
-    // use overlay div to avoid <img> mousemove problems
-    var picRect = getElementRect(this.scalerImg);
-    // FIX ME: is there a way to query the border width from CSS info?
-    // rect.x -= 2; // account for overlay borders
-    // rect.y -= 2;
-    moveElement(overlay, picRect);
-    showElement(overlay, true);
-    // start event capturing
-    registerEvent("mousedown", overlay, zoomStart);
-    registerEvent("mousedown", this.scalerImg, zoomStart);
-    window.focus();
-
-    // our own reference to "this" for the local functions
-    var digilib = this;
-	
-    // mousedown handler: start moving
-    function zoomStart(evt) {
-        pt1 = evtPosition(evt);
-        unregisterEvent("mousedown", overlay, zoomStart);
-        unregisterEvent("mousedown", digilib.scalerImg, zoomStart);
-        // setup and show zoom div
-        moveElement(zoomdiv, Rectangle(pt1.x, pt1.y, 0, 0));
-        showElement(zoomdiv, true);
-        // register events
-        registerEvent("mousemove", document, zoomMove);
-        registerEvent("mouseup", document, zoomEnd);
-        return stopEvent(evt);
-    }
-    
-    // mouseup handler: end moving
-    function zoomEnd(evt) {
-        pt2 = evtPosition(evt);
-        // assume a click if the area is too small (up to 3 x 3 pixel)
-        var clickRect = new Rectangle(pt1, pt2);
-        clickRect.normalize();
-        if (clickRect.getArea() <= digilib.MIN_AREA_SIZE) {
-            return stopEvent(evt);
-        }
-        // hide zoom div
-        showElement(zoomdiv, false);
-        showElement(overlay, false);
-        // unregister events
-        unregisterEvent("mousemove", document, zoomMove);
-        unregisterEvent("mouseup", document, zoomEnd);
-        // clip and transform
-        clickRect.clipTo(picRect);
-        var area = digilib.trafo.invtransform(clickRect);
-        digilib.setParamFromArea(area);
-        // zoomed is always fit
-        digilib.params.set("ws", 1);
-        digilib.display();
-        return stopEvent(evt);
-    }
-    
-    // mouse move handler
-    function zoomMove(evt) {
-        pt2 = evtPosition(evt);
-        var rect = new Rectangle(pt1, pt2);
-        rect.normalize();
-        rect.clipTo(picRect);
-        // update zoom div
-        moveElement(zoomdiv, rect);
-        return stopEvent(evt);
-    	}
-}
-
-Digilib.prototype.zoomBy = function(factor) {
-    // zooms by the given factor
-    var newarea = this.area.copy();
-    newarea.width /= factor;
-    newarea.height /= factor;
-    newarea.x -= 0.5 * (newarea.width - this.area.width);
-    newarea.y -= 0.5 * (newarea.height - this.area.height);
-    newarea = this.MAX_AREA.fit(newarea);
-    this.setParamFromArea(newarea);
-    this.display();
-}
-
-
-Digilib.prototype.zoomFullpage = function(fit) {
-    // zooms out to show the whole image
-    this.params.set("wx", 0.0);
-    this.params.set("wy", 0.0);
-    this.params.set("ww", 1.0);
-    this.params.set("wh", 1.0);
-    if (fit == "width") {
-    		this.opts.set('fitwidth');
-    	} else if (fit == "height") {
-    		this.opts.set('fitheight');
-    	} else {
-    		this.opts.reset('fitwidth');
-    		this.opts.reset('fitheight');
-	}
-    this.display();
-}
-
-
-Digilib.prototype.moveCenter = function(on) {
-    // move visible area so that it's centered around the clicked point
-    if (this.isFullArea()) return; // nothing to do
-    // starting event capture
-    if (on) registerEvent("mousedown", this.scalerImg, moveCenterEvent);
-    else  unregisterEvent("mousedown", this.scalerImg, moveCenterEvent);
-    window.focus();
-    
-	// our own reference to this for the local function
-	var digilib = this;
-
-	function moveCenterEvent(evt) {
-	    // move to handler
-	    var pt = digilib.trafo.invtransform(evtPosition(evt));
-	    var newarea = digilib.area.copy();
-		newarea.setCenter(pt);
-	    newarea.stayInside(this.MAX_AREA);
-	    // newarea = dlMaxArea.fit(newarea);
-	    // debugProps(newarea, "newarea");
-	    // debugProps(dlArea, "dlArea");
-	    if (newarea.equals(digilib.area)) return; // keep event handler
-	    unregisterEvent("mousedown", digilib.scalerImg, moveCenterEvent);
-	    // set parameters
-	    digilib.setParamFromArea(newarea);
-		digilib.display();
-	}
-}
-
-Digilib.prototype.isFullArea = function(area) {
-    if (!area) area = this.area;
-    return (area.width == 1.0) && (area.height == 1.0);
-}
-
-Digilib.prototype.canMove = function(movx, movy) {
-    if (this.isFullArea()) return false;
-    var x2 = this.area.x + this.area.width;
-    var y2 = this.area.y + this.area.height;
-    // debugProps(dlArea);
-    return ((movx < 0) && (this.area.x > 0))
-    	|| ((movx > 0) && (x2 < 1.0))
-	|| ((movy < 0) && (this.area.y > 0))
-    	|| ((movy > 0) && (y2 < 1.0))
-}
-
-Digilib.prototype.moveBy = function(movx, movy) {
-    // move visible area by movx and movy (in units of ww, wh)
-    if (!this.canMove(movx, movy)) return; // nothing to do
-    var newarea = this.area.copy();
-    newarea.x += parseFloat(movx)*this.area.width;
-    newarea.y += parseFloat(movy)*this.area.height;
-    newarea = this.MAX_AREA.fit(newarea);
-    // set parameters
-    this.setParamFromArea(newarea);
-    this.display();
-}
-
-Digilib.prototype.getRef = function(baseUrl) {
-    // returns a reference to the current digilib set
-    if (!baseUrl) baseUrl 
-        = location.protocol
-        + "//" 
-        + location.host
-        + location.pathname;
-    var hyperlinkRef = baseUrl;
-    with (this.params) {
-    		// all without ddpi, pt
-    		var ps = getAll(PARAM_ALL & ~(PARAM_DPI | PARAM_PAGES | PARAM_CLIENT)); 
-    	}
-    if (ps.length > 0) hyperlinkRef += "?" + ps;
-    return hyperlinkRef;
-}
-
-Digilib.prototype.getRefWin = function(type, msg) {
-    // shows an alert with a reference to the current digilib set
-    if (! msg) msg = "URL reference to the current view";
-    prompt(msg, this.getRef());
-}
-
-Digilib.prototype.getQuality = function() {
-    // returns the current q setting
-    for (var i = 0; i < 3; i++) {
-        if (this.flags.get("q"+i)) return i;
-    }
-    return 1
-}
-
-Digilib.prototype.setQuality = function(qual) {
-    // set the image quality
-    if ((qual < 0)||(qual > 2)) return alert("Quality setting not supported");
-    for (var i = 0; i < 3; i++) this.flags.reset("q" + i);
-    this.flags.set("q" + qual);
-    this.display();
-}
-
-Digilib.prototype.setQualityWin = function(msg) {
-    // dialog for setting quality
-    if (! msg) msg = "Quality (0..2)";
-    var q = this.getQuality();
-    var newq = window.prompt(msg, q);
-    if (newq) this.setQuality(newq);
-}
-
-Digilib.prototype.mirror = function(dir) {
-    // mirror the image horizontally or vertically
-    if (dir == "h") {
-    		this.flags.toggle("hmir");
-    	} else {
-    		this.flags.toggle("vmir");
-	}
-    this.display();
-}
-
-Digilib.prototype.gotoPage = function(gopage, keep) {
-    // goto given page nr (+/-: relative)
-    var oldpn = parseInt(this.params.get("pn"));
-    // set with relative=true uses the sign
-    this.params.set("pn", gopage, true);
-    // now check the outcome
-    var pn = parseInt(this.params.get("pn"));
-    if (pn < 1) {
-        alert("No such page! (Page number too low)");
-        this.params.set("pn", oldpn);
-        return;
-    }
-    if (this.params.isSet("pt")) {
-        pt = parseInt(this.params.get("pt"))
-        if (pn > pt) {
-            alert("No such page! (Page number too high)");
-            this.params.set("pn", oldpn);
-            return;
-        }
-    }
-    if (keep) {
-        this.display(this.params.PARAM_ALL & ~this.params.PARAM_MARK); // all, no mark
-    } else {
-        this.display(this.params.PARAM_FILE | this.params.PARAM_MODE | this.params.PARAM_PAGES, this.params.MODE_QUAL | this.params.MODE_OTHER); // fn, pn, ws, mo + pt
-    }
-}
-
-Digilib.prototype.gotoPageWin = function() {
-    // dialog to ask for new page nr
-    var pn = this.params.get("pn");
-    var gopage = window.prompt("Go to page", pn);
-    if (gopage) this.gotoPage(gopage);
-}
-
-Digilib.prototype.setParamWin = function(param, text, relative) {
-    // dialog to ask for new parameter value
-    var val = this.params.get(param);
-    var newval = window.prompt(text, val);
-    if (newval) {
-        this.params.set(param, newval, relative);
-        this.display();
-    }
-}
-
-Digilib.prototype.showOptions = function(show) {
-    // show or hide option div
-    var elem = getElement("dloptions");
-    showElement(elem, show);
-    // FIX ME: get rid of the dotted line around the buttons when focused
-    }
-
-Digilib.prototype.showAboutDiv = function(show) {
-    // show or hide "about" div
-    var elem = getElement("about");
-    if (elem == null) {
-        if (show) alert("About Digilib - dialog missing in HTML code!"
-            + "\nDigilib Version: " + digilibVersion
-            + "\JSP Version: " + jspVersion
-            + "\ndlLib Version: " + dllibVersion
-            + "\nbaseLib Version: " + baseLibVersion);
-        return;
-        }
-    if (show) {
-        getElement("digilib-version").innerHTML = "Digilib Version: " + digilibVersion;
-        getElement("jsp-version").innerHTML = "JSP Version: " + jspVersion;
-        getElement("baselib-version").innerHTML = "baseLib Version: " + baseLibVersion;
-        getElement("dllib-version").innerHTML = "dlLib Version: " + dllibVersion;
-        var aboutRect = getElementRect(elem);
-        aboutRect.setCenter(getWinRect().getCenter());
-        moveElement(elem, aboutRect);
-        }
-    showElement(elem, show);
-    }
-    
-Digilib.prototype.setBirdImage = function() {
-    var img = getElement("bird-image");
-    var src = "../servlet/Scaler?" 
-        + this.params.getAll(this.params.PARAM_FILE)
-        + "&dw=" + this.BIRD_MAXX 
-        + "&dh=" + this.BIRD_MAXY;
-    img.src = src;
-}
-    
-Digilib.prototype.showBirdDiv = function(show) {
-    // show or hide "bird's eye" div
-    var startPos; // anchor for dragging
-    var newRect;  // position after drag
-    var birdImg = getElement("bird-image");
-    var birdArea = getElement("bird-area");
-    var overlay = getElement("bird-overlay");
-    showElement(birdImg, show);
-    // dont show selector if area has full size
-    if (!show || this.isFullArea()) {
-        // hide area
-        showElement(birdArea, false);
-        showElement(overlay, false);
-        return;
-    };
-    var birdImgRect = getElementRect(birdImg);
-    var area = this.area;
-    if (this.flags.get("osize") || this.flags.get("clip")) {
-    		// in original-size and pixel-by-pixel mode the area size is not valid
-    		var birdAreaRect = new Rectangle(
-        		birdImgRect.x + birdImgRect.width  * area.x,
-        		birdImgRect.y + birdImgRect.height * area.y, 
-        		5, 
-        		5);
-    } else {
-    		// scale area down to img size
-    		var birdAreaRect = new Rectangle(
-        		// what about borders ??
-        		birdImgRect.x + birdImgRect.width  * area.x,
-	        birdImgRect.y + birdImgRect.height * area.y,
-	        birdImgRect.width  * area.width,
-	        birdImgRect.height * area.height);
-	}
-    moveElement(birdArea, birdAreaRect);
-    showElement(birdArea, true);
-    moveElement(overlay, birdImgRect);
-    showElement(overlay, true);
-    registerEvent("mousedown", overlay, birdAreaStartDrag);
-    registerEvent("mousedown", birdImg, birdAreaStartDrag);
-
-	// our own reference to this for local functions
-	var digilib = this;
-
-    function birdAreaStartDrag(evt) {
-    // mousedown handler: start drag
-        startPos = evtPosition(evt);
-        unregisterEvent("mousedown", overlay, birdAreaStartDrag);
-        unregisterEvent("mousedown", birdImg, birdAreaStartDrag);
-        registerEvent("mousemove", document, birdAreaMove);
-        registerEvent("mouseup",   document, birdAreaEndDrag);
-        // debugProps(getElementRect(bird))
-        return stopEvent(evt);
-    }
-
-    function birdAreaMove(evt) {
-    // mousemove handler: drag
-        var pos = evtPosition(evt);
-        var dx = pos.x - startPos.x;
-        var dy = pos.y - startPos.y;
-        // move birdArea div, keeping size
-        newRect = new Rectangle(
-            birdAreaRect.x + dx,
-            birdAreaRect.y + dy,
-            birdAreaRect.width,
-            birdAreaRect.height);
-        // stay within image
-        newRect.stayInside(birdImgRect);
-        moveElement(birdArea, newRect);
-        showElement(birdArea, true);
-        return stopEvent(evt);
-    }
-
-    function birdAreaEndDrag(evt) {
-    // mouseup handler: reload page
-        unregisterEvent("mousemove", document, birdAreaMove);
-        unregisterEvent("mouseup",   document, birdAreaEndDrag);
-        showElement(overlay, false);
-        if (newRect == null) { // no movement happened
-            startPos = birdAreaRect.getCenter();
-            birdAreaMove(evt); // set center to click position
-            }
-        digilib.params.set("wx", cropFloat((newRect.x - birdImgRect.x) / birdImgRect.width));
-        digilib.params.set("wy", cropFloat((newRect.y - birdImgRect.y) / birdImgRect.height));
-        // zoomed is always fit
-        digilib.params.set("ws", 1);
-        digilib.display();
-        return stopEvent(evt);
-    }
-}
-
-Digilib.prototype.showArrow = function(name, rect, show) {
-    var arrow = getElement(name);
-    moveElement(arrow, rect);
-    showElement(arrow, show);
-}
-	
-Digilib.prototype.showArrows = function() {
-    // show the 4 arrow bars on top of scaler img according to current dlArea
-    var r = getElementRect(this.scalerImg);
-    this.showArrow('up',
-        new Rectangle(r.x, r.y, r.width, this.ARROW_WIDTH), 
-        this.canMove(0, -1)
-        );
-    this.showArrow('down',
-        new Rectangle(r.x, r.y + r.height - this.ARROW_WIDTH, r.width, this.ARROW_WIDTH),
-        this.canMove(0, 1)
-        );
-    this.showArrow('left',
-        new Rectangle(r.x, r.y, this.ARROW_WIDTH, r.height),
-        this.canMove(-1, 0)
-        );
-    this.showArrow('right',
-        new Rectangle(r.x + r.width - this.ARROW_WIDTH, r.y, this.ARROW_WIDTH, r.height),
-        this.canMove(1, 0)
-        );
-	}
-
-Digilib.prototype.calibrate = function() {
-    // calibrate screen resolution
-    var calDiv = getElement("calibration");
-    var calRect = getElementRect(calDiv);
-    moveCenter(false);
-    var wins = getWinSize();
-    calRect.setCenter(new Position(wins.width / 2, wins.height / 2));
-    moveElement(calDiv, calRect);
-    showElement(calDiv, true);
-    var cm = window.prompt("The length of the scale on your screen in centimeter:");
-    if (cm) {
-    		var dpi = calRect.width / parseFloat(cm) * 2.54;
-    		this.params.set("ddpi", cropFloat(dpi));
-    	}
-    	showElement(calDiv, false);
-}
-
-
-Digilib.prototype.setScale = function(scale) {
-	// sets original-size, pixel-by-pixel or fit-to-screen scale type
-	if (scale == "pixel") {
-		// pixel by pixel
-		this.flags.set("clip");
-		this.flags.reset("osize");
-		this.flags.reset("fit");
-	} else if (scale == "original") {
-		// original size -- needs calibrated screen
-        if (!this.params.isSet("ddpi")) {
-        		var dpi = cookie.get("ddpi");
-	        if (dpi == null) {
-    		        alert("Your screen has not yet been calibrated - using default value of 72 dpi");
-            		dpi = 72;
-            	}
-        		this.params.set("ddpi", dpi);
-        	}
-        this.flags.set("osize");
-        this.flags.reset("clip");
-		this.flags.reset("fit");
-    } else {
-    		// scale to screen size (default)
-    		this.flags.reset("clip");
-    		this.flags.reset("osize");
-    	}
-    this.display();
-}
-
-Digilib.prototype.getScale = function() {
-	// returns scale type
-	if (this.flags.get("clip")) {
-		return "pixel";
-	} else if (this.flags.get("osize")) {
-		return "original";
-	} else {
-		return "fit";
-	}
-}	
-
-Digilib.prototype.pageWidth = function() {
-	this.zoomFullpage('width');
-}
-
-Digilib.prototype.setSize = function(factor) {
-    this.params.set("ws", factor);
-    this.display();
-}
-
-Digilib.prototype.showMenu = function(menuId, buttonId, show) {
-    var menu = getElement(menuId);
-    if (show) {
-        // align right side of menu with button
-        var buttonPos = getElementPosition(getElement(buttonId));
-        var menusize = getElementSize(menu);
-        moveElement(menu, new Position(buttonPos.x - menusize.width - 3, buttonPos.y));
-        }
-    showElement(menu, show);
-}
-
-
-/********************************
- * global variables
- ********************************/
-
-var dl = new Digilib();
-
-/* old parameter function compatibility stuff */
-function newParameter(a,b,c) {return dl.params.define(a,b,c)};
-function resetParameter(a) {return dl.params.reset(a)};
-function deleteParameter(a) {return dl.params.remove(a)};
-function getParameter(a) {return dl.params.get(a)};
-function setParameter(a,b,c) {return dl.params.set(a,b,c)};
-function hasParameter(a) {return dl.params.isSet(a)};
-function getAllParameters(a) {return dl.params.getAll(a)};
-getQueryString = getAllParameters;
-function parseParameters(a) {return dl.params.parse(a)};
-function getAllMarks() {return dl.marks.getAll()};
-getMarksQueryString = getAllMarks;
-function addMark(evt) {return dl.marks.addEvent(evt)};
-function deleteMark() {return dl.marks.pop()};
-function deleteAllMarks() {return dl.marks = new Marks()};
-function hasFlag(mode) {return dl.flags.get(mode)};
-function addFlag(mode) {return dl.flags.set(mode)};
-function removeFlag(mode) {return dl.flags.reset(mode)};
-function toggleFlag(mode) {return dl.flags.toggle(mode)};
-function getAllFlags() {return dl.flags.getAll()};
-/* old digilib function compatibility */
-function setDLParam(e, s, relative) {dl.setDLParam(e, s, relative)};
-function display(detail, moDetail) {dl.display(detail, moDetail)};
-function setMark(reload) {dl.setMark(reload)};
-function removeMark(reload) {dl.removeMark(reload)};
-function resetImage() {dl.resetImage()};
-function dragImage(evt) {dl.dragImage(evt)};
-function zoomArea() {dl.zoomArea()};
-function zoomBy(factor) {dl.zoomBy(factor)};
-function zoomFullpage(a) {dl.zoomFullpage(a)};
-function moveCenter(on) {dl.moveCenter(on)};
-function isFullArea(area) {dl.isFullArea(area)};
-function canMove(movx, movy) {dl.canMove(movx, movy)};
-function moveBy(movx, movy) {dl.moveBy(movx, movy)};
-function getRef(baseURL) {dl.getRef(baseURL)};
-function getRefWin(type, msg) {dl.getRefWin(type, msg)};
-function getQuality() {dl.getQuality()};
-function setQuality(qual) {dl.setQuality(qual)};
-function setQualityWin(msg) {dl.setQualityWin(msg)};
-function mirror(dir) {dl.mirror(dir)};
-function gotoPage(gopage, keep) {dl.gotoPage(gopage, keep)};
-function gotoPageWin() {dl.gotoPageWin()};
-function setParamWin(param, text, relative) {dl.setParamWin(param, text, relative)};
-function showOptions(show) {dl.showOptions(show)};
-function showBirdDiv(show) {dl.showBirdDiv(show)};
-function showAboutDiv(show) {dl.showAboutDiv(show)};
-function calibrate(direction) {dl.calibrate(direction)};
-function setScale(a) {dl.setScale(a)};
-function getScale(a) {dl.getScale(a)};
-function originalSize(on) {dl.originalSize(on)};
-function pixelByPixel(on) {dl.pixelByPixel(on)};
-function pageWidth() {dl.pageWidth()};
-function setSize(factor) {dl.setSize(factor)};
-function showMenu(a,b,c) {dl.showMenu(a,b,c)};
-
-
-// :tabSize=4:indentSize=4:noTabs=true:
-
Binary file client/digitallibrary/greyskin/down.png has changed
--- a/client/digitallibrary/greyskin/down.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="down.svg"
-   inkscape:export-filename="C:\digilib\greyskin\down.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000"
-   version="1.0">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="30.235294"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="234"
-     inkscape:window-y="77" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875,42.214557 C 13.517688,41.821426 5.3749998,33.298347 5.375,22.870807 C 5.375,12.193005 13.927192,3.5270576 24.4375,3.5270566 C 31.499113,3.5270566 37.650231,7.4400376 40.9375,13.245807 L 24.5,13.245807 L 8,13.245807 L 16.25,27.527057 L 24.5,41.808307 L 32.75,27.527057 L 40.96875,13.308307 C 42.552395,16.129468 43.46875,19.392821 43.46875,22.870807 C 43.46875,33.548609 34.947807,42.214557 24.4375,42.214557 C 24.191165,42.214557 23.931575,42.223992 23.6875,42.214557 z "
-       id="path2396" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/first.png has changed
--- a/client/digitallibrary/greyskin/first.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="first.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\first.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 33.15625 16 L 33.15625 32.09375 L 19.1875 23.875 L 33.15625 16 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;display:inline"
-       d="M 17.017857,14.285715 L 17.017857,33.142857"
-       id="path1372" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 33.383475,15.616525 L 33.383475,31.704904 L 19.408897,23.484565 L 33.383475,15.616525 z "
-       id="path2576" />
-  </g>
-</svg>
--- a/client/digitallibrary/greyskin/firstlast.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.42.2"
-   sodipodi:docbase="/Volumes/User/Users/casties/Desktop/web-devel/digibutton"
-   sodipodi:docname="firstlast.svg"
-   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/first.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.0000000"
-     inkscape:cx="24.000000"
-     inkscape:cy="20.000000"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="688"
-     inkscape:window-height="491"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2330508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 33.000000,13.571429 L 33.000000,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2330508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;display:inline"
-       d="M 33.151332,16.009382 L 33.151332,32.097761 L 19.176755,23.877422 L 33.151332,16.009382 z "
-       id="path1370" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;display:inline"
-       d="M 17.017857,14.285715 L 17.017857,33.142857"
-       id="path1372" />
-  </g>
-</svg>
--- a/client/digitallibrary/greyskin/fixed.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-// fixed.js: fix fixed positioning and fixed backgrounds in IE/Win
-// version 1.8, 08-Aug-2003
-// written by Andrew Clover <and@doxdesk.com>, use freely
-
-/*@cc_on
-@if (@_win32 && @_jscript_version>4)
-
-var fixed_positions= new Array();
-var fixed_backgrounds= new Array();
-var fixed_viewport;
-
-// Initialisation. Called when the <body> tag arrives. Set up viewport so the
-// rest of the script knows we're going, and add a measurer div, used to detect
-// font size changes and measure image sizes for backgrounds later   
-
-function fixed_init() {
-  fixed_viewport= (document.compatMode=='CSS1Compat') ?
-    document.documentElement : document.body;
-  var el= document.createElement('div');
-  el.setAttribute('id', 'fixed-measure');
-  el.style.position= 'absolute';
-  el.style.top= '0'; el.style.left= '0';
-  el.style.overflow= 'hidden'; el.style.visibility= 'hidden';
-  el.style.fontSize= 'xx-large'; el.style.height= '5em';
-  el.style.setExpression('width', 'fixed_measureFont()');
-  document.body.insertBefore(el, document.body.firstChild);
-}
-
-// Binding. Called every time an element is added to the document, check it
-// for fixed features, if found add to our lists and set initial props   
-
-function fixed_bind(el) {
-  var needLayout= false;
-  var tag= el.tagName.toLowerCase();
-  var st= el.style;
-  var cst= el.currentStyle;
-  var anc;
-
-  // find fixed-position elements
-  if (cst.position=='fixed') {
-    needLayout= true;
-    fixed_positions[fixed_positions.length]= el;
-    // store original positioning as we'll overwrite it
-    st.position= 'absolute';
-    st.fixedPLeft=   cst.left;
-    st.fixedPTop=    cst.top;
-    st.fixedPRight=  cst.right;
-    st.fixedPBottom= cst.bottom;
-    st.fixedPWidth=  fixed_parseLength(cst.width);
-    st.fixedPHeight= fixed_parseLength(cst.height);
-    // find element that will act as containing box, for convenience later
-    st.fixedCB= null;
-    for (anc= el; (anc= anc.parentElement).parentElement;) {
-      if (anc.currentStyle.position!='static') {
-        st.fixedCB= anc;
-        break;
-    } }
-    // detect nested fixed positioning (only ancestor need move)
-    st.fixedNest= false;
-    for (anc= el; anc= anc.parentElement;) {
-      if (anc.style.fixedNest!=null)
-        st.fixedNest= true;
-        break;
-    }
-  }
-
-  // find fixed-background elements (not body/html which IE already gets right)
-  if (cst.backgroundAttachment=='fixed' && tag!='body' && tag!='html') {
-    needLayout= true;
-    fixed_backgrounds[fixed_backgrounds.length]= el;
-    // get background offset, converting from keyword if necessary
-    st.fixedBLeft= fixed_parseLength(cst.backgroundPositionX);
-    st.fixedBTop=  fixed_parseLength(cst.backgroundPositionY);
-    // if it's a non-zero %age, need to know size of image for layout
-    if (st.fixedBLeft[1]=='%' || st.fixedBTop[1]=='%') {
-      st.fixedBWidth= 0; st.fixedBHeight= 0;
-      fixed_measureBack(el);
-    }
-  }
-  if (needLayout) fixed_layout();
-}
-
-// Layout. On every window or font size change, recalculate positioning   
-
-// Request re-layout at next free moment
-var fixed_delaying= false;
-function fixed_delayout() {
-  if (fixed_delaying) return;
-  fixed_delaying= true;
-  window.setTimeout(fixed_layout, 0);
-}
-
-var fixed_ARBITRARY= 200;
-
-function fixed_layout() {
-  fixed_delaying= false;
-  if (!fixed_viewport) return;
-  var i, el, st, j, pr, tmp, A= 'auto';
-  var cb, cbLeft, cbTop, cbRight, cbBottom, oLeft, oTop, oRight, oBottom;
-  var vpWidth=fixed_viewport.clientWidth, vpHeight=fixed_viewport.clientHeight;
-
-  // calculate initial position for fixed-position elements [black magic]
-  for (i= fixed_positions.length; i-->0;) {
-    el= fixed_positions[i]; st= el.style;
-    // find positioning of containing block
-    cb= st.fixedCB; if (!cb) cb= fixed_viewport;
-    cbLeft= fixed_pageLeft(cb); cbTop= fixed_pageTop(cb);
-    if (cb!=fixed_viewport) { cbLeft+= cb.clientLeft; cbTop+= cb.clientTop; }
-    cbRight= fixed_viewport.clientWidth-cbLeft-cb.clientWidth;
-    cbBottom= fixed_viewport.clientHeight-cbTop-cb.clientHeight;
-    // if size is in %, must recalculate relative to viewport
-    if (st.fixedPWidth[1]=='%')
-      st.width= Math.round(vpWidth*st.fixedPWidth[0]/100)+'px';
-    if (st.fixedPHeight[1]=='%')
-      st.height= Math.round(vpHeight*st.fixedPHeight[0]/100)+'px';
-    // find out offset values at max size, to account for margins
-    st.left= A; st.right= '0'; st.top= A; st.bottom= '0';
-    oRight= el.offsetLeft+el.offsetWidth; oBottom= el.offsetTop+el.offsetHeight;
-    st.left= '0'; st.right= A; st.top= '0'; st.bottom= A;
-    oLeft= el.offsetLeft; oTop= el.offsetTop;
-    // use this to convert all edges to pixels
-    st.left= A; st.right= st.fixedPRight;
-    st.top= A; st.bottom= st.fixedPBottom;
-    oRight-= el.offsetLeft+el.offsetWidth;
-    oBottom-= el.offsetTop+el.offsetHeight;
-    st.left= st.fixedPLeft; st.top= st.fixedPTop;
-    oLeft= el.offsetLeft-oLeft; oTop= el.offsetTop-oTop;
-    // edge positioning fix
-    if (st.fixedPWidth[1]==A && st.fixedPLeft!=A && st.fixedPRight!=A) {
-      tmp= el.offsetLeft; st.left= A; st.width= fixed_ARBITRARY+'px';
-      tmp= fixed_ARBITRARY+el.offsetLeft-tmp+cbLeft+cbRight;
-      st.left= st.fixedPLeft; st.width= ((tmp<1)?1:tmp)+'px';
-    }
-    if (st.fixedPHeight[1]==A && st.fixedPTop!=A && st.fixedPBottom!=A) {
-      tmp= el.offsetTop; st.top= A; st.height= fixed_ARBITRARY+'px';
-      tmp= fixed_ARBITRARY+el.offsetTop-tmp+cbTop+cbBottom;
-      st.top= st.fixedPTop; st.height= ((tmp<1)?1:tmp)+'px';
-    }
-    // move all non-auto edges relative to the viewport
-    st.fixedCLeft= (st.fixedPLeft=='auto') ? oLeft : oLeft-cbLeft;
-    st.fixedCTop= (st.fixedPTop=='auto') ? oTop : oTop-cbTop;
-    st.fixedCRight= (st.fixedPRight=='auto') ? oRight : oRight-cbRight;
-    st.fixedCBottom= (st.fixedPBottom=='auto') ? oBottom : oBottom-cbBottom;
-    // remove left-positioning of right-positioned elements
-    if (st.fixedPLeft=='auto' && st.fixedPRight!='auto') st.fixedCLeft= 'auto';
-    if (st.fixedPTop=='auto' && st.fixedPBottom!='auto') st.fixedCTop= 'auto';
-  }
-
-
-  // calculate initial positioning of fixed backgrounds
-  for (i= fixed_backgrounds.length; i-->0;) {
-    el= fixed_backgrounds[i]; st= el.style;
-    tmp= st.fixedBImage;
-    if (tmp) {
-      if (tmp.readyState!='uninitialized') {
-        st.fixedBWidth= tmp.offsetWidth;
-        st.fixedBHeight= tmp.offsetHeight;
-        st.fixedBImage= window.undefined;
-      }
-    }
-    st.fixedBX= fixed_length(el, st.fixedBLeft, vpWidth-st.fixedBWidth);
-    st.fixedBY= fixed_length(el, st.fixedBTop, vpHeight-st.fixedBHeight);
-  }
-
-  // now call scroll() to set the positions from the values just calculated
-  fixed_scroll();
-}
-
-// Scrolling. Offset fixed elements relative to viewport scrollness
-
-var fixed_lastX, fixed_lastY;
-var fixed_PATCHDELAY= 300;
-var fixed_patching= false;
-
-// callback function after a scroll, because incorrect scroll position is
-// often reported first go!
-function fixed_patch() {
-  fixed_patching= false;
-  var scrollX= fixed_viewport.scrollLeft, scrollY= fixed_viewport.scrollTop;
-  if (scrollX!=fixed_lastX && scrollY!=fixed_lastY) fixed_scroll();
-}
-
-function fixed_scroll() {
-  if (!fixed_viewport) return;
-  var i, el, st, viewportX, viewportY;
-  var scrollX= fixed_viewport.scrollLeft, scrollY= fixed_viewport.scrollTop;
-  fixed_lastX= scrollX; fixed_lastY= scrollY;
-
-  // move non-nested fixed-position elements
-  for (i= fixed_positions.length; i-->0;) {
-    st= fixed_positions[i].style;
-    viewportX= (st.fixedNest) ? 0 : scrollX;
-    viewportY= (st.fixedNest) ? 0 : scrollY;
-    if (st.fixedCLeft!='auto') st.left= (st.fixedCLeft+viewportX)+'px';
-    if (st.fixedCTop!='auto') st.top= (st.fixedCTop+viewportY)+'px';
-    viewportX= (st.fixedCB==null || st.fixedCB==fixed_viewport) ? 0 : viewportX;
-    viewportY= (st.fixedCB==null || st.fixedCB==fixed_viewport) ? 0 : viewportY;
-    st.right= (st.fixedCRight-viewportX+1)+'px'; st.right= (st.fixedCRight-viewportX)+'px';
-    st.bottom= (st.fixedCBottom-viewportY+1)+'px'; st.bottom= (st.fixedCBottom-viewportY)+'px';
-  }
-
-  // align fixed backgrounds to viewport
-  for (i= fixed_backgrounds.length; i-->0;) {
-    el= fixed_backgrounds[i]; st= el.style;
-    viewportX= scrollX;
-    viewportY= scrollY;
-    while (el.offsetParent) {
-      viewportX-= el.offsetLeft+el.clientLeft;
-      viewportY-= el.offsetTop +el.clientTop;
-      el= el.offsetParent;
-    }
-    st.backgroundPositionX= (st.fixedBX+viewportX)+'px';
-    st.backgroundPositionY= (st.fixedBY+viewportY)+'px';
-  }
-
-  // call back again in a tic
-  if (!fixed_patching) {
-    fixed_patching= true;
-    window.setTimeout(fixed_patch, fixed_PATCHDELAY);
-  }
-}
-
-// Measurement. Load bg-image into an invisible element on the page, when
-// loaded write the width/height to an element's style for layout use; detect
-// when font size changes
-
-function fixed_measureBack(el) {
-  var measure= document.getElementById('fixed-measure');
-  var img= document.createElement('img');
-  img.setAttribute('src', fixed_parseURL(el.currentStyle.backgroundImage));
-  measure.appendChild(img);
-  el.style.fixedBImage= img;
-  if (img.readyState=='uninitialized')
-    img.attachEvent('onreadystatechange', fixed_measureBackImage_ready);
-}
-
-function fixed_measureBackImage_ready() {
-  var img= event.srcElement;
-  if (img && img.readyState!='uninitialized') {
-    img.detachEvent('onreadystatechange', fixed_measureBackImage_ready);
-    fixed_layout();
-  }
-}
-
-var fixed_fontsize= 0;
-function fixed_measureFont() {
-  var fs= document.getElementById('fixed-measure').offsetHeight;
-  if (fixed_fontsize!=fs && fixed_fontsize!=0)
-    fixed_delayout();
-  fixed_fontsize= fs;
-  return '5em';
-}
-
-// Utility. General-purpose functions
-
-// parse url() to get value inside
-
-function fixed_parseURL(v) {
-  v= v.substring(4, v.length-1);
-  if (v.charAt(0)=='"' && v.charAt(v.length-1)=='"' ||
-      v.charAt(0)=="'" && v.charAt(v.length-1)=="'")
-    return v.substring(1, v.length-1);
-  else return v;
-}
-
-// parse length or auto or background-position keyword into number and unit
-
-var fixed_numberChars= '+-0123456789.';
-var fixed_ZERO= new Array(0, 'px');
-var fixed_50PC= new Array(50, '%');
-var fixed_100PC= new Array(100, '%');
-var fixed_AUTO= new Array(0, 'auto');
-
-function fixed_parseLength(v) {
-  var num, i;
-  if (v=='left'  || v=='top')    return fixed_ZERO;
-  if (v=='right' || v=='bottom') return fixed_100PC;
-  if (v=='center') return fixed_50PC;
-  if (v=='auto')   return fixed_AUTO;
-  i= 0;
-  while (i<v.length && fixed_numberChars.indexOf(v.charAt(i))!=-1)
-    i++;
-  num= parseFloat(v.substring(0, i));
-  if (num==0) return fixed_ZERO;
-  else return new Array(num, v.substring(i));
-}
-
-// convert parsed (number, unit) into a number of pixels
-
-function fixed_length(el, l, full) {
-  var tmp, x;
-  if (l[1]=='px') return l[0];
-  if (l[1]=='%')  return Math.round(full*l[0]/100);
-  // other units - measure by setting position; this is rather inefficient
-  // but then these units are used for background-position so seldom...
-  tmp= el.currentStyle.left;
-  el.style.left= '0';
-  x= el.offsetLeft;
-  el.style.left= l[0]+l[1];
-  x= el.offsetLeft-x;
-  el.style.left= tmp;
-  return x;
-}
-
-// convert stupid IE offsetLeft/Top to page-relative values
-
-function fixed_pageLeft(el) {
-  var v= 0;
-  while (el.offsetParent) {
-    v+= el.offsetLeft;
-    el= el.offsetParent;
-  }
-  return v;
-}
-function fixed_pageTop(el) {
-  var v= 0;
-  while (el.offsetParent) {
-    v+= el.offsetTop;
-    el= el.offsetParent;
-  }
-  return v;
-}
-
-// Scanning. Check document every so often until it has finished loading. Do
-// nothing until <body> arrives, then call main init. Pass any new elements
-// found on each scan to be bound   
-
-var fixed_SCANDELAY= 500;
-
-function fixed_scan() {
-  if (!document.body) return;
-  if (!fixed_viewport) fixed_init();
-  var el;
-  for (var i= 0; i<document.all.length; i++) {
-    el= document.all[i];
-    if (!el.fixed_bound) {
-      el.fixed_bound= true;
-      fixed_bind(el);
-  } }
-}
-
-var fixed_scanner;
-function fixed_stop() {
-  window.clearInterval(fixed_scanner);
-  fixed_scan();
-}
-
-fixed_scan();
-fixed_scanner= window.setInterval(fixed_scan, fixed_SCANDELAY);
-window.attachEvent('onload', fixed_stop);
-window.attachEvent('onresize', fixed_delayout);
-window.attachEvent('onscroll', fixed_scroll);
-
-@end @*/
Binary file client/digitallibrary/greyskin/fwd.png has changed
--- a/client/digitallibrary/greyskin/fwd.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="fwd.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\fwd.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="22"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 25.15625,3.53125 C 35.326062,3.9243803 43.46875,12.44746 43.46875,22.875 C 43.46875,33.552802 34.916558,42.218749 24.40625,42.21875 C 13.895943,42.21875 5.375001,33.552802 5.375,22.875 C 5.375,12.197198 13.895943,3.53125 24.40625,3.53125 C 24.652585,3.53125 24.912175,3.5218149 25.15625,3.53125 z M 17.09375,13.75 L 17.09375,33.3125 L 34.09375,23.3125 L 17.09375,13.75 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 17.59375,13.678571 L 17.59375,33.25 L 34.59375,23.25 L 17.59375,13.678571 z "
-       id="path2474" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/help.png has changed
--- a/client/digitallibrary/greyskin/help.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="help.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\help.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:39.96018219px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="13.12768"
-       y="39.322536"
-       id="text4225"
-       transform="scale(1.062771,0.940936)"><tspan
-         sodipodi:role="line"
-         id="tspan4227"
-         x="13.12768"
-         y="39.322536">?</tspan></text>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/last.png has changed
--- a/client/digitallibrary/greyskin/last.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="last.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\last.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 25.15625,3.53125 C 35.326062,3.9243803 43.46875,12.44746 43.46875,22.875 C 43.46875,33.552802 34.916558,42.218749 24.40625,42.21875 C 13.895943,42.21875 5.375001,33.552802 5.375,22.875 C 5.375,12.197198 13.895943,3.53125 24.40625,3.53125 C 24.652585,3.53125 24.912175,3.5218149 25.15625,3.53125 z M 15.6875,16 L 15.6875,32.09375 L 29.65625,23.875 L 15.6875,16 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="M 31.825893,14.285715 L 31.825893,33.142857"
-       id="path1372" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 15.460275,15.616525 L 15.460275,31.704904 L 29.434853,23.484565 L 15.460275,15.616525 z "
-       id="path2576" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/left.png has changed
--- a/client/digitallibrary/greyskin/left.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="left.svg"
-   inkscape:export-filename="C:\digilib\greyskin\left.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000"
-   version="1.0">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="30.235294"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 5.0802215,22.138528 C 5.4733525,11.968716 13.996431,3.8260283 24.423971,3.8260285 C 35.101773,3.8260285 43.767721,12.37822 43.767722,22.888528 C 43.767722,29.950141 39.854741,36.101259 34.048971,39.388528 L 34.048971,22.951028 L 34.048971,6.4510285 L 19.767721,14.701028 L 5.4864715,22.951028 L 19.767721,31.201028 L 33.986471,39.419778 C 31.16531,41.003423 27.901957,41.919778 24.423971,41.919778 C 13.746169,41.919778 5.0802215,33.398835 5.0802215,22.888528 C 5.0802215,22.642193 5.0707865,22.382603 5.0802215,22.138528 z "
-       id="path2396" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/mark-bg-16.png has changed
Binary file client/digitallibrary/greyskin/mark-bg.png has changed
--- a/client/digitallibrary/greyskin/mark-bg.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin"
-   sodipodi:docname="mark-bg2.svg"
-   inkscape:export-filename="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin/mark-bg-16.png"
-   inkscape:export-xdpi="4.654716"
-   inkscape:export-ydpi="4.654716">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3076">
-      <stop
-         id="stop3078"
-         offset="0"
-         style="stop-color:#651f0f;stop-opacity:1;" />
-      <stop
-         id="stop3080"
-         offset="1"
-         style="stop-color:#e46648;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3963">
-      <stop
-         style="stop-color:#c49c85;stop-opacity:1;"
-         offset="0"
-         id="stop3965" />
-      <stop
-         style="stop-color:#db4521;stop-opacity:1;"
-         offset="1"
-         id="stop3967" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3082">
-      <stop
-         id="stop3084"
-         offset="0"
-         style="stop-color:#ff0000;stop-opacity:1;" />
-      <stop
-         id="stop3086"
-         offset="1"
-         style="stop-color:#ff0000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1310">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop1312" />
-      <stop
-         style="stop-color:#ff0000;stop-opacity:0;"
-         offset="1"
-         id="stop1314" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.8757764"
-     inkscape:cx="151.17398"
-     inkscape:cy="906.44231"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="879"
-     inkscape:window-height="711"
-     inkscape:window-x="88"
-     inkscape:window-y="88"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="vertical"
-       position="110.152"
-       id="guide1315" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="944.16"
-       id="guide1317" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#f12d00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 86.073825,86.856886 C 110.16054,119.9571 127.91147,196.14366 127.15806,199.22781 C 127.15806,199.22781 120.92452,223.45391 120.92452,245.85115 C 120.92452,323.13115 174.1575,389.5 251.4375,389.5 C 328.7175,389.5 391.43749,326.78 391.4375,249.5 C 391.4375,172.22 326.99551,114.81273 249.97796,121.17633 L 207.73033,124.66706 C 202.54179,125.44165 124.88498,107.49727 86.073825,86.856886 z "
-       id="path3088"
-       sodipodi:nodetypes="ccsssscc"
-       inkscape:export-filename="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin/mark-bg.png"
-       inkscape:export-xdpi="6.9820738"
-       inkscape:export-ydpi="6.9820738" />
-  </g>
-</svg>
--- a/client/digitallibrary/greyskin/mark-bg_old.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin"
-   sodipodi:docname="mark-bg.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3963">
-      <stop
-         style="stop-color:#c49c85;stop-opacity:1;"
-         offset="0"
-         id="stop3965" />
-      <stop
-         style="stop-color:#db4521;stop-opacity:1;"
-         offset="1"
-         id="stop3967" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3082">
-      <stop
-         id="stop3084"
-         offset="0"
-         style="stop-color:#ff0000;stop-opacity:1;" />
-      <stop
-         id="stop3086"
-         offset="1"
-         style="stop-color:#ff0000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1310">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop1312" />
-      <stop
-         style="stop-color:#ff0000;stop-opacity:0;"
-         offset="1"
-         id="stop1314" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3963"
-       id="radialGradient3969"
-       cx="163.01688"
-       cy="332.7197"
-       fx="163.01688"
-       fy="332.7197"
-       r="140.5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-5.18401e-7,0.572953,-0.63396,-5.735991e-7,373.7883,110.3898)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.3283607"
-     inkscape:cx="250.79029"
-     inkscape:cy="803.50858"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="88"
-     inkscape:window-y="88"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="vertical"
-       position="110.152"
-       id="guide1315" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="944.16"
-       id="guide1317" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#da4521;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 181.33867,127.68485 L 110.152,108.20218 L 135.62933,169.64752 L 181.33867,127.68485 z "
-       id="path1319" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3969);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path3088"
-       sodipodi:cx="222.85715"
-       sodipodi:cy="238.07646"
-       sodipodi:rx="140"
-       sodipodi:ry="140"
-       d="M 362.85715 238.07646 A 140 140 0 1 1  82.857147,238.07646 A 140 140 0 1 1  362.85715 238.07646 z"
-       transform="translate(28.57143,11.42857)"
-       inkscape:export-filename="C:\Digilib\greyskin\mark-bg-16.png"
-       inkscape:export-xdpi="5.1245551"
-       inkscape:export-ydpi="5.1245551" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/mark.png has changed
--- a/client/digitallibrary/greyskin/mark.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="mark.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mark.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <rect
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.01823568;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2405"
-       width="18.981764"
-       height="18.981375"
-       x="14.573074"
-       y="13.296871" />
-    <text
-       xml:space="preserve"
-       style="font-size:23.58337593px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="15.091353"
-       y="33.00325"
-       id="text2403"
-       transform="scale(1.074523,0.930646)"><tspan
-         sodipodi:role="line"
-         id="tspan2405"
-         x="15.091353"
-         y="33.00325">1</tspan></text>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/mirror-horizontal-on.png has changed
--- a/client/digitallibrary/greyskin/mirror-horizontal-on.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="mirror-horizontal-on.svg"
-   inkscape:export-filename="C:\digilib\greyskin\mirror-horizontal-on.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 11.4375 13 L 23.4375 13 L 23.4375 36 L 11.4375 13 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
-       id="rect2628"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/mirror-horizontal.png has changed
--- a/client/digitallibrary/greyskin/mirror-horizontal.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="mirror-horizontal.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-horizontal.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 11.4375 13 L 23.4375 13 L 23.4375 36 L 11.4375 13 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#818181;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
-       id="rect2628"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/mirror-vertical-on.png has changed
--- a/client/digitallibrary/greyskin/mirror-vertical-on.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="mirror-vertical-on.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-horizontal-on.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="15.983193"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <g
-       id="g2685"
-       transform="matrix(0,-1,1,0,1.548972,47.29478)"
-       inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-vertical-on.png"
-       inkscape:export-xdpi="60"
-       inkscape:export-ydpi="60">
-      <path
-         id="path2396"
-         d="M 23.6875,3.5312497 C 13.517688,3.92438 5.3749993,12.44746 5.3750003,22.875 C 5.3750003,33.552802 13.927192,42.218749 24.4375,42.21875 C 34.947807,42.21875 43.468749,33.552802 43.46875,22.875 C 43.46875,12.197198 34.947807,3.5312497 24.4375,3.5312497 C 24.191165,3.5312497 23.931575,3.5218146 23.6875,3.5312497 z M 11.4375,13 L 23.4375,13 L 23.4375,36 L 11.4375,13 z "
-         style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128;display:inline" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="rect2628"
-         d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
-         style="color:#000000;fill:#000000;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/mirror-vertical.png has changed
--- a/client/digitallibrary/greyskin/mirror-vertical.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="mirror-vertical.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-vertical.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <g
-       id="g2813"
-       transform="matrix(0,-1,1,0,1.548972,47.29478)"
-       inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-vertical.png"
-       inkscape:export-xdpi="60"
-       inkscape:export-ydpi="60">
-      <path
-         id="path2396"
-         d="M 23.6875,3.53125 C 13.517688,3.9243803 5.3749998,12.44746 5.375,22.875 C 5.375,33.552802 13.927192,42.218749 24.4375,42.21875 C 34.947807,42.21875 43.468749,33.552802 43.46875,22.875 C 43.46875,12.197198 34.947807,3.53125 24.4375,3.53125 C 24.191165,3.53125 23.931575,3.5218149 23.6875,3.53125 z M 11.4375,13 L 23.4375,13 L 23.4375,36 L 11.4375,13 z "
-         style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128;display:inline" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="rect2628"
-         d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
-         style="color:#000000;fill:#818181;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>
--- a/client/digitallibrary/greyskin/mirror.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="mirror.svg"
-   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/first.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2330508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;display:inline"
-       d="M 33.151332,16.009382 L 33.151332,32.097761 L 19.176755,23.877422 L 33.151332,16.009382 z "
-       id="path1370" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;display:inline"
-       d="M 17.017857,14.285715 L 17.017857,33.142857"
-       id="path1372" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/options.png has changed
--- a/client/digitallibrary/greyskin/options.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="options.svg"
-   inkscape:export-filename="C:\digilib\greyskin\options.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.1875 3.53125 C 13.239732 4.1660714 5.3749998 12.609754 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 C 23.358917 3.5352791 23.265829 3.5262514 23.1875 3.53125 z M 12 23 L 17.5625 23 L 17.5625 28.5625 L 12 28.5625 L 12 23 z M 21.5 23 L 27.0625 23 L 27.0625 28.5625 L 21.5 28.5625 L 21.5 23 z M 31 23 L 36.5625 23 L 36.5625 28.5625 L 31 28.5625 L 31 23 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline" />
-</svg>
Binary file client/digitallibrary/greyskin/original-size.png has changed
--- a/client/digitallibrary/greyskin/original-size.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="original-size.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\original-size.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="18.655462"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <g
-       id="g3544"
-       transform="translate(-0.642857,0.428572)">
-      <path
-         transform="translate(-1.071429,-0.714287)"
-         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
-         sodipodi:ry="1.9285715"
-         sodipodi:rx="1.9285715"
-         sodipodi:cy="18.785715"
-         sodipodi:cx="25.357143"
-         id="path3538"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(-1.071429,8.285713)"
-         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
-         sodipodi:ry="1.9285715"
-         sodipodi:rx="1.9285715"
-         sodipodi:cy="18.785715"
-         sodipodi:cx="25.357143"
-         id="path3542"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:23.75772667px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="7.5327549"
-       y="31.319475"
-       id="text3548"><tspan
-         sodipodi:role="line"
-         id="tspan3550"
-         x="7.5327549"
-         y="31.319475">1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:23.75772667px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"
-       x="25.077103"
-       y="31"
-       id="text3552"><tspan
-         sodipodi:role="line"
-         id="tspan3554"
-         x="25.077103"
-         y="31">1</tspan></text>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/page.png has changed
--- a/client/digitallibrary/greyskin/page.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="page.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\page.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="22"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 15 10 L 29 10 L 29.15625 10 L 34.4375 16.84375 L 34.4375 36 L 15 36 L 15 10 z "
-       id="path2396" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 29,10 C 29,17 29,17 29,17 L 35,17"
-       id="path2414" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 15.285714,9.75 L 29.285713,9.75 L 29.428571,9.75 L 34.714286,16.607143 L 34.714286,35.75 L 15.285714,35.75 L 15.285714,9.75 z "
-       id="path2438"
-       sodipodi:nodetypes="ccccccc" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/pagewidth.png has changed
--- a/client/digitallibrary/greyskin/pagewidth.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="pagewidth.svg"
-   inkscape:export-filename="C:\digilib\pagewidth.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.791667"
-     inkscape:cx="24"
-     inkscape:cy="24.142434"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1024"
-     inkscape:window-height="749"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 26.436406 6.3451688 29.758089 8 32.625 L 8 13.4375 L 41 13.4375 L 41 32.40625 C 42.570104 29.594036 43.46875 26.336944 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 14 39.0625 C 16.993555 41.054839 20.594037 42.21875 24.4375 42.21875 C 28.271488 42.21875 31.823448 41.045827 34.8125 39.0625 L 14 39.0625 z "
-       id="path2396" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2222"
-       sodipodi:sides="3"
-       sodipodi:cx="15.514512"
-       sodipodi:cy="22.353563"
-       sodipodi:r1="3.2910488"
-       sodipodi:r2="1.6455244"
-       sodipodi:arg1="1.046877"
-       sodipodi:arg2="2.0940745"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 17.16095,25.203168 L 14.692207,23.778893 L 12.223463,22.354618 L 14.691293,20.928761 L 17.159123,19.502904 L 17.160036,22.353036 L 17.16095,25.203168 z "
-       transform="matrix(1.056109,0,0,1.093566,-3.711289,-1.423286)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#adadad;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.69064897;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2227"
-       width="23"
-       height="0.45308331"
-       x="13.345325"
-       y="22.795227" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3103"
-       sodipodi:sides="3"
-       sodipodi:cx="15.514512"
-       sodipodi:cy="22.353563"
-       sodipodi:r1="3.2910488"
-       sodipodi:r2="1.6455244"
-       sodipodi:arg1="1.046877"
-       sodipodi:arg2="2.0940745"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 17.16095,25.203168 L 14.692207,23.778893 L 12.223463,22.354618 L 14.691293,20.928761 L 17.159123,19.502904 L 17.160036,22.353036 L 17.16095,25.203168 z "
-       transform="matrix(-1.056109,0,0,1.093566,52.66117,-1.410426)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline" />
-</svg>
Binary file client/digitallibrary/greyskin/pixel-by-pixel.png has changed
--- a/client/digitallibrary/greyskin/pixel-by-pixel.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="pixel-by-pixel.svg"
-   inkscape:export-filename="C:\digilib\greyskin\pixel-by-pixel.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14"
-     inkscape:cx="27.241845"
-     inkscape:cy="23.144712"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <g
-       id="g3773"
-       transform="translate(0.251193,0)">
-      <rect
-         y="18.237497"
-         x="10.237497"
-         height="8.8062553"
-         width="8.8062553"
-         id="rect3532"
-         style="opacity:1;color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.4749949;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="18.237497"
-         x="29.297611"
-         height="8.8062553"
-         width="8.8062553"
-         id="rect3534"
-         style="opacity:1;color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.4749949;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <g
-       id="g3544"
-       transform="translate(0.214285,0.428572)">
-      <path
-         transform="translate(-1.071429,-0.714287)"
-         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
-         sodipodi:ry="1.9285715"
-         sodipodi:rx="1.9285715"
-         sodipodi:cy="18.785715"
-         sodipodi:cx="25.357143"
-         id="path3538"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(-1.071429,8.285713)"
-         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
-         sodipodi:ry="1.9285715"
-         sodipodi:rx="1.9285715"
-         sodipodi:cy="18.785715"
-         sodipodi:cx="25.357143"
-         id="path3542"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/quality.png has changed
--- a/client/digitallibrary/greyskin/quality.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="quality.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\quality.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:23.83600235px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="15.291191"
-       y="30.690783"
-       id="text3673"><tspan
-         sodipodi:role="line"
-         id="tspan3675"
-         x="15.291191"
-         y="30.690783">Q</tspan></text>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/reference.png has changed
--- a/client/digitallibrary/greyskin/reference.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="reference.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\reference.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875 3.53125 C 17.438542 3.7728135 11.984671 7.0989567 8.6875 12.03125 L 40.1875 12.03125 C 36.761546 6.9063083 30.990651 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 8.25 33.03125 C 11.607176 38.538487 17.596957 42.218749 24.4375 42.21875 C 31.278043 42.21875 37.267824 38.538487 40.625 33.03125 L 8.25 33.03125 z "
-       id="path2396" />
-    <text
-       xml:space="preserve"
-       style="font-size:16.89605904px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="3.6020906"
-       y="28.190752"
-       id="text3313"
-       transform="scale(1.056842,0.946215)"><tspan
-         sodipodi:role="line"
-         id="tspan3315"
-         x="3.6020906"
-         y="28.190752">http:</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline" />
-</svg>
Binary file client/digitallibrary/greyskin/reset.png has changed
--- a/client/digitallibrary/greyskin/reset.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="reset.svg"
-   inkscape:export-filename="/home/wolfdietrich/mounts/hertz/grafik-button-create/reset/reset.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2390">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective18" />
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective829"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.4748737"
-     inkscape:cx="27.338402"
-     inkscape:cy="-32.044727"
-     inkscape:current-layer="layer4"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="738"
-     inkscape:window-x="-4"
-     inkscape:window-y="-3"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="24.857143,20.571429"
-       id="guide22" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="37.285714,24.571429"
-       id="guide24" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Ebene">
-    <g
-       id="g845"
-       inkscape:export-xdpi="60"
-       inkscape:export-ydpi="60">
-      <path
-         sodipodi:nodetypes="cssssc"
-         id="path2396"
-         d="M 23.6875,3.53125 C 13.517688,3.9243803 5.3749998,12.44746 5.375,22.875 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.34375 -19.03125,-19.34375 -0.246335,0 -0.505925,-0.00944 -0.75,0 z"
-         style="display:inline;fill:#707070;fill-opacity:0.35526315000000003;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128000000003;stroke-dasharray:none" />
-      <path
-         id="path811"
-         d="M 15.5625 12.84375 C 15.471394 12.841739 15.374159 12.880561 15.28125 12.90625 C 15.27061 12.90915 15.26062 12.90295 15.25 12.90625 L 15.25 12.9375 C 14.899967 13.050963 14.670821 13.327726 14.59375 13.625 C 14.51797 13.917276 14.60406 14.263512 14.84375 14.53125 L 14.8125 14.5625 L 14.84375 14.59375 L 23.28125 23.5625 L 14.53125 31.8125 C 14.52275 31.8196 14.53945 31.8364 14.53125 31.84375 C 14.24365 32.100575 14.115992 32.472114 14.21875 32.84375 C 14.22165 32.85439 14.21545 32.86438 14.21875 32.875 L 14.25 32.875 C 14.363463 33.225033 14.640226 33.454179 14.9375 33.53125 C 15.229776 33.60703 15.576012 33.52094 15.84375 33.28125 L 15.875 33.3125 L 15.90625 33.28125 L 24.65625 25.03125 L 32.8125 33.6875 C 33.602654 34.549486 35.102654 33.174486 34.3125 32.3125 L 26.15625 23.65625 L 35 15.3125 C 35.861986 14.522346 34.486986 13.022346 33.625 13.8125 L 24.75 22.1875 L 16.3125 13.21875 C 16.3054 13.21025 16.2886 13.22695 16.28125 13.21875 C 16.088631 13.00305 15.835818 12.849784 15.5625 12.84375 z "
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 16.866525,15.295096 0,16.088379 13.974577,-8.220339 -13.974577,-7.86804 z"
-       id="path7614" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 33,13.571429 0,18.857142"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline" />
-</svg>
Binary file client/digitallibrary/greyskin/rgb-on.png has changed
--- a/client/digitallibrary/greyskin/rgb-on.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="rgb-on.svg"
-   inkscape:export-filename="C:\digilib\greyskin\rgb-on.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 24.3125 14.71875 C 24.347511 14.718306 24.402384 14.71875 24.4375 14.71875 C 28.932357 14.71875 32.5625 18.380143 32.5625 22.875 C 32.5625 27.369858 28.932357 31.03125 24.4375 31.03125 C 19.942642 31.031249 16.28125 27.369857 16.28125 22.875 C 16.28125 18.415259 19.866057 14.775135 24.3125 14.71875 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <rect
-       style="opacity:1;color:#000000;fill:#ff2424;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4326"
-       width="11"
-       height="11.428572"
-       x="19"
-       y="8.5714283" />
-    <rect
-       style="opacity:1;color:#000000;fill:#3cff27;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4328"
-       width="11"
-       height="11.428572"
-       x="12"
-       y="22" />
-    <rect
-       style="opacity:1;color:#000000;fill:#2330ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4330"
-       width="11"
-       height="11.428572"
-       x="26"
-       y="22" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/rgb.png has changed
--- a/client/digitallibrary/greyskin/rgb.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="rgb.svg"
-   inkscape:export-filename="C:\digilib\greyskin\rgb.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <rect
-       style="opacity:1;color:#000000;fill:#ff2424;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4326"
-       width="11"
-       height="11.428572"
-       x="19"
-       y="8.5714283" />
-    <rect
-       style="opacity:1;color:#000000;fill:#3cff27;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4328"
-       width="11"
-       height="11.428572"
-       x="12"
-       y="22" />
-    <rect
-       style="opacity:1;color:#000000;fill:#2330ff;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect4330"
-       width="11"
-       height="11.428572"
-       x="26"
-       y="22" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/right.png has changed
--- a/client/digitallibrary/greyskin/right.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="right.svg"
-   inkscape:export-filename="C:\\digilib\greyskin\right.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000"
-   version="1.0">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="30.235294"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 43.763529,23.607278 C 43.370398,33.77709 34.847319,41.919778 24.419779,41.919778 C 13.741977,41.919778 5.0760293,33.367586 5.0760283,22.857278 C 5.0760283,15.795665 8.9890093,9.644547 14.794779,6.3572783 L 14.794779,22.794778 L 14.794779,39.294778 L 29.076029,31.044778 L 43.357279,22.794778 L 29.076029,14.544778 L 14.857279,6.3260283 C 17.67844,4.7423833 20.941793,3.8260283 24.419779,3.8260283 C 35.097581,3.8260283 43.763529,12.346971 43.763529,22.857278 C 43.763529,23.103613 43.772964,23.363203 43.763529,23.607278 z "
-       id="path2396"
-       inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\right.png"
-       inkscape:export-xdpi="60"
-       inkscape:export-ydpi="60" />
-  </g>
-</svg>
--- a/client/digitallibrary/greyskin/rightleft.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.42.2"
-   sodipodi:docbase="/Volumes/User/Users/casties/Desktop/web-devel/digibutton"
-   sodipodi:docname="rightleft.svg"
-   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/left.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.0000000"
-     inkscape:cx="24.000000"
-     inkscape:cy="22.000000"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="688"
-     inkscape:window-height="509"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;display:inline"
-       d="M 31.750000,13.750000 L 31.750000,33.321429 L 14.750000,23.321429 L 31.750000,13.750000 z "
-       id="path7649" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/rotate-on.png has changed
--- a/client/digitallibrary/greyskin/rotate-on.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="rotate-on.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\rotate-on.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 24.286853,12.87354 C 19.030287,13.204565 14.87354,17.597075 14.87354,22.93677 C 14.87354,22.965702 14.873296,22.991755 14.87354,23.02063 L 17.074871,23.02063 C 17.074597,22.993581 17.074871,22.963883 17.074871,22.93677 C 17.074871,18.70033 20.424718,15.23459 24.622294,15.074871 C 24.723036,15.071038 24.835095,15.074871 24.93677,15.074871 C 29.274884,15.074871 32.798668,18.598655 32.798668,22.93677 C 32.798668,27.146097 29.474235,30.597972 25.314141,30.798668 L 25.314141,33 C 30.696611,32.803733 35,28.366904 35,22.93677 C 35,17.381867 30.491673,12.87354 24.93677,12.87354 C 24.784878,12.87354 24.625795,12.866869 24.475538,12.87354 C 24.412904,12.87632 24.349184,12.869615 24.286853,12.87354 z "
-       id="path3724" />
-    <path
-       sodipodi:type="star"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3738"
-       sodipodi:sides="3"
-       sodipodi:cx="7.7142859"
-       sodipodi:cy="23.142857"
-       sodipodi:r1="5.1448407"
-       sodipodi:r2="2.5724204"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 7.714286,28.287697 L 5.4865044,24.429067 L 3.258723,20.570436 L 7.7142859,20.570436 L 12.169849,20.570436 L 9.9420672,24.429067 L 7.714286,28.287697 z "
-       transform="matrix(0.991317,0,0,0.991317,8.494228,1.957927)" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/rotate.png has changed
--- a/client/digitallibrary/greyskin/rotate.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="rotate.svg"
-   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/first.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       id="path2396"
-       sodipodi:cx="30.214285"
-       sodipodi:cy="26.214285"
-       sodipodi:rx="17.928572"
-       sodipodi:ry="18.214285"
-       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
-       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       style="color:#000000;fill:#797979;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 24.286853,12.87354 C 19.030287,13.204565 14.87354,17.597075 14.87354,22.93677 C 14.87354,22.965702 14.873296,22.991755 14.87354,23.02063 L 17.074871,23.02063 C 17.074597,22.993581 17.074871,22.963883 17.074871,22.93677 C 17.074871,18.70033 20.424718,15.23459 24.622294,15.074871 C 24.723036,15.071038 24.835095,15.074871 24.93677,15.074871 C 29.274884,15.074871 32.798668,18.598655 32.798668,22.93677 C 32.798668,27.146097 29.474235,30.597972 25.314141,30.798668 L 25.314141,33 C 30.696611,32.803733 35,28.366904 35,22.93677 C 35,17.381867 30.491673,12.87354 24.93677,12.87354 C 24.784878,12.87354 24.625795,12.866869 24.475538,12.87354 C 24.412904,12.87632 24.349184,12.869615 24.286853,12.87354 z "
-       id="path3724" />
-    <path
-       sodipodi:type="star"
-       style="color:#000000;fill:#797979;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3738"
-       sodipodi:sides="3"
-       sodipodi:cx="7.7142859"
-       sodipodi:cy="23.142857"
-       sodipodi:r1="5.1448407"
-       sodipodi:r2="2.5724204"
-       sodipodi:arg1="1.5707963"
-       sodipodi:arg2="2.6179939"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 7.714286,28.287697 L 5.4865044,24.429067 L 3.258723,20.570436 L 7.7142859,20.570436 L 12.169849,20.570436 L 9.9420672,24.429067 L 7.714286,28.287697 z "
-       transform="matrix(0.991317,0,0,0.991317,8.494228,1.957927)" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/ruler-top.gif has changed
Binary file client/digitallibrary/greyskin/size.png has changed
--- a/client/digitallibrary/greyskin/size.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="size.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\size.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="21.142857"
-     inkscape:cy="17.503443"
-     inkscape:current-layer="layer3"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="13.142857"
-       y="20.142857"
-       id="text3280"><tspan
-         sodipodi:role="line"
-         id="tspan3282"
-         x="13.142857"
-         y="20.142857" /></text>
-    <path
-       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.0625 3.53125 C 13.169888 4.224269 5.3749998 12.649853 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 C 23.358917 3.5352791 23.265829 3.5262514 23.1875 3.53125 C 23.148642 3.5337298 23.101295 3.5285323 23.0625 3.53125 z M 24.78125 4.625 L 27.59375 9.53125 L 30.375 14.40625 L 24.75 14.375 L 19.125 14.375 L 21.96875 9.5 L 24.78125 4.625 z M 16.21875 17.8125 L 16.25 23.4375 L 16.25 29.0625 L 11.375 26.25 L 6.5 23.46875 L 11.34375 20.625 L 16.21875 17.8125 z M 33.1875 17.8125 L 38.0625 20.625 L 42.9375 23.46875 L 38.03125 26.25 L 33.15625 29.0625 L 33.1875 23.4375 L 33.1875 17.8125 z M 24.75 31.3125 L 30.375 31.3125 L 27.59375 36.1875 L 24.78125 41.0625 L 21.96875 36.1875 L 19.125 31.34375 L 24.75 31.3125 z "
-       id="path2396" />
-    <g
-       id="g2382"
-       transform="translate(34.36755,-3.061025)">
-      <path
-         transform="matrix(0.832068,0.650269,-0.650269,0.832068,-25.54226,-3.7102)"
-         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.4277039"
-         sodipodi:arg1="0.38050638"
-         sodipodi:r2="3.0772371"
-         sodipodi:r1="6.1544743"
-         sodipodi:cy="20"
-         sodipodi:cx="20.571428"
-         sodipodi:sides="3"
-         id="path2370"
-         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(-0.832068,0.650269,0.650269,0.832068,6.113689,-3.7102)"
-         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.4277039"
-         sodipodi:arg1="0.38050638"
-         sodipodi:r2="3.0772371"
-         sodipodi:r1="6.1544743"
-         sodipodi:cy="20"
-         sodipodi:cx="20.571428"
-         sodipodi:sides="3"
-         id="path2372"
-         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.650269,-0.832068,0.832068,0.650269,-39.67515,41.54226)"
-         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.4277039"
-         sodipodi:arg1="0.38050638"
-         sodipodi:r2="3.0772371"
-         sodipodi:r1="6.1544743"
-         sodipodi:cy="20"
-         sodipodi:cx="20.571428"
-         sodipodi:sides="3"
-         id="path2374"
-         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.650269,0.832068,0.832068,-0.650269,-39.67515,9.886315)"
-         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.4277039"
-         sodipodi:arg1="0.38050638"
-         sodipodi:r2="3.0772371"
-         sodipodi:r1="6.1544743"
-         sodipodi:cy="20"
-         sodipodi:cx="20.571428"
-         sodipodi:sides="3"
-         id="path2376"
-         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="star" />
-    </g>
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/trans.gif has changed
Binary file client/digitallibrary/greyskin/up.png has changed
--- a/client/digitallibrary/greyskin/up.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\Digilib\greyskin"
-   sodipodi:docname="up.svg"
-   inkscape:export-filename="C:\digilib\greyskin\up.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000"
-   version="1.0">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="30.235294"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     style="display:inline">
-    <path
-       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 31.499113 42.21875 37.650231 38.305769 40.9375 32.5 L 24.5 32.5 L 8 32.5 L 16.25 18.21875 L 24.5 3.9375 L 32.75 18.21875 L 40.96875 32.4375 C 42.552395 29.616339 43.46875 26.352986 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z "
-       id="path2396" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/zoom-area.png has changed
--- a/client/digitallibrary/greyskin/zoom-area.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="zoom-area.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-area.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="18.655462"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.529;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
-       id="path2396" />
-    <rect
-       style="opacity:1;color:#000000;fill:#707070;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.52899998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;visibility:visible;display:inline;overflow:visible"
-       id="rect2218"
-       width="11.125114"
-       height="10.765433"
-       x="18.755346"
-       y="17.050652" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;display:inline"
-       id="path3286"
-       sodipodi:cx="18.857143"
-       sodipodi:cy="16.857143"
-       sodipodi:rx="6"
-       sodipodi:ry="5.5714288"
-       d="M 24.857143 16.857143 A 6 5.5714288 0 1 1  12.857143,16.857143 A 6 5.5714288 0 1 1  24.857143 16.857143 z"
-       transform="matrix(1.088683,0,0,1.172638,-8.357024,16.759)" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:3.0204308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 7.4897846,41.510215 C 1.7078166,46.946991 1.7078166,46.946991 1.7078166,46.946991"
-       id="path3290" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/zoom-full.png has changed
--- a/client/digitallibrary/greyskin/zoom-full.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="zoom-full.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-full.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="18.655462"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
-       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
-       id="path2396" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
-       id="path7614" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;display:inline"
-       id="path3286"
-       sodipodi:cx="18.857143"
-       sodipodi:cy="16.857143"
-       sodipodi:rx="6"
-       sodipodi:ry="5.5714288"
-       d="M 24.857143 16.857143 A 6 5.5714288 0 1 1  12.857143,16.857143 A 6 5.5714288 0 1 1  24.857143 16.857143 z"
-       transform="matrix(1.088683,0,0,1.172638,-8.357024,16.759)" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:3.0204308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 7.4897846,41.510215 C 1.7078166,46.946991 1.7078166,46.946991 1.7078166,46.946991"
-       id="path3290" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/zoom-in.png has changed
--- a/client/digitallibrary/greyskin/zoom-in.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="zoom-in.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-in.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.4375 3.53125 C 13.378936 4.04697 5.3749998 12.528925 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 z M 23.3125 11.4375 C 23.355991 11.433691 23.393865 11.440789 23.4375 11.4375 C 23.442997 11.437086 23.463446 11.437656 23.46875 11.4375 C 23.489416 11.437624 23.510548 11.437243 23.53125 11.4375 C 23.536568 11.437394 23.556985 11.437848 23.5625 11.4375 C 23.56528 11.437324 23.587298 11.437439 23.59375 11.4375 C 23.614386 11.437591 23.635578 11.437274 23.65625 11.4375 C 23.661589 11.437416 23.681923 11.437783 23.6875 11.4375 C 23.871718 11.42815 24.063473 11.4375 24.25 11.4375 C 30.21888 11.4375 35.0625 16.280052 35.0625 22.25 C 35.062502 28.219949 30.21888 33.0625 24.25 33.0625 C 18.281121 33.062498 13.4375 28.219948 13.4375 22.25 C 13.4375 16.601105 17.789186 11.921302 23.3125 11.4375 z "
-       id="path2396" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:1.46576595;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3217"
-       sodipodi:cx="27.142857"
-       sodipodi:cy="19.714285"
-       sodipodi:rx="10.428572"
-       sodipodi:ry="10.142858"
-       d="M 37.571428 19.714285 A 10.428572 10.142858 0 1 1  16.714285,19.714285 A 10.428572 10.142858 0 1 1  37.571428 19.714285 z"
-       transform="matrix(1,0,0,1.047257,-3.321428,1.726256)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.18805659;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2223"
-       width="2.5"
-       height="10.969203"
-       x="-23.834541"
-       y="18.436769"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.18805659;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2244"
-       width="2.5"
-       height="10.969203"
-       x="22.594028"
-       y="17.022598" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="13.142857"
-       y="20.142857"
-       id="text3280"><tspan
-         sodipodi:role="line"
-         id="tspan3282"
-         x="13.142857"
-         y="20.142857" /></text>
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.5,30.071429 C 6.928571,39.071429 6.928571,39.071429 6.928571,39.071429"
-       id="path3290" />
-  </g>
-</svg>
Binary file client/digitallibrary/greyskin/zoom-out.png has changed
--- a/client/digitallibrary/greyskin/zoom-out.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2388"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
-   sodipodi:docname="zoom-out.svg"
-   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-out.png"
-   inkscape:export-xdpi="60.000000"
-   inkscape:export-ydpi="60.000000">
-  <defs
-     id="defs2390">
-    <linearGradient
-       id="linearGradient3124">
-      <stop
-         id="stop7644"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.19587629;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:0.22680412;"
-         offset="0.50000000"
-         id="stop7646" />
-      <stop
-         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3128" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7"
-     inkscape:cx="24"
-     inkscape:cy="20"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="830"
-     inkscape:window-height="540"
-     inkscape:window-x="17"
-     inkscape:window-y="22" />
-  <metadata
-     id="metadata2393">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
-       d="M 23.4375 3.53125 C 13.378936 4.04697 5.3749998 12.528925 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 z M 23.3125 11.4375 C 23.355991 11.433691 23.393865 11.440789 23.4375 11.4375 C 23.442997 11.437086 23.463446 11.437656 23.46875 11.4375 C 23.489416 11.437624 23.510548 11.437243 23.53125 11.4375 C 23.536568 11.437394 23.556985 11.437848 23.5625 11.4375 C 23.56528 11.437324 23.587298 11.437439 23.59375 11.4375 C 23.614386 11.437591 23.635578 11.437274 23.65625 11.4375 C 23.661589 11.437416 23.681923 11.437783 23.6875 11.4375 C 23.871718 11.42815 24.063473 11.4375 24.25 11.4375 C 30.21888 11.4375 35.0625 16.280052 35.0625 22.25 C 35.062502 28.219949 30.21888 33.0625 24.25 33.0625 C 18.281121 33.062498 13.4375 28.219948 13.4375 22.25 C 13.4375 16.601105 17.789186 11.921302 23.3125 11.4375 z "
-       id="path2396" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:1.46576595;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path3217"
-       sodipodi:cx="27.142857"
-       sodipodi:cy="19.714285"
-       sodipodi:rx="10.428572"
-       sodipodi:ry="10.142858"
-       d="M 37.571428 19.714285 A 10.428572 10.142858 0 1 1  16.714285,19.714285 A 10.428572 10.142858 0 1 1  37.571428 19.714285 z"
-       transform="matrix(1,0,0,1.047257,-3.321428,1.726256)" />
-    <rect
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.18805659;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="rect2223"
-       width="2.5"
-       height="10.969203"
-       x="-23.834541"
-       y="18.436769"
-       transform="matrix(0,-1,1,0,0,0)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="l2"
-     style="display:none">
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
-       id="path7614" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33,13.571429 L 33,32.428571"
-       id="path1367" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="l3"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="13.142857"
-       y="20.142857"
-       id="text3280"><tspan
-         sodipodi:role="line"
-         id="tspan3282"
-         x="13.142857"
-         y="20.142857" /></text>
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.5,30.071429 C 6.928571,39.071429 6.928571,39.071429 6.928571,39.071429"
-       id="path3290" />
-  </g>
-</svg>
Binary file client/digitallibrary/img/digilib-denied.png has changed
--- a/client/digitallibrary/img/digilib-denied.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\temp"
-   sodipodi:docname="digilib-denied.svg"
-   inkscape:export-filename="C:\temp\digilib-denied.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.2782051"
-     inkscape:cx="34.898932"
-     inkscape:cy="35.775981"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4">
-    <sodipodi:guide
-       orientation="vertical"
-       position="-1.9327861"
-       id="guide23493" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect1319"
-       width="34.523312"
-       height="42.631897"
-       x="-73.168289"
-       y="40.459969"
-       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect8613"
-       width="2.4545455"
-       height="0"
-       x="58.545456"
-       y="6" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect9490"
-       width="18.989349"
-       height="30.290173"
-       x="-63.894802"
-       y="44.831184"
-       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1"
-       id="rect10365"
-       width="10"
-       height="7.5454545"
-       x="-43"
-       y="11.454545" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect16478"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19107"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19109"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19111"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.538849"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19113"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19115"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19117"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.723278"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19119"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24390"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="26.132593"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24392"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24394"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24396"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24398"
-       width="8.6068287"
-       height="8.6778221"
-       x="-11.682427"
-       y="0.20279986"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24400"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24404"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24406"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.519249"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#d20000;fill-opacity:1;stroke:none;stroke-opacity:1"
-       id="path3136"
-       sodipodi:cx="35.152546"
-       sodipodi:cy="24.377884"
-       sodipodi:rx="12.079913"
-       sodipodi:ry="11.596717"
-       d="M 47.232459 24.377884 A 12.079913 11.596717 0 1 1  23.072633,24.377884 A 12.079913 11.596717 0 1 1  47.232459 24.377884 z"
-       transform="matrix(1.769606,0,0,1.869472,-29.36785,-18.58286)" />
-    <rect
-       style="fill:#fffdfd;fill-opacity:1;stroke:none;stroke-opacity:1"
-       id="rect3140"
-       width="27.137299"
-       height="11.311166"
-       x="18.862701"
-       y="21" />
-  </g>
-</svg>
Binary file client/digitallibrary/img/digilib-error.png has changed
--- a/client/digitallibrary/img/digilib-error.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\temp"
-   sodipodi:docname="digilib-error.svg"
-   inkscape:export-filename="C:\temp\digilib-error.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs1309" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.2782051"
-     inkscape:cx="34.898932"
-     inkscape:cy="35.775981"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4">
-    <sodipodi:guide
-       orientation="vertical"
-       position="-1.9327861"
-       id="guide23493" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect1319"
-       width="34.523312"
-       height="42.631897"
-       x="-73.168289"
-       y="40.459969"
-       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect8613"
-       width="2.4545455"
-       height="0"
-       x="58.545456"
-       y="6" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect9490"
-       width="18.989349"
-       height="30.290173"
-       x="-63.894802"
-       y="44.831184"
-       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1"
-       id="rect10365"
-       width="10"
-       height="7.5454545"
-       x="-43"
-       y="11.454545" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect16478"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19107"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19109"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19111"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.538849"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19113"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19115"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19117"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.723278"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19119"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24390"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="26.132593"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24392"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24394"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24396"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24398"
-       width="8.6068287"
-       height="8.6778221"
-       x="-11.682427"
-       y="0.20279986"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24400"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24404"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24406"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.519249"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <text
-       xml:space="preserve"
-       style="font-size:87.45126343px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f20000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       x="13.068455"
-       y="68.538353"
-       id="text2236"
-       sodipodi:linespacing="125%"
-       transform="scale(1.196511,0.835764)"><tspan
-         sodipodi:role="line"
-         id="tspan2238"
-         x="13.068455"
-         y="68.538353">!</tspan></text>
-  </g>
-</svg>
Binary file client/digitallibrary/img/digilib-logo-small.png has changed
--- a/client/digitallibrary/img/digilib-logo-sw.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\temp"
-   sodipodi:docname="Digilib-logo-2-sw.svg">
-  <defs
-     id="defs1309" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.2782051"
-     inkscape:cx="34.898932"
-     inkscape:cy="26.066316"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4">
-    <sodipodi:guide
-       orientation="vertical"
-       position="-1.9327861"
-       id="guide23493" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect1319"
-       width="34.523312"
-       height="42.631897"
-       x="-73.168289"
-       y="40.459969"
-       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect8613"
-       width="2.4545455"
-       height="0"
-       x="58.545456"
-       y="6" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect9490"
-       width="18.989349"
-       height="30.290173"
-       x="-63.894802"
-       y="44.831184"
-       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1"
-       id="rect10365"
-       width="10"
-       height="7.5454545"
-       x="-43"
-       y="11.454545" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect16478"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19107"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19109"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19111"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.538849"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19113"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19115"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19117"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.723278"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19119"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24390"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="26.132593"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24392"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24394"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24396"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24398"
-       width="8.6068287"
-       height="8.6778221"
-       x="-11.682427"
-       y="0.20279986"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24400"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24404"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24406"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.519249"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-  </g>
-</svg>
Binary file client/digitallibrary/img/digilib-logo-text1.png has changed
Binary file client/digitallibrary/img/digilib-logo.png has changed
--- a/client/digitallibrary/img/digilib-logo.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\temp"
-   sodipodi:docname="Digilib-logo-2.svg">
-  <defs
-     id="defs1309" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.2782051"
-     inkscape:cx="34.898932"
-     inkscape:cy="35.775981"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4">
-    <sodipodi:guide
-       orientation="vertical"
-       position="-1.9327861"
-       id="guide23493" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect1319"
-       width="34.523312"
-       height="42.631897"
-       x="-73.168289"
-       y="40.459969"
-       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect8613"
-       width="2.4545455"
-       height="0"
-       x="58.545456"
-       y="6" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect9490"
-       width="18.989349"
-       height="30.290173"
-       x="-63.894802"
-       y="44.831184"
-       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1"
-       id="rect10365"
-       width="10"
-       height="7.5454545"
-       x="-43"
-       y="11.454545" />
-    <rect
-       style="fill:#000080;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect16478"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#800000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19107"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#b00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19109"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#b0b000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19111"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.538849"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#0000b0;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19113"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#0000f0;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19115"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19117"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.723278"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#f0f000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19119"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24390"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="26.132593"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#0000f0;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24392"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#b0b000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24394"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#000080;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24396"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#000080;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24398"
-       width="8.6068287"
-       height="8.6778221"
-       x="-11.682427"
-       y="0.20279986"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#800000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24400"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24404"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#b0b000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24406"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.519249"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-  </g>
-</svg>
Binary file client/digitallibrary/img/digilib-notfound.png has changed
--- a/client/digitallibrary/img/digilib-notfound.svg	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg1307"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="C:\temp"
-   sodipodi:docname="digilib-notfound.svg">
-  <defs
-     id="defs1309" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.2782051"
-     inkscape:cx="34.898932"
-     inkscape:cy="35.775981"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4">
-    <sodipodi:guide
-       orientation="vertical"
-       position="-1.9327861"
-       id="guide23493" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata1312">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect1319"
-       width="34.523312"
-       height="42.631897"
-       x="-73.168289"
-       y="40.459969"
-       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect8613"
-       width="2.4545455"
-       height="0"
-       x="58.545456"
-       y="6" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect9490"
-       width="18.989349"
-       height="30.290173"
-       x="-63.894802"
-       y="44.831184"
-       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
-    <rect
-       style="fill:#c5c5c5;fill-opacity:1"
-       id="rect10365"
-       width="10"
-       height="7.5454545"
-       x="-43"
-       y="11.454545" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect16478"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19107"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19109"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19111"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.538849"
-       y="0.25004297"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19113"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19115"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19117"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.723278"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect19119"
-       width="8.6068287"
-       height="8.6778221"
-       x="-28.961241"
-       y="8.9278679"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24390"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.568077"
-       y="26.132593"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24392"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24394"
-       width="8.6068287"
-       height="8.6778221"
-       x="-20.289255"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24396"
-       width="8.6068287"
-       height="8.6778221"
-       x="-29.251465"
-       y="25.880625"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24398"
-       width="8.6068287"
-       height="8.6778221"
-       x="-11.682427"
-       y="0.20279986"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24400"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24404"
-       width="8.6068287"
-       height="8.6778221"
-       x="-12.021473"
-       y="34.880619"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <rect
-       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-       id="rect24406"
-       width="8.6068287"
-       height="8.6778221"
-       x="-37.519249"
-       y="17.202801"
-       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
-    <text
-       xml:space="preserve"
-       style="font-size:62.7486763px;font-style:normal;font-weight:normal;fill:#058200;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="27.729532"
-       y="49.141472"
-       id="text3132"
-       transform="scale(1.023781,0.976772)"><tspan
-         sodipodi:role="line"
-         id="tspan3134"
-         x="27.729532"
-         y="49.141472">?</tspan></text>
-  </g>
-</svg>
Binary file client/digitallibrary/img/down.gif has changed
Binary file client/digitallibrary/img/left.gif has changed
Binary file client/digitallibrary/img/mark1.gif has changed
Binary file client/digitallibrary/img/mark2.gif has changed
Binary file client/digitallibrary/img/mark3.gif has changed
Binary file client/digitallibrary/img/mark4.gif has changed
Binary file client/digitallibrary/img/mark5.gif has changed
Binary file client/digitallibrary/img/mark6.gif has changed
Binary file client/digitallibrary/img/mark7.gif has changed
Binary file client/digitallibrary/img/mark8.gif has changed
Binary file client/digitallibrary/img/olinks.gif has changed
Binary file client/digitallibrary/img/orechts.gif has changed
Binary file client/digitallibrary/img/right.gif has changed
Binary file client/digitallibrary/img/ulinks.gif has changed
Binary file client/digitallibrary/img/up.gif has changed
Binary file client/digitallibrary/img/urechts.gif has changed
Binary file client/digitallibrary/oldskin/buttons/back0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/back1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/background0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/background1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/description0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/description1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/digicat0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/digicat1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/download0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/download1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/fullpage0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/fullpage1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/glossar0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/help0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/home0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/home1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/makepdf0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/makepdf1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/mark.gif has changed
Binary file client/digitallibrary/oldskin/buttons/mark0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/mark1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/matrix0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/matrix1.gif has changed
--- a/client/digitallibrary/oldskin/buttons/menu.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,240 +0,0 @@
-function checkBrowser() {
-
-	this.ua    = navigator.userAgent;
-	this.ver   = navigator.appVersion;
-	this.dom   = ( document.getElementById );
-	this.opera = ( this.dom ) && ( this.ua.toLowerCase().indexOf("opera") > -1 );
-	this.ie4   = ( document.all ) && ( !this.dom );
-	this.ie5   = ( this.ver.indexOf("MSIE 5") > -1 ) && ( this.dom );
-	this.ie6   = ( this.ver.indexOf("MSIE 6") > -1 ) && ( this.dom );
-	this.ns4   = ( document.layers ) && ( !this.dom );
-	this.ns6   = ( this.dom ) && ( parseInt(this.ver) >= 5 ) && ( !this.opera );
-	this.ns    = this.ns4 || this.ns6;
-	this.ie    = this.ie4 || this.ie5 || this.ie6;
-
-	return this;
-}
-
-browser = new checkBrowser();
-
-function changeBc(obj, color){
-	var div;
-
-	if (color == '' && browser.ns4) color = null;
-
-	if (browser.ns4) div = document.layers[obj];
-	else if (browser.dom) div = document.getElementById(obj).style;
-	else if (browser.ie) div = document.all[obj].style;
-
-	if (browser.dom || browser.ie) div.backgroundColor = color;
-	if (browser.ns4) div.bgColor = color;
-}
-
-function makeArray(n){
-	this.length = n;
-	for (var i = 0; i < n; i++) {
-		this[i] = new Image();
-	}
-
-	return this;
-}
-
-function preloadImages() {
-	over = new makeArray(document.images.length);
-	away = new makeArray(document.images.length);
-
-	for (i = 0; i < document.images.length; i++) {
-		currName = document.images[i].src.slice(0, document.images[i].src.lastIndexOf('.')-1);
-		away[i].src = currName + "0.gif";
-		over[i].src = currName + "1.gif";
-	}
-}
-
-function overButton(n) {
-	currButton = document.images[n];
-
-	currButton.src = over[n].src;
-	if (showHelp) contextHelp(n);
-}
-
-function awayButton(n) {
-	currButton = document.images[n];
-
-	currButton.src = away[n].src;
-}
-
-function overItem(obj) {
-	changeBc("menu" + obj, '#770000');
-	clearTimeout(timeID);
-}
-
-function awayItem(obj) {
-	changeBc("menu" + obj, '#666666');
-	timeID = setTimeout("hideMenu()", 700);
-}
-
-var timeID = null;
-
-function changeMark(obj) {
-	var object;
-
-	if (browser.ns4) object = document.layers["menu" + obj].document.images[0];
-	else if (browser.dom) object = document.getElementById("mark" + obj);
-	else if (browser.ie) object = document.all["mark" + obj];
-	
-	var path = object.src.slice(0, object.src.lastIndexOf('/')+1);
-	
-	object.src = (object.src.indexOf("nomark") > -1) ? path + "mark.gif" : path + "nomark.gif";
-}
-
-function showMenu(obj) {
-	menu(obj, true);
-}
-
-function menu(obj, show) {
-	var currObj = "menu" + obj;
-	var idx = 0;
-	while(true) {
-		if (browser.ns4 && document.layers[currObj]) document.layers[currObj].visibility = (show) ? "show" : "hide";
-		else if (browser.dom && document.getElementById(currObj)) document.getElementById(currObj).style.visibility = (show) ? "visible" : "hidden";
-		else if (browser.ie && document.all[currObj]) document.all[currObj].style.visibility = (show) ? "visible" : "hidden";
-		else break;
-		
-		currObj = "menu" + obj + (++idx);
-	}
-	if (!show) activeMenu = '';
-	else activeMenu = obj;
-
-	timeID = setTimeout("hideMenu()", 2000);
-}
-
-function hideMenu() {
-	if (activeMenu != '') menu(activeMenu, false);
-	clearTimeout(timeID);
-}
-
-var activeMenu = '';
-
-
-// just to be sure, that no buffer overflow can arrive
-var semaphor = true;
-
-function contextHelp(n) {
-
-	if (helpWindow.closed) {
-		changeMark(31);
-		changeHelp();
-		return;
-	}
-
-	if ((navigator.appVersion.indexOf("Macintosh") < 0) && semaphor) {
-		semaphor = false;	
-		var help = helpText[n].split("|");
-	
-		helpWindow.focus();
-		helpWindow.document.open();
-		helpWindow.document.write('<html><head><title>Context Help</title>');
-		helpWindow.document.write('<style type="text/css">');
-		helpWindow.document.write('.title {font-family: Verdana, sans-serif, Arial; font-size: 12px; font-weight: bold; color: #FFFFFF}');
-		helpWindow.document.write('.text {font-family: Verdana, sans-serif, Arial; font-size: 10px; color: #000000}');
-		helpWindow.document.write('</style></head><body bgcolor="#CCCCCC" leftmargin="7" topmargin="7" marginwidth="7" marginheight="7" onload="opener.semaphor = true;">');
-		helpWindow.document.write('<table width="99%" border="0" cellspacing="0" cellpadding="3"><tr><td bgcolor="#666666" class="title">');
-		helpWindow.document.write(help[0] + '</tr><tr><td class="text">');
-		helpWindow.document.write(help[1] + '</tr></td></table></body></html>');
-		helpWindow.document.close();	
-
-		// stupid workaround because of netscape 6, that doesen't know the opener property
-		// this workaround is still ok because netscape 6 has eventbuffer checks so no overflow
-    	if (browser.ns6) {
-        	semaphor = true;
-		}
-
-		// next stupid workaround because of opera 6, that somehow don't start the 'onLoad'-
-		// attribute in the body tag (the helpwindow does not finish loading)
-    	if (browser.opera) {
-        	setTimeout("semaphor = true;", 50);
-		}
-
-	}
-}
-
-function openContextHelp() {
-	if (navigator.appVersion.indexOf("Macintosh") > -1) {
-		openContextHelpMac();
-		return;
-	}
-
-	semaphor = false;
-	
-	var winWidth = 270;
-	var winHeight = 130;
-
-	var xScreen = 0.9*(screen.width-winWidth);
-	var yScreen = 0.8*(screen.height-winHeight);
-
-	helpWindow = window.open("", "ContextHelp", "width=" + winWidth + ",height=" + winHeight + ",screenX=" + xScreen + ",screenY=" + yScreen + ",left=" + xScreen + ",top=" + yScreen);
-
-	helpWindow.focus();
-	helpWindow.document.open();
-	helpWindow.document.write('<html><head><title>Context Help</title>');
-	helpWindow.document.write('<style type="text/css">');
-	helpWindow.document.write('.title {font-family: Verdana, sans-serif, Arial; font-size: 12px; font-weight: bold; color: #FFFFFF}');
-	helpWindow.document.write('.text {font-family: Verdana, sans-serif, Arial; font-size: 10px; color: #000000}');
-	helpWindow.document.write('</style></head><body bgcolor="#CCCCCC" leftmargin="7" topmargin="7" marginwidth="7" marginheight="7">');
-	helpWindow.document.write('<table width="99%" border="0" cellspacing="0" cellpadding="3"><tr><td bgcolor="#666666" class="title">');
-	helpWindow.document.write('Context Help</tr><tr><td class="text">');
-	helpWindow.document.write('Move over any button to get some more information about its function</tr></td></table></body></html>');
-	helpWindow.document.close();
-	
-	// for some safety reason help-requests have to be blocked while opening the window
-	setTimeout("semaphor = true;", 200);
-}
-
-// because macs have a strange window focus behaviour we have to go a special
-// way for them - just opening a window that contains all button-descriptions
-function openContextHelpMac() {
-
-	var winWidth = 270;
-	var winHeight = 600;
-
-	var xScreen = 0.9*(screen.width-winWidth);
-	var yScreen = 0.8*(screen.height-winHeight);
-
-	helpWindow = window.open("", "ContextHelp", "width=" + winWidth + ",height=" + winHeight + ",screenX=" + xScreen + ",screenY=" + yScreen + ",left=" + xScreen + ",top=" + yScreen + ",scrollbars");
-
-	helpWindow.focus();
-	helpWindow.document.open();
-	helpWindow.document.write('<html><head><title>Context Help Macintosh</title>');
-	helpWindow.document.write('<style type="text/css">');
-	helpWindow.document.write('.title {font-family: Verdana, sans-serif, Arial; font-size: 12px; font-weight: bold; color: #FFFFFF}');
-	helpWindow.document.write('.text {font-family: Verdana, sans-serif, Arial; font-size: 10px; color: #000000}');
-	helpWindow.document.write('</style></head><body bgcolor="#CCCCCC" leftmargin="7" topmargin="7" marginwidth="7" marginheight="7">');
-	helpWindow.document.write('<table width="99%" border="0" cellspacing="0" cellpadding="3">');
-
-	for (n = 0; n < helpText.length; n++) {
-
-		help = helpText[n].split("|");
-		helpWindow.document.write('<tr><td bgcolor="#666666" class="title">');
-		helpWindow.document.write(help[0] + '</tr><tr><td class="text">');
-		helpWindow.document.write('<p>' + help[1] + '<br>&nbsp;</p></tr></td>');
-	}
-	helpWindow.document.write('</table></body></html>');
-	helpWindow.document.close();
-}
-
-
-function closeContextHelp() {
-	if (helpWindow != '' && !helpWindow.closed) {
-		helpWindow.close();
-	}
-	helpWindow = '';
-}
-
-function changeHelp() {
-	showHelp = !showHelp;
-	showHelp ? openContextHelp() : closeContextHelp();
-}
-
-
-// variable containing the contextwindow
-var helpWindow = '';
\ No newline at end of file
Binary file client/digitallibrary/oldskin/buttons/moveto0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/moveto1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/newwindow0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/newwindow1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/next0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/next1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/nomark.gif has changed
Binary file client/digitallibrary/oldskin/buttons/page0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/page1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/questionmark0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/questionmark1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/reference0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/reference1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/refresh0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/refresh1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/relation0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/relation1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/scale0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/scale1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/spacer.gif has changed
Binary file client/digitallibrary/oldskin/buttons/type0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/type1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/work0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/work1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoomarea0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoomarea1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoomin0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoomin1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoomout0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoomout1.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoompoint0.gif has changed
Binary file client/digitallibrary/oldskin/buttons/zoompoint1.gif has changed
--- a/client/digitallibrary/oldskin/dcMain.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-<%@ page language="java" %><%!
-// authentication stuff - robert
-// -----------------------------
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%><%
-
-// parsing the query
-// -----------------
-
-digilib.servlet.DigilibRequest dcRequest = new digilib.servlet.DigilibRequest(request);
-// check if authentication is needed and redirect if necessary
-docBean.doAuthentication(dcRequest, response);
-// set number of pages  
-dcRequest.setValue("pt", docBean.getNumPages(dcRequest));
-// chop off /oldskin -- ugly ;-(
-String baseUrl = dcRequest.getAsString("base.url");
-int p = baseUrl.lastIndexOf("/oldskin");
-if (p > 0) {
-   baseUrl = baseUrl.substring(0, p);
-}
-%>
-<html>
-<head>
-<script type="text/javascript" src="../baselib.js"></script>
-<script type="text/javascript" src="dclib.js"></script>
-<script type="text/javascript">
-base_init();
-var baseUrl = "<%= baseUrl %>";
-newParameter('fn', '', 1);
-newParameter('pn', 1, 1);
-newParameter('pt', 9, 9);
-newParameter('mx', '6x4', 1);
-newParameter('mo', '', 1);
-newParameter('dw', 0, 1);
-newParameter('dh', 0, 1);
-dc_init();
-</script>
-
-<style type="text/css">
-td {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: #FFFFFF;
-  text-align: center;
-  vertical-align: middle;
-}
-.number {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: #FFFFFF;
-  padding-top: 2px;
-}
-.nonumber {
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 11px;
-  color: #000000;
-  padding-top: 2px;
-}
-</style>
-</head>
-
-<body bgcolor="#666666">
-
-<div align="center">
-<script type="text/javascript">
-  dc_render(document);
-</script>
-</div>
-
-</body>
-
-</html>
--- a/client/digitallibrary/oldskin/dcMenu.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-.menu1 {position:absolute; top:122; left:41; width:44; height:138; clip:rect(0,44,138,0); visibility:hidden}
-.item1 {position:absolute; left:43; width:40; height:14; clip:rect(0,40,14,0); visibility:hidden}
-
-.text {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none}
-</style>
-<script language="JavaScript" src="buttons/menu.js"></script>
-<script language="JavaScript">
-// because on a netscape 4.xx bug (messing up with layers on resize) we cache the window
-// resize event and redisplay the navigation frame
-if (document.layers && !document.getElementById) {
-	window.onresize = function() {parent.rightFrame.location.reload();}
-}
-
-function reloadTable(row, col) {
-    parent.mainFrame.setParameter("mx", row+"x"+col);
-    parent.mainFrame.display();
-}
-
-// turn off the contexthelp
-var showHelp = false;
-</script>
-</head>
-
-<body bgcolor="#CCCCCC" leftmargin="8" marginwidth="8" topmargin="20" marginheight="20" onload="preloadImages();">
-<a href="javascript:parent.mainFrame.Backpage()" onmouseover="overButton(0)" onmouseout="awayButton(0)"><img src="buttons/back0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:parent.mainFrame.Nextpage()" onmouseover="overButton(1)" onmouseout="awayButton(1)"><img src="buttons/next0.gif" width="73" height="30" border="0"></a><br><br>
-<a href="javascript:hideMenu();showMenu(1);" onmouseover="overButton(2)" onmouseout="awayButton(2)"><img src="buttons/matrix0.gif" width="73" height="30" border="0"></a><br>
-
-<div id="menu1" class="menu1"></div>
- <div id="menu11" class="item1" style="top:124"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(1, 2); return false;" onmouseover="overItem(11)" onmouseout="awayItem(11)">1x2</a></center></div>
- <div id="menu12" class="item1" style="top:139"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(2, 3); return false;" onmouseover="overItem(12)" onmouseout="awayItem(12)">2x3</a></center></div>
- <div id="menu13" class="item1" style="top:154"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(2, 4); return false;" onmouseover="overItem(13)" onmouseout="awayItem(13)">2x4</a></center></div>
- <div id="menu14" class="item1" style="top:169"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 2); return false;" onmouseover="overItem(14)" onmouseout="awayItem(14)">3x2</a></center></div>
- <div id="menu15" class="item1" style="top:184"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 3); return false;" onmouseover="overItem(15)" onmouseout="awayItem(15)">3x3</a></center></div>
- <div id="menu16" class="item1" style="top:199"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 4); return false;" onmouseover="overItem(16)" onmouseout="awayItem(16)">3x4</a></center></div>
- <div id="menu17" class="item1" style="top:214"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 5); return false;" onmouseover="overItem(17)" onmouseout="awayItem(17)">3x5</a></center></div>
- <div id="menu18" class="item1" style="top:229"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(4, 5); return false;" onmouseover="overItem(18)" onmouseout="awayItem(18)">4x5</a></center></div>
- <div id="menu19" class="item1" style="top:244"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(4, 6); return false;" onmouseover="overItem(19)" onmouseout="awayItem(19)">4x6</a></center></div>
-
-<script language="Javascript">
-// initial background color of the menues (has to be done like this, 
-// otherwise menues in ns4 you will have wrong dimensions)
-changeBc("menu1", "#666666");
-</script>
-</body>
-</html>
\ No newline at end of file
--- a/client/digitallibrary/oldskin/dclib.js	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-Copyright (C) 2003-2004 WTWG Uni Bern, MPIWG Berlin
- 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
- 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
- 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- 
-Author: 
-  Christian Luginbuehl, 07.04.2004 , Version Alcatraz 0.6
-  Robert Casties 28.10.2004
-
-!! requires baselib.js !!
-
-*/
-
-function identify() {
-  return 'Digicat v0.4';
-}
-
-var cells = null;
-
-
-function dc_init() {
-  // put the query parameters (sans "?") in the parameters array
-  parseParameters(location.search.slice(1));
-}
-
-function display(detail) {
-    // redisplay the page
-    if (! detail) {
-	detail = 9;
-    }
-    var queryString = getAllParameters(detail);
-    location.href = location.protocol + "//" + location.host + location.pathname + "?" + queryString;
-}
-
-function dc_render(doc) {
-    // creates the HTML for the image table
-    var wsize = getWinSize();
-    var fWidth  = wsize.width;
-    var fHeight = wsize.height;
-
-    var mx = getParameter("mx");
-    cells = mx.split('x');
-  
-    var dw = getParameter("dw");
-    var dh = getParameter("dh");
-    var pt = getParameter("pt");
-    var pn = parseInt(getParameter("pn"));
-    var fn = getParameter("fn");
-    var par_mo = (hasParameter("mo")) ? "&mo="+getParameter("mo") : "";
-
-    var picWidth = (dw != 0) ? dw : Math.floor((fWidth-30)/cells[0])-2*cells[0]-1;
-    var picHeight = (dh != 0) ? dh : picWidth;
-
-    if (cells.length > 1) {
-	picHeight = (dh != 0) ? dh : Math.floor(((fHeight-30)-12*cells[1])/cells[1])-2*cells[1]-1;
-    } else {
-	cells[1] = Math.ceil(pt/cells[0]);
-    }
-
-    var cellWidth  = parseInt(picWidth)+8;
-    var cellHeight = parseInt(picHeight)+18;
-
-    doc.writeln('<table width="100%" height="100%" border="0" cellspacing="1" cellpadding="0">');
-
-    for (var j = 0; j < cells[1]; j++) {
-	doc.writeln('<tr>');
-	for (var i = 0; i < cells[0]; i++) {
-	    var idx  = pn+i+j*cells[0];
-	    var img  = baseUrl + "/servlet/Scaler?fn=" + fn + "&pn=" + idx;
-	    img += "&dw=" + picWidth + "&dh=" + picHeight + par_mo;
-	    doc.write('<td width="'+cellWidth+'" height="'+cellHeight+'">');
-	    if (idx <= pt) {
-		doc.write('<a href="'+dl_link(idx)+'" target="_blank"><img src="'+img+'" border="0"></a><div class="number">'+idx+'</div>');
-	    } else {
-		doc.write('<div class="nonumber">'+idx+'</div>');
-	    }
-	    doc.writeln('</td>');
-	}
-	doc.writeln(' </tr>');
-    }
-    doc.writeln('</table>');
-}
-
-
-function dl_link(i) {
-    var link = baseUrl+"/digilib.jsp?fn="+getParameter("fn")+"&pn="+i+"&mo="+getParameter("mo");
-    return link;
-}  
-
-
-function Backpage() {
-    var pn = parseInt(getParameter("pn"));
-    if (pn <= 1) {
-	pn = 1;
-        alert("You are already on the first page!");
-    }
-
-    pn = pn - parseInt(cells[0]*cells[1]);
-
-    if (pn < 1) {
-    	pn = 1;
-    }
-    setParameter("pn", pn);
-    display();
-}
-
-function Nextpage() {
-    var pn = parseInt(getParameter("pn"));
-    pn = pn + parseInt(cells[0]*cells[1]);
-    setParameter("pn", pn);
-    display();
-}
--- a/client/digitallibrary/oldskin/dlMenu.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-.menu {position:absolute; visibility:hidden}
-
-.item1 {position:absolute; left:33; width:50; height:14; clip:rect(0,50,14,0); visibility:hidden}
-.item2 {position:absolute; left:43; width:40; height:14; clip:rect(0,40,14,0); visibility:hidden}
-.item3 {position:absolute; left:3; width:80; height:14; clip:rect(0,80,14,0); visibility:hidden}
-.logo { margin-left: 5px; margin-top: 10px; }
-
-.text {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none}
-</style>
-<script language="JavaScript" src="buttons/menu.js"></script>
-
-<script language="JavaScript">
-// because on a netscape 4.xx bug (messing up with layers on resize) we cache the window
-// resize event and redisplay the navigation frame
-if (document.layers && !document.getElementById) {
-    window.onresize = function() {parent.rightFrame.location.reload();}
-}
-
-/**
- * overriding 'page' in navigation.js
- */
-function page(page, keep) {
-
-    parent.mainFrame.gotoPage(page, keep);
-    if (parent.pageFrame.show) {
-      parent.pageFrame.show();
-    } else {
-      parent.pageFrame.location.reload();
-    }
-}
-
-/*
- * new display function to refresh the pagesTotal frame
- */
-
-function display(detail) {
-    if (parent.pageFrame.show) {
-      parent.pageFrame.show();
-    } else {
-      parent.pageFrame.location.reload();
-    }
-    parent.mainFrame.display(detail);
-}
-
-
-function askPage() {
-    do {
-	p = prompt("Goto Page:", 1);
-    } while ((p != null) && (p < 1));
-    page(p);
-}
-
-function showRef(select) {
-    var hyperlinkRef = parent.mainFrame.baseUrl + "/digilib.jsp?";
-    hyperlinkRef += parent.mainFrame.getAllParameters();
-    if ( select == 0 ) {
-	prompt("Link for LaTeX-documents", "\\href{" + hyperlinkRef + "}{TEXT}");
-    } else if ( select == 1 ) {
-	prompt("Link for HTML-documents", hyperlinkRef);
-    }
-}
-
-function setSize(size) {
-    parent.mainFrame.setParameter('ws', size);
-    display();
-}
-
-function digicat() {
-    var fn = parent.mainFrame.getParameter("fn");
-    var pn = parent.mainFrame.getParameter("pn");
-    var url = parent.mainFrame.baseUrl + "/digicat.jsp?fn=" + fn + "&pn=" + pn;
-    win = window.open(url, "digicat");
-    win.focus();
-}
-
-// boolean variable to either show or not show the additional help
-// change in the menuitem its original mark
-var showHelp = false;
-
-// variable to tell if while changing to another page it should keep the area
-// change in the menuitem its original mark
-var keepArea = false;
-
-
-// variable that store the texts for contexthelp
-var helpText = new Array();
-
-helpText[0]  = "'back'-button|Click on this button to load the previous image (usually the next page from a manuscript).";
-helpText[1]  = "'next'-button|Click on this button to load the next image (usually the next page from a manuscript).";
-helpText[2]  = "'page'-button|After clicking 'page' you will be prompted for a specific page you want to see.<br>Note that the page number refers to the same serie you are in now.";
-helpText[3]  = "'digicat'-button|Click here to open a new window containing thumbnails of the current series pages to navigate.";
-helpText[4]  = "'mark'-button|You can set marks into the picture. After hitting 'mark' you have to click on the desired picures location, a numbered mark appears.<br>Check out 'reference' to make these marks (up to 8) visible for others.";
-helpText[5]  = "'reference'-button|Choose LaTeX or HTML mode to get a link for the actual (zoomed) picture with all set marks.<br>This link can easily be included in a TeX- or HTML-formatted document/page.";
-helpText[6]  = "'zoom area'-button|With 'zoom area' you can zoom into any rectangular field for the current picture.<br>After clicking on the button click on the image to set any corner (ex. topleft), release the mousebutton and move the mouse until you have the desired size, then click again.";
-helpText[7]  = "'zoom in'-button|Clicking on 'zoom in' zooms in around the current center.";
-helpText[8]  = "'zoom out'-button|Clicking on 'zoom out' zooms out around the current center.";
-helpText[9]  = "'full page'-button|To gain the original unzoomed picture, click on 'full page'.<br>Note that any set marks are still saved at their positions.";
-helpText[10] = "'size'-button|By clicking on one of the menu entries you can select the size of the currently displayed picture in relation to your browser window.<br>Note: a scale factor of '1.0' means that the picture fits right into the working area, while '2.0' means that it will be twice as high and wide.";
-helpText[11] = "'?'-button|In its menu you are able change options like the visibility of this contextsensitive help, with 'Keep area' digilib keeps its current zoom area when changing to another page.";
-
-</script>
-</head>
-
-<body bgcolor="#CCCCCC" leftmargin="8" marginwidth="8" topmargin="5" marginheight="5" onload="preloadImages()" onunload="closeContextHelp()">
-
-<a href="javascript:page('-1', keepArea)" onmouseover="overButton(0)" onmouseout="awayButton(0)"><img src="buttons/back0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:page('+1', keepArea)" onmouseover="overButton(1)" onmouseout="awayButton(1)"><img src="buttons/next0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:askPage()" onmouseover="overButton(2)" onmouseout="awayButton(2)"><img src="buttons/page0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:digicat()" onmouseover="overButton(3)" onmouseout="awayButton(3)"><img src="buttons/digicat0.gif" width="73" height="30" border="0"></a><br><br>
-<a href="javascript:parent.mainFrame.setMark(false);" onmouseover="overButton(4)" onmouseout="awayButton(4)"><img src="buttons/mark0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:hideMenu(); showMenu(1)" onmouseover="overButton(5)" onmouseout="awayButton(5)"><img src="buttons/reference0.gif" width="73" height="30" border="0"></a><br><br>
-<a href="javascript:parent.mainFrame.zoomArea()" onmouseover="overButton(6)" onmouseout="awayButton(6)"><img src="buttons/zoomarea0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:parent.mainFrame.zoomBy(1.4142)" onmouseover="overButton(7)" onmouseout="awayButton(7)"><img src="buttons/zoomin0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:parent.mainFrame.zoomBy(0.7071)" onmouseover="overButton(8)" onmouseout="awayButton(8)"><img src="buttons/zoomout0.gif" width="73" height="30" border="0"></a><br>
-<a href="javascript:parent.mainFrame.zoomFullpage()" onmouseover="overButton(9)" onmouseout="awayButton(9)"><img src="buttons/fullpage0.gif" width="73" height="30" border="0"></a><br><br>
-<a href="javascript:hideMenu(); showMenu(2)" onmouseover="overButton(10)" onmouseout="awayButton(10)"><img src="buttons/scale0.gif" width="73" height="30" border="0"></a><br><br>
-<a href="javascript:hideMenu(); showMenu(3)" onmouseover="overButton(11)" onmouseout="awayButton(11)"><img src="buttons/questionmark0.gif" width="73" height="30" border="0"></a><br><br>
-
-<div id="menu1" class="menu" style="top:201; left:31; width:54; height:33; clip:rect(0,54,33,0)"></div>
- <div id="menu11" class="item1" style="top:203"><center><a href="#" class="text" onClick="hideMenu(); showRef(0); return false;" onmouseover="overItem(11)" onmouseout="awayItem(11)">LaTeX</a></center></div>
- <div id="menu12" class="item1" style="top:218"><center><a href="#" class="text" onClick="hideMenu(); showRef(1); return false;" onmouseover="overItem(12)" onmouseout="awayItem(12)">HTML</a></center></div>
-
-<div id="menu2" class="menu" style="top:379; left:41; width:44; height:93; clip:rect(0,44,93,0)"></div>
- <div id="menu21" class="item2" style="top:381"><center><a href="#" class="text" onClick="hideMenu(); setSize(0.7); return false;" onmouseover="overItem(21)" onmouseout="awayItem(21)">0.7</a></center></div>
- <div id="menu22" class="item2" style="top:396"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.0); return false;" onmouseover="overItem(22)" onmouseout="awayItem(22)">1.0</a></center></div>
- <div id="menu23" class="item2" style="top:411"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.5); return false;" onmouseover="overItem(23)" onmouseout="awayItem(23)">1.5</a></center></div>
- <div id="menu24" class="item2" style="top:426"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.0); return false;" onmouseover="overItem(24)" onmouseout="awayItem(24)">2.0</a></center></div>
- <div id="menu25" class="item2" style="top:441"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.5); return false;" onmouseover="overItem(25)" onmouseout="awayItem(25)">2.5</a></center></div>
- <div id="menu26" class="item2" style="top:456"><center><a href="#" class="text" onClick="hideMenu(); setSize(3.0); return false;" onmouseover="overItem(26)" onmouseout="awayItem(26)">3.0</a></center></div>
-
-<div id="menu3" class="menu" style="top:430; left:1; width:84; height:33; clip:rect(0,84,33,0)"></div>
- <div id="menu31" class="item3" style="top:432"><center><a href="#" class="text" onclick="changeMark(31); hideMenu(); changeHelp(); return false;" onmouseover="overItem(31)" onmouseout="awayItem(31)"><img id="mark31" src="buttons/nomark.gif" border="0">Contexthelp</a></center></div>
- <div id="menu32" class="item3" style="top:447"><center><a href="#" class="text" onclick="changeMark(32); keepArea = (keepArea) ? false : true; return false;" onmouseover="overItem(32)" onmouseout="awayItem(32)"><img id="mark32" src="buttons/nomark.gif" border="0">Keep&nbsp;area</a></center></div>
-<!-- <div id="logo" class="logo">
- 	<a href="http://digilib.berlios.de" target="_blank" >
- 		<img border="0" src="../img/digilib-logo-text1.png" title="digilib"></img>
-	</a>
- </div> -->
-
-<script language="Javascript">
-// initial background color of the menues (has to be done like this, 
-// otherwise menues in ns4 you will have wrong dimensions)
-changeBc("menu1", "#666666");
-changeBc("menu2", "#666666");
-changeBc("menu3", "#666666");
-</script>
-</body>
-</html>
--- a/client/digitallibrary/oldskin/pageWin.html	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<html>
-<head>
-<script type="text/javascript">
-var pn = "-";
-var pt = "-";
-if ((parent.mainFrame.getParameter)&&(parent.mainFrame.getParameter("pn"))) {
-    pt = parent.mainFrame.getParameter("pt");
-    pn = parent.mainFrame.getParameter("pn");
-} else {
-    // if the mainFrame is not ready then wait
-    setTimeout("show()", 500);
-}
-
-function show() {
-  location.reload();
-}
-</script>
-</head>
-<body bgcolor="#CCCCCC" topmargin="5" marginheight="5">
-<p style="font-family: Verdana, Arial, Helvetica, sans-serif; text-align: center; color: #CC3333; font-size: 11px">
-    <script type="text/javascript">document.write(pn+'<b> of </b>'+pt);</script>
-</p>
-</body>
-</html>
--- a/client/digitallibrary/pdf/error.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Error</title>
-</head>
-<body>
-<h1>Error</h1>
-There was an error while processing your request. Please check the parameters and try again.
-</body>
-</html>
--- a/client/digitallibrary/pdf/wip.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="refresh" content="10">
-<title>Work in progress ...</title>
-</head>
-<body>
-<h1>Please wait ...</h1>
-your request is being processed. The download starts automatically when the document is finished. 
-</body>
-</html>
--- a/client/digitallibrary/server/dlCache.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<%@ page language="java" %>
-
-<%!
-// authentication stuff - robert
-// -----------------------------
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%>
-
-<%
-// get digilib config
-digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
-// dir cache
-digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-%>
-
-<html>
-<head>
-<title>Digilib cache info</title>
-</head>
-
-<h1>Digilib cache info</h1>
-
-
- <table>
-  <tr>
-	<td>size (directories)</td><td><b><%= dirCache.size() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>numFiles</td><td><b><%= dirCache.getNumFiles() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>hits</td><td><b><%= dirCache.getHits() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>misses</td><td><b><%= dirCache.getMisses() %></b></td>
-    <td></td>
-  </tr>
-</table>
-
-<table>
-<%
-    Object[] keys = dirCache.getChildren("", true).toArray();
-    java.util.Arrays.sort(keys);
-    int l = keys.length;
-    for (int i = 0; i < l; i++) {
-	String key = (String) keys[i];
-	//	digilib.io.DocuDirectory val = (digilib.io.DocuDirectory) dirCache.getDirectory(key);
-%>
-  <tr>
-       <td valign="top"><%= key %></td><td><b><%= 1 /* val.getDirName() */ %></b></td>
-    <td></td>
-  </tr>
-<%
-       }
-%>
-</table>
-
-</body>
-</html>
--- a/client/digitallibrary/server/dlConfig.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-<%@page import="digilib.util.DigilibJobCenter"%>
-<%@ page language="java" %>
-
-<%!
-// authentication stuff - robert
-// -----------------------------
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%>
-
-<%
-// get digilib config
-digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
-// parsing the query
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-// add number of pages
-dlRequest.setValue("pt", docBean.getNumPages(dlRequest));
-// dir cache
-digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-// image JobCenter
-DigilibJobCenter imageProcessor =  (DigilibJobCenter)dlConfig.getValue("servlet.worker.imageexecutor");        
-
-%>
-
-<html>
-<head>
-<title>Digilib configuration page</title>
-</head>
-<body>
-
-<h1>Global servlet configuration</h1>
-
-<table>
-<%
-    Object[] keys = dlConfig.getParams().keySet().toArray();
-    java.util.Arrays.sort(keys);
-    int l = keys.length;
-    for (int i = 0; i < l; i++) {
-	String key = (String) keys[i];
-	String val = dlConfig.getAsString(key);
-	if (key.equals("basedir-list")) {
-	    String[] bd = (String[]) dlConfig.getValue("basedir-list");
-	    val = "";
-	    if (bd != null) {
-		for (int j = 0; j < bd.length; j++) {
-		    val += bd[j] + "<br> ";
-		}
-	    }
-	}
-	if (val.length() == 0) {
-	    val = "(none)";
-	}
-%>
-  <tr>
-    <td valign="top"><%= key %></td><td><b><%= val %></b></td>
-    <td></td>
-  </tr>
-<%
-       }
-%>
-</table>
-
-<h2>Threads</h2>
-
-<table>
-  <tr>
-    <td>currently waiting</td><td><b><%= imageProcessor.getWaitingJobs() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>currently running</td><td><b><%= imageProcessor.getRunningJobs() %></b></td>
-    <td></td>
-  </tr>
-</table>
-
-<h2>Directory cache</h2>
-
-<table>
-  <tr>
-	<td>size (directories)</td><td><b><%= dirCache.size() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>numFiles</td><td><b><%= dirCache.getNumFiles() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>hits</td><td><b><%= dirCache.getHits() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>misses</td><td><b><%= dirCache.getMisses() %></b></td>
-    <td></td>
-  </tr>
-</table>
-
-<h2>JVM configuration</h2>
-
-<table>
-  <tr>
-	<td>java.awt.headless</td><td><b><%= System.getProperty("java.awt.headless") %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>java.version</td><td><b><%= System.getProperty("java.version") %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>java.vendor</td><td><b><%= System.getProperty("java.vendor") %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>os.name</td><td><b><%= System.getProperty("os.name") %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>Runtime.maxMemory</td><td><b><%= Runtime.getRuntime().maxMemory() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>Runtime.totalMemory</td><td><b><%= Runtime.getRuntime().totalMemory() %></b></td>
-    <td></td>
-  </tr>
-  <tr>
-	<td>Runtime.freeMemory</td><td><b><%= Runtime.getRuntime().freeMemory() %></b></td>
-    <td></td>
-  </tr>
-</table>
-
-<h2>DocuImage configuration</h2>
-
-<p>Supported image types</p>
-<ul>
-<% 
-  java.util.Iterator dlfs = dlConfig.getDocuImageInstance().getSupportedFormats();
-  for (Object f = dlfs.next(); dlfs.hasNext(); f = dlfs.next()) {
-%>
-  <li><%= (String)f %></li>
-<% 
-  }
-%>
-</ul>
-
-
-</body>
-</html>
--- a/client/digitallibrary/server/dlRequest.jsp	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-<%@ page language="java" %>
-
-<%!
-// authentication stuff - robert
-// -----------------------------
-// create DocumentBean instance for all JSP requests
-digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
-
-// initialize DocumentBean instance in JSP init
-public void jspInit() {
-    try {
-        // set servlet init-parameter
-        docBean.setConfig(getServletConfig());
-    } catch (javax.servlet.ServletException e) {
-        System.out.println(e);
-    }
-}
-%>
-
-<%
-// get digilib config
-digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
-// parsing the query
-digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
-// add number of pages
-dlRequest.setValue("pt", docBean.getNumPages(dlRequest));
-// dir cache
-digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-%>
-
-<html>
-<head>
-<title>Digilib configuration page</title>
-</head>
-
-<body>
-<h1>Local request information</h1>
-
-<table>
-  <tr>
-    <td>Pt</td><td><b><%= dlRequest.getAsString("pt") %></b></td>
-    <td><i>total number of pages (generated by servlet)</i></td>
-  </tr>
-  <tr>
-    <td>RequestPath</td><td><b><%= dlRequest.getAsString("request.path") %></b></td>
-    <td><i>url of the page/document</i></td>
-  </tr>
-  <tr>
-    <td>Fn</td><td><b><b><%= dlRequest.getAsString("fn") %></b></td><td><i>url of the page/document</i></td>
-  </tr>
-  <tr>
-    <td>FilePath</td><td><b><%= dlRequest.getFilePath() %></b></td><td><i>effective path of the page/document</i></td>
-  </tr>
-  <tr>
-    <td>Pn</td><td><b><%= dlRequest.getAsString("pn") %></b></td><td><i>page number</i></td>
-  </tr>
-  <tr>
-    <td>Dw</td><td><b><%= dlRequest.getAsString("dw") %></b></td><td><i>width of client in pixels</i></td>
-  </tr>
-  <tr>
-    <td>Dh</td><td><b><%= dlRequest.getAsString("dh") %></b></td><td><i>height of client in pixels</i></td>
-  </tr>
-  <tr>
-    <td>Wx</td><td><b><%= dlRequest.getAsString("wx") %></b></td><td><i>left edge of image (float from 0 to 1)</i></td>
-  </tr>
-  <tr>
-    <td>Wy</td><td><b><%= dlRequest.getAsString("wy") %></b></td><td><i>top edge in image (float from 0 to 1)</i></td>
-  </tr>
-  <tr>
-    <td>Ww</td><td><b><%= dlRequest.getAsString("ww") %></b></td><td><i>width of image (float from 0 to 1)</i></td>
-  </tr>
-  <tr>
-    <td>Wh</td><td><b><%= dlRequest.getAsString("wh") %></b></td><td><i>height of image (float from 0 to 1)</i></td>
-  </tr>
-  <tr>
-    <td>Ws</td><td><b><%= dlRequest.getAsString("ws") %></b></td><td><i>scale factor</i></td>
-  </tr>
-  <tr>
-    <td>Mo</td><td><b><%= dlRequest.getAsString("mo") %></b></td><td><i>special options like 'fit' for gifs</i></td>
-  </tr>
-  <tr>
-    <td>Mk</td><td><b><%= dlRequest.getAsString("mk") %></b></td><td><i>marks</i></td>
-  </tr>
-  <tr>
-    <td>BaseURL</td><td colspan="2"><b><%= dlRequest.getAsString("base.url") %></b></td>
-  </tr>
-  <tr>
-    <td></td><td></td><td><i>base URL (from http:// to below /servlet)</i></td>
-  </tr>
-</table>
-
-<h2>All parameters<h2>
-
-<table>
-<%
-    Object[] keys = dlRequest.getParams().keySet().toArray();
-    java.util.Arrays.sort(keys);
-    int l = keys.length;
-    for (int i = 0; i < l; i++) {
-	String key = (String) keys[i];
-	String val = dlRequest.getAsString(key);
-	if (val.length() == 0) {
-	    val = "</b>(none)<b>";
-	}
-%>
-  <tr>
-    <td valign="top"><%= key %></td><td><b><%= val %></b></td>
-    <td><% if (! dlRequest.hasValue(key)) { %> (default) <% } %></td>
-  </tr>
-<%
-       }
-%>
-</table>
-
-
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/pom.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>digilib</artifactId>
+    <groupId>digilib</groupId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
+  <groupId>digilib</groupId>
+  <artifactId>digilib-webapp</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <name>digilib-webapp</name>
+  <description>The Digital Image Library - Client</description>
+  <url>http://digilib.berlios.de</url>
+  <packaging>war</packaging>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+  	<dependency>
+  		<groupId>digilib</groupId>
+  		<artifactId>digilib-servlet</artifactId>
+  		<type>jar</type>
+  		<scope>compile</scope>
+  	</dependency>
+  </dependencies>
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/ImgInfo-json.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,44 @@
+<%@page language="java" 
+	import="digilib.io.FileOps, digilib.io.ImageFileSet, digilib.io.ImageFile, 
+	digilib.util.ImageSize, digilib.servlet.DigilibConfiguration"
+	contentType="application/json"%><%!
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><%
+// parsing the query
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+docBean.setRequest(dlRequest);
+// dir cache
+digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
+digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+// get file
+FileOps.FileClass fc = FileOps.FileClass.IMAGE;
+ImageFileSet imgFile = (ImageFileSet) dirCache.getFile(dlRequest.getFilePath(), dlRequest.getAsInt("pn"), fc);
+
+%>{ <% 
+    if (imgFile != null) {
+		ImageFile img = (ImageFile) imgFile.getBiggest();
+		ImageSize imgSize = img.getSize(); 
+		%>
+  "filename" : "<%= imgFile.getName() %>",
+  "aspect" : <%= imgFile.getAspect() %>,
+  "dpi_x" : <%= imgFile.getResX() %>,
+  "dpi_y" : <%= imgFile.getResY() %><%
+  
+        if (imgSize != null) { 
+            %>,
+  "width" : <%= imgSize.getWidth() %>,
+  "height" : <%= imgSize.getHeight() %>
+<% 		}
+  	} 
+%>}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/WEB-INF/digilib-auth.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Authentication configuration file for Digital Document Library -->
+<auth-config>
+
+  <digilib-paths>
+    <!-- 
+      A user must supply one of the roles under "role"
+      to access the directory "name".
+      Roles under "role" must be separated by comma only (no spaces).  
+    -->
+    <path name="histast/eastwood-collection" role="eastwood-coll" />
+    <path name="ptolemaios_geo" role="ptolemaios-geo" />
+  </digilib-paths>
+
+  <digilib-addresses>
+    <!-- 
+      A computer with an ip address that matches "ip"
+      is automatically granted all roles under "role".
+      The ip address is matched from the left (in full quads).
+      Roles under "role" must be separated by comma only (no spaces). 
+    -->
+    <address ip="127" role="local" />
+    <address ip="130.92.68" role="eastwood-coll,ptolemaios-geo" />
+    <address ip="130.92.151" role="ALL" />
+  </digilib-addresses>
+
+</auth-config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/WEB-INF/digilib-config.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Digilib servlet config file -->
+
+<digilib-config>
+  <!--  Image to be sent to indicate an error or general failure. -->
+  <parameter name="error-image" value="img/digilib-error.png" />
+
+  <!--  Image to be sent to indicate an authorization failure. -->
+  <parameter name="denied-image" value="img/digilib-denied.png" />
+
+  <!--  Image to be sent to indicate that the request was correct, but the specified image could not be ound. -->
+  <parameter name="notfound-image" value="img/digilib-notfound.png" />
+
+  <!-- List of directories where images are searched.
+       Directories with low-resolution images are LAST!!! in list.
+	   Use OS-specific path separators (":" for Unix, ";" for Windows) --> 
+  <parameter name="basedir-list" value="/docuserver/images:/docuserver/scaled/small:/docuserver/scaled/thumb" />
+
+  <!-- Java class to use for image operations -->
+  <parameter name="docuimage-class" value="digilib.image.ImageLoaderDocuImage" />
+
+  <!-- mimimum amount of scaling done with antialiasing -->
+  <parameter name="subsample-minimum" value="2"/>
+  
+  <!-- default interpolation quality (0=worst) -->
+  <parameter name="default-quality" value="2"/>
+  
+  <!-- is sending whole image files with mo=file allowed? -->
+  <parameter name="sendfile-allowed" value="true" />
+
+  <!-- the a maximum size of any sent image. (0 means no limit) -->
+  <parameter name="max-image-size" value="0" />
+
+  <!-- use safe but slow directory indexing -->
+  <parameter name="safe-dir-index" value="false" />
+
+  <!-- number of working threads -->
+  <parameter name="worker-threads" value="2" />
+
+  <!-- number of waiting requests in queue -->
+  <parameter name="max-waiting-threads" value="20" />
+
+  <!-- Restrict access to authorized users.
+       User authentication and roles are provided by the servlet container 
+       (see tomcat-users.xml).
+       Authorization for resources (directories) is evaluated by the servlet 
+       (see auth-file). -->
+  <parameter name="use-authorization" value="false" />
+
+  <!-- URL location of XML file with authorization requirements. -->
+  <parameter name="auth-file" value="digilib-auth.xml" />
+
+  <!-- Part of URL to indicate authenticated access to Tomcat. -->
+  <parameter name="auth-url-path" value="authenticated" />
+  
+  <!-- use mapping of "virtual directories" to real directories on the server -->
+  <parameter name="use-mapping" value="false"/>
+  
+  <!-- location of XML mapping file -->
+  <parameter name="mapping-file" value="digilib-map.xml"/>
+  
+  <!-- location of logger config file -->
+  <parameter name="log-config-file" value="log4j-config.xml"/>
+
+  <!-- location for PDF files while still in progress -->
+  <parameter name="pdf-temp-dir" value="/tmp/pdf_tmp" />
+  
+  <!-- location for PDF files upon completion -->
+  <parameter name="pdf-cache-dir" value="/tmp/pdf_cache"/>
+
+  <!-- number of PDF generation threads -->
+  <parameter name="pdf-worker-threads" value="1" />
+
+  <!-- number of waiting PDF requests in queue -->
+  <parameter name="pdf-max-waiting-threads" value="20" />
+
+  <!-- number of image generation threads for PDF -->
+  <parameter name="pdf-image-worker-threads" value="1" />
+
+  <!-- number of waiting image requests for PDF in queue -->
+  <parameter name="pdf-image-max-waiting-threads" value="10" />
+
+  <!-- logo for PDFs -->
+  <parameter name="pdf-logo" value="http://digilib.berlios.de/images/digilib-logo-big.png" />
+
+  <!-- is the image toolkit allowed to use a disk cache -->
+  <parameter name="img-diskcache-allowed" value="false"/>
+  
+</digilib-config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/WEB-INF/digilib-map.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- mapping of "virtual" and real directories on digilib server -->
+<digilib-aliases>
+  <mapping link="exp1/archimedes/hutto_dicti_1625" dir="lib2/china/QiQi/Vol1"/>
+  <mapping link="exp1/archimedes/kopernicus" dir="pro1/sundries/kop2"/>
+</digilib-aliases>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/WEB-INF/log4j-config.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+        
+  <appender name="cons" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
+    </layout>
+  </appender>
+
+  <appender name="log" class="org.apache.log4j.FileAppender">
+    <param name="File" value="digilib-log.txt"/>
+    <param name="Append" value="true"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
+    </layout>
+  </appender>
+
+  <appender name="account" class="org.apache.log4j.FileAppender">
+    <param name="File" value="dl-access-log.txt"/>
+    <param name="Append" value="true"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %p - %m%n"/>
+    </layout>
+  </appender>
+
+  <logger name="account.request">
+    <level value ="debug"/>
+    <appender-ref ref="account"/>
+  </logger>  
+
+  <root>
+    <level value ="debug"/>
+    <appender-ref ref="cons"/>
+    <appender-ref ref="log"/>
+  </root>
+
+</log4j:configuration>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/WEB-INF/web-3.0.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+        version="3.0"
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+        
+  <!-- General description of your web application -->
+  <display-name>
+        digilib
+  </display-name>
+  <description>
+        This is the web frontend of the Digital Document Library.
+  </description>
+  <!-- The Intialisation Listener (also configured by annotation) -->
+  <listener>
+        <listener-class>
+            digilib.servlet.Initialiser
+        </listener-class>
+  </listener>
+  <!-- The Scaler servlet (also configured by annotation) -->
+  <servlet>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.Scaler
+        </servlet-class>
+        <!-- Load this servlet at server startup time -->
+        <load-on-startup>
+            5
+        </load-on-startup>
+  </servlet>
+  <!-- The Texter servlet -->
+  <servlet>
+        <servlet-name>
+            Texter
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.Texter
+        </servlet-class>
+  </servlet>
+  <!-- The PDFCache servlet -->
+  <servlet>
+        <servlet-name>
+            PDFCache
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.PDFCache
+        </servlet-class>
+  </servlet>
+  <!-- The mapping for the Scaler servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /servlet/Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /Scaler
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /authenticated/servlet/Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+  <!-- The mapping for the Texter servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            Texter
+        </servlet-name>
+        <url-pattern>
+            /servlet/Texter/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Texter
+        </servlet-name>
+        <url-pattern>
+            /authenticated/servlet/Texter/*
+        </url-pattern>
+  </servlet-mapping>
+  <!-- The mapping for the Texter servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            PDFCache
+        </servlet-name>
+        <url-pattern>
+            /servlet/PDFCache/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            PDFCache
+        </servlet-name>
+        <url-pattern>
+            /authenticated/servlet/PDFCache/*
+        </url-pattern>
+  </servlet-mapping>
+  <!-- region for authenticated access -->
+  <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>
+                Authenticated Digilib
+            </web-resource-name>
+            <url-pattern>
+                /authenticated/*
+            </url-pattern>
+        </web-resource-collection>
+        <!-- we need a default user -->
+<!--         <auth-constraint>
+            <role-name>
+                user
+            </role-name>
+        </auth-constraint>  -->
+  </security-constraint>
+  <login-config>
+  <!--
+        <auth-method>BASIC</auth-method>
+        <realm-name>digilib</realm-name> 
+   -->
+        <auth-method>
+            FORM
+        </auth-method>
+        <form-login-config>
+            <form-login-page>
+                /digilib-login.html
+            </form-login-page>
+            <form-error-page>
+                /digilib-fail.html
+            </form-error-page>
+        </form-login-config>
+  </login-config>
+</web-app>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/WEB-INF/web.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+ 
+<web-app>
+  <!-- General description of your web application -->
+  <display-name>
+        digilib
+  </display-name>
+  <description>
+        This is the web frontend of the Digital Document Library.
+  </description>
+  <!-- The Intialisation Listener -->
+  <listener>
+        <listener-class>
+            digilib.servlet.Initialiser
+        </listener-class>
+  </listener>
+  <!-- The Scaler servlet -->
+  <servlet>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.ScalerNoAsync
+        </servlet-class>
+        <!-- Load this servlet at server startup time -->
+        <load-on-startup>
+            5
+        </load-on-startup>
+  </servlet>
+  <!-- The Texter servlet -->
+  <servlet>
+        <servlet-name>
+            Texter
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.Texter
+        </servlet-class>
+  </servlet>
+  <!-- The PDFCache servlet -->
+  <servlet>
+        <servlet-name>
+            PDFCache
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.PDFCache
+        </servlet-class>
+  </servlet>
+  <!-- The mapping for the Scaler servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /servlet/Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /Scaler
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /authenticated/servlet/Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+  <!-- The mapping for the Texter servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            Texter
+        </servlet-name>
+        <url-pattern>
+            /servlet/Texter/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Texter
+        </servlet-name>
+        <url-pattern>
+            /authenticated/servlet/Texter/*
+        </url-pattern>
+  </servlet-mapping>
+  <!-- The mapping for the Texter servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            PDFCache
+        </servlet-name>
+        <url-pattern>
+            /servlet/PDFCache/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            PDFCache
+        </servlet-name>
+        <url-pattern>
+            /authenticated/servlet/PDFCache/*
+        </url-pattern>
+  </servlet-mapping>
+  <!-- region for authenticated access -->
+  <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>
+                Authenticated Digilib
+            </web-resource-name>
+            <url-pattern>
+                /authenticated/*
+            </url-pattern>
+        </web-resource-collection>
+        <!-- we need a default user -->
+<!--         <auth-constraint>
+            <role-name>
+                user
+            </role-name>
+        </auth-constraint>  -->
+  </security-constraint>
+  <login-config>
+  <!--
+        <auth-method>BASIC</auth-method>
+        <realm-name>digilib</realm-name> 
+   -->
+        <auth-method>
+            FORM
+        </auth-method>
+        <form-login-config>
+            <form-login-page>
+                /digilib-login.html
+            </form-login-page>
+            <form-error-page>
+                /digilib-fail.html
+            </form-error-page>
+        </form-login-config>
+  </login-config>
+</web-app>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/baselib.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,638 @@
+/* Copyright (C) 2003,2004 IT-Group MPIWG, WTWG Uni Bern and others
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ 
+Authors: 
+  Christian Luginbuehl, 01.05.2003 (first version)
+  DW 24.03.2004 (Changed for digiLib in Zope)
+  Robert Casties, 22.1.2008
+
+*/
+
+function base_init() {
+    // init function
+    baseScriptVersion = "1.2.4";
+    dlParams = new Object();
+    browserType = getBrowserType();
+}
+
+
+function getInt(n) {
+    // returns always an integer
+    n = parseInt(n);
+    if (isNaN(n)) return 0;
+    return n;
+}
+
+function defined(x) {
+    // returns if x is defined
+    return (typeof arguments[0] != "undefined");
+}
+
+function cropFloat(x) {
+    // auxiliary function to crop senseless precision
+    return parseInt(10000*x)/10000;
+}
+
+function getBrowserType() {
+    // browser sniffer
+    var bt = Object();
+    bt.doDHTML = false;
+    bt.versIE = 0;
+
+    if ((! document.cssonly && document.layers) || document.all || document.getElementById) {
+        var vers = navigator.appVersion.split('MSIE ');
+        vers = vers[vers.length - 1];
+        bt.versIE = getInt(vers);
+        bt.isIE = navigator.userAgent.indexOf('MSIE') >= 0;
+        bt.isMac = navigator.platform.indexOf('Mac') >= 0;
+        bt.isWin = navigator.platform.indexOf('Win') >= 0;
+        bt.isN4 = (navigator.userAgent.indexOf('Mozilla/4.') >= 0) && ! bt.isIE;
+        bt.isIEWin = bt.versIE > 0 && bt.isWin;
+        if (navigator.appVersion.indexOf('MSIE') < 0 || ! bt.isMac || bt.versIE >= 5) {
+            bt.doDHTML = true;
+            bt.isOpera = navigator.userAgent.indexOf(' Opera ') >= 0;
+            bt.isKonq = navigator.userAgent.indexOf(' Konqueror') >= 0;
+        }
+    }
+    return bt;
+}
+
+// fixes for javascript < 1.2
+if (! Array.prototype.push) {
+    Array.prototype.push = function(val) {
+        this[this.length] = val;
+        return this.length;
+    }
+    Array.prototype.pop = function() {
+        var val = this[this.length-1];
+        this.length -= 1;
+        return val;
+    }
+}
+
+
+/* **********************************************
+ *     geometry classes
+ * ******************************************** */
+
+/*
+ * Size class
+ */
+function Size(w, h) {
+    this.width = parseFloat(w);
+    this.height = parseFloat(h);
+    return this;
+}
+Size.prototype.toString = function() {
+    return this.width + "x" + this.height;
+}
+
+
+/*
+ * Position class
+ */
+function Position(x, y) {
+    this.x = parseFloat(x);
+    this.y = parseFloat(y);
+    return this;
+}
+Position.prototype.toString = function() {
+    return this.x + "," + this.y;
+}
+
+/*
+ * Rectangle class
+ */
+function Rectangle(x, y, w, h) {
+    this.x = parseFloat(x);
+    this.y = parseFloat(y);
+    this.width = parseFloat(w);
+    this.height = parseFloat(h);
+    return this;
+}
+Rectangle.prototype.toString = function() {
+    return this.width+"x"+this.height+"@"+this.x+","+this.y;
+}
+Rectangle.prototype.copy = function() {
+    // returns a copy of this Rectangle
+    return new Rectangle(this.x, this.y, this.width, this.height);
+}
+Rectangle.prototype.getPosition = function() {
+    // returns the position of this Rectangle
+    return new Position(this.x, this.y);
+}
+Rectangle.prototype.getSize = function() {
+    // returns the size of this Rectangle
+    return new Size(this.width, this.height);
+}
+Rectangle.prototype.getArea = function() {
+    // returns the area of this Rectangle
+    return (this.width * this.height);
+}
+Rectangle.prototype.containsPosition = function(pos) {
+    // returns if the given Position lies in this Rectangle
+    return ((pos.x >= this.x)&&(pos.y >= this.y)&&(pos.x <= this.x+this.width)&&(pos.y <= this.y+this.width));
+}
+Rectangle.prototype.intersect = function(rect) {
+    // returns the intersection of the given Rectangle and this one
+    var sec = rect.copy();
+    if (sec.x < this.x) {
+        sec.width = sec.width - (this.x - sec.x);
+        sec.x = this.x;
+    }
+    if (sec.y < this.y) {
+        sec.height = sec.height - (this.y - sec.y);
+        sec.y = this.y;
+    }
+    if (sec.x + sec.width > this.x + this.width) {
+        sec.width = (this.x + this.width) - sec.x;
+    }
+    if (sec.y + sec.height > this.y + this.height) {
+        sec.height = (this.y + this.height) - sec.y;
+    }
+    return sec;
+}
+Rectangle.prototype.fit = function(rect) {
+    // returns a Rectangle that fits into this one (by moving first)
+    var sec = rect.copy();
+    sec.x = Math.max(sec.x, this.x);
+    sec.x = Math.max(sec.x, this.x);
+    if (sec.x + sec.width > this.x + this.width) {
+        sec.x = this.x + this.width - sec.width;
+    }
+    if (sec.y + sec.height > this.y + this.height) {
+        sec.y = this.y + this.height - sec.height;
+    }
+    return sec.intersect(this);
+}
+
+/*
+ * Transform class
+ *
+ * defines a class of affine transformations
+ */
+function Transform() {
+    this.m00 = 1.0;
+    this.m01 = 0.0;
+    this.m02 = 0.0;
+    this.m10 = 0.0;
+    this.m11 = 1.0;
+    this.m12 = 0.0;
+    this.m20 = 0.0;
+    this.m21 = 0.0;
+    this.m22 = 1.0;
+    return this;
+}
+Transform.prototype.concat = function(traf) {
+    // add Transform traf to this Transform
+    for (var i = 0; i < 3; i++) {
+        for (var j = 0; j < 3; j++) {
+            var c = 0.0;
+            for (var k = 0; k < 3; k++) {
+                c += traf["m"+i+k] * this["m"+k+j];
+            }
+            this["m"+i+j] = c;
+        }
+    }
+    return this;
+}
+Transform.prototype.transform = function(rect) {
+    // returns transformed Rectangle or Position with this Transform applied
+    var x = this.m00 * rect.x + this.m01 * rect.y + this.m02;
+    var y = this.m10 * rect.x + this.m11 * rect.y + this.m12;
+    if (rect.width) {
+        var width = this.m00 * rect.width + this.m01 * rect.height;
+        var height = this.m10 * rect.width + this.m11 * rect.height;
+        return new Rectangle(x, y, width, height);
+    }
+    return new Position(x, y);
+}
+Transform.prototype.invtransform = function(pos) {
+    // returns transformed Position pos with the inverse of this Transform applied
+    var det = this.m00 * this.m11 - this.m01 * this.m10;
+    var x = (this.m11 * pos.x - this.m01 * pos.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
+    var y = (- this.m10 * pos.x + this.m00 * pos.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
+    return new Position(x, y);
+}
+function getRotation(angle, pos) {
+    // returns a Transform that is a rotation by angle degrees around [pos.x, pos.y]
+    var traf = new Transform();
+    if (angle != 0) {
+        var t = 2.0 * Math.PI * parseFloat(angle) / 360.0;
+        traf.m00 = Math.cos(t);
+        traf.m01 = - Math.sin(t);
+        traf.m10 = Math.sin(t);
+        traf.m11 = Math.cos(t);
+        traf.m02 = pos.x - pos.x * Math.cos(t) + pos.y * Math.sin(t);
+        traf.m12 = pos.y - pos.x * Math.sin(t) - pos.y * Math.cos(t);
+    }
+    return traf;
+}
+function getTranslation(pos) {
+    // returns a Transform that is a translation by [pos.x, pos,y]
+    var traf = new Transform();
+    traf.m02 = pos.x;
+    traf.m12 = pos.y;
+    return traf;
+}
+function getScale(size) {
+    // returns a Transform that is a scale by [size.width, size.height]
+    var traf = new Transform();
+    traf.m00 = size.width;
+    traf.m11 = size.height;
+    return traf;
+}
+
+
+/* **********************************************
+ *     parameter routines
+ * ******************************************** */
+
+function newParameter(name, defaultValue, detail) {
+    // create a new parameter with a name and a default value
+    if (defined(dlParams[name])) {
+        alert("Fatal: An object with name '" + name + "' already exists - cannot recreate!");
+        return false;
+    } else {
+        dlParams[name] = new Object();
+        dlParams[name].defaultValue = defaultValue;
+        dlParams[name].hasValue = false;
+        dlParams[name].value = defaultValue;
+        dlParams[name].detail = detail;
+        return dlParams[name];
+    }
+}
+
+function getParameter(name) {
+    // returns the named parameter value or its default value
+    if (defined(dlParams[name])) {
+        if (dlParams[name].hasValue) {
+            return dlParams[name].value;
+        } else {
+            return dlParams[name].defaultValue;
+        }
+    } else {
+        return null;
+    }
+}
+
+function setParameter(name, value, relative) {
+    // sets parameter value (relative values with +/- unless literal)
+    if (defined(dlParams[name])) {
+    	if ((relative)&&(value.slice)) {
+	    	var sign = value.slice(0,1);
+			if (sign == '+') {
+				dlParams[name].value = parseFloat(dlParams[name].value) + parseFloat(value.slice(1));
+			} else if (sign == '-') {
+				dlParams[name].value = parseFloat(dlParams[name].value) - parseFloat(value.slice(1));
+			} else {
+	        	dlParams[name].value = value;
+	        }
+	    } else {
+	        dlParams[name].value = value;
+	    }
+        dlParams[name].hasValue = true;
+        return true;
+    }
+    return false;
+}
+
+function hasParameter(name) {
+    // returns if the parameter's value has been set
+    if (defined(dlParams[name])) {
+        return dlParams[name].hasValue;
+    }
+    return false;
+}
+
+function getAllParameters(detail) {
+    // returns a string of all parameters in query format
+    if (! detail) {
+        detail = 255;
+    }
+    var params = new Array();
+    for (param in dlParams) {
+        if (((dlParams[param].detail & detail) > 0)&&(dlParams[param].hasValue)) {
+            var val = getParameter(param);
+            if (val != "") {
+                params.push(param + "=" + val);
+            }
+        }
+    }
+    return params.join("&");
+}
+
+function parseParameters(query) {
+    // gets parameter values from query format string
+    var params = query.split("&");
+    for (var i = 0; i < params.length; i++) {
+        var keyval = params[i].split("=");
+        if (keyval.length == 2) {
+            setParameter(keyval[0], keyval[1]);
+        }
+    }
+}
+
+
+/* **********************************************
+ *     HTML/DOM routines
+ * ******************************************** */
+
+function getElement(tagid, quiet) {
+    // returns the element object with the id tagid
+    var e;
+    if (document.getElementById) {
+        e = document.getElementById(tagid);
+    } else if (document.all) {
+        alert("document.all!");
+        e = document.all[tagid];
+    } else if (document.layers) {
+        e = document.layers[tagid];
+    } 
+    if (e) {
+        return e;
+    } else {
+        if (! quiet) {
+            alert("unable to find element: "+tagid);
+        }
+        return null;
+    }
+}
+
+function getElementPosition(elem) {
+    // returns a Position with the position of the element
+    var x = 0;
+    var y = 0;
+    if (defined(elem.offsetParent)) {
+        // use .offsetLeft for most browsers
+        var e = elem;
+        while (e) {
+            if (browserType.isIE) {
+                if (browserType.isMac) {
+                    // IE for Mac extraspecial
+                    if (e.offsetParent.tagName == "BODY") {
+                        x += e.clientLeft;
+                        y += e.clientTop;
+                        break;
+                    }
+                } else {
+                    // special for IE
+                    if ((e.tagName != "TABLE") && (e.tagName != "BODY")) {
+                        x += e.clientLeft;
+                        y += e.clientTop;
+                    }
+                }
+            }
+            x += e.offsetLeft;
+            y += e.offsetTop;
+            e = e.offsetParent;
+        }
+    } else if (defined(elem.x)) {
+        // use .x for other (which?)
+        x = elem.x;
+        y = elem.y;
+    } else if (defined(elem.pageX)) {
+        // use pageX for N4
+        x = elem.pageX;
+        y = elem.pageY;
+    } else {
+        alert("unable to get position of "+elem+" (id:"+elem.id+")");
+    }
+    return new Position(getInt(x), getInt(y));
+}
+
+function getElementSize(elem) {
+    // returns a Rectangle with the size of the element
+    var width = 0;
+    var height = 0;
+    if (defined(elem.offsetWidth)) {
+        width = elem.offsetWidth;
+        height = elem.offsetHeight;
+    } else if (defined(elem.width)) {
+        width = elem.width;
+        height = elem.height;
+    } else if (defined(elem.clip.width)) {
+        width = elem.clip.width;
+        height = elem.clip.height;
+    } else {
+        alert("unable to get size of "+elem+" (id:"+elem.id+")");
+    }
+    return new Size(getInt(width), getInt(height));
+}
+
+function getElementRect(elem) {
+    // returns a Rectangle with the size and position of the element
+    var pos = getElementPosition(elem);
+    var size = getElementSize(elem);
+    return new Rectangle(pos.x, pos.y, size.width, size.height);
+}
+
+function moveElement(elem, rect) {
+    // moves and sizes the element
+    if (elem.style) {
+        if (defined(rect.x)) {
+            elem.style.left = Math.round(rect.x) + "px";
+            elem.style.top = Math.round(rect.y) + "px";
+        }
+        if (defined(rect.width)) {
+            elem.style.width = Math.round(rect.width) + "px";
+            elem.style.height = Math.round(rect.height) + "px";
+        }
+    } else if (document.layers) {
+        if (defined(rect.x)) {
+            elem.pageX = getInt(rect.x);
+            elem.pageY = getInt(rect.y);
+        }
+        if (defined(rect.width)) {
+            elem.clip.width = getInt(rect.width);
+            elem.clip.height = getInt(rect.height);
+        }
+    } else {
+        alert("moveelement: no style nor layer property!");
+        return false;
+    }
+    return true;
+}
+
+function showElement(elem, show) {
+    // shows or hides the element
+    if (elem.style) {
+        if (show) {
+            elem.style.visibility = "visible";
+        } else {
+            elem.style.visibility = "hidden";
+        }
+    } else if (defined(elem.visibility)) {
+        if (show) {
+            elem.visibility = "show";
+        } else {
+            elem.visibility = "hide";
+        }
+    } else {
+        alert("showelement: no style nor layer property!");
+    }
+    return true;
+}
+
+function isElementVisible(elem) {
+    // returns of the is shown or hidden
+    if (elem.style) {
+        return (elem.style.visibility == "visible");
+    } else if (defined(elem.visibility)) {
+        return (elem.visibility == "show");
+    } else {
+        alert("iselementvisible: no style nor layer property!");
+    }
+}
+
+function evtPosition(evt) {
+    // returns the on-screen Position of the Event 
+    var x;
+    var y;
+    evt = (evt) ? evt : window.event;
+    if (!evt) {
+        alert("no event found! "+evt);
+        return;
+    }
+    if (defined(evt.pageX)) {
+        x = parseInt(evt.pageX);
+        y = parseInt(evt.pageY);
+    } else if (defined(evt.clientX)) {
+        x = parseInt(document.body.scrollLeft+evt.clientX);
+        y = parseInt(document.body.scrollTop+evt.clientY);
+    } else {
+        alert("evtPosition: don't know how to deal with "+evt);
+    }
+    return new Position(x, y);
+}
+
+function registerEvent(type, elem, handler) {
+    // register the given event handler on the indicated element
+    if (elem.addEventListener) {
+        elem.addEventListener(type, handler, false);
+    } else {
+        if (type == "mousedown") {
+            if (elem.captureEvents) {
+                elem.captureEvents(Event.MOUSEDOWN);
+            }
+            elem.onmousedown = handler;
+        } else if (type == "mouseup") {
+            if (elem.captureEvents) {
+                elem.captureEvents(Event.MOUSEUP);
+            }
+            elem.onmouseup = handler;
+        } else if (type == "mousemove") {
+            if (elem.captureEvents) {
+                elem.captureEvents(Event.MOUSEMOVE);
+            }
+            elem.onmousemove = handler;
+        } else if (type == "keypress") {
+            if (elem.captureEvents) {
+                elem.captureEvents(Event.KEYPRESS);
+            }
+            elem.onkeypress = handler;
+        } else {
+            alert("registerEvent: unknown event type "+type);
+            return false;
+        }
+    }
+    return true;
+}
+
+function unregisterEvent(type, elem, handler) {
+    // unregister the given event handler from the indicated element
+    if (elem.removeEventListener) {
+        elem.removeEventListener(type, handler, false);
+    } else {
+        if (type == "mousedown") {
+            if (elem.releaseEvents) {
+                elem.releaseEvents(Event.MOUSEDOWN);
+            }
+            elem.onmousedown = null;
+        } else if (type == "mouseup") {
+            if (elem.releaseEvents) {
+                elem.releaseEvents(Event.MOUSEUP);
+            }
+            elem.onmouseup = null;
+        } else if (type == "mousemove") {
+            if (elem.releaseEvents) {
+                elem.releaseEvents(Event.MOUSEMOVE);
+            }
+            elem.onmousemove = null;
+        } else if (type == "keypress") {
+            if (elem.releaseEvents) {
+                elem.releaseEvents(Event.KEYPRESS);
+            }
+            elem.onkeypress = null;
+        } else {
+            alert("unregisterEvent: unknown event type "+type);
+            return false;
+        }
+    }
+    return true;
+}
+
+
+// old registerXXYY API for compatibility
+function registerMouseDown(elem, handler) {
+    return registerEvent("mousedown", elem, handler);
+}
+function unregisterMouseDown(elem, handler) {
+    return unregisterEvent("mousedown", elem, handler);
+}
+function registerMouseMove(elem, handler) {
+    return registerEvent("mousemove", elem, handler);
+}
+function unregisterMouseMove(elem, handler) {
+    return unregisterEvent("mousemove", elem, handler);
+}
+function registerKeyDown(handler) {
+    return registerEvent("keypress", elem, handler);
+}
+
+
+function getWinSize() {
+    // returns a Size with the current window size (mostly from www.quirksmode.org)
+    var wsize = new Size(100, 100);
+    if (defined(self.innerHeight))  {
+        // all except Explorer
+        if ((self.innerWidth == 0)||(self.innerHeight == 0)) {
+            // Safari 1.2 (and other) bug
+            if (parent) {
+                wsize.height = parent.innerHeight;
+                wsize.width = parent.innerWidth;
+            }
+        } else {
+            wsize.width = self.innerWidth;
+            wsize.height = self.innerHeight;
+        }
+    } else if (document.documentElement && document.documentElement.clientHeight) {
+        // Explorer 6 Strict Mode
+        wsize.width = document.documentElement.clientWidth;
+        wsize.height = document.documentElement.clientHeight;
+    } else if (document.body) {
+        // other Explorers
+        wsize.width = document.body.clientWidth;
+        wsize.height = document.body.clientHeight;
+    }
+    return wsize;
+}
+
+function openWin(url, name, params) {
+    // open browser window
+    var ow = window.open(url, name, params);
+    ow.focus();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digicat.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+<title>Digital Library Redirect</title>
+</head>
+
+<script LANGUAGE="JavaScript">
+
+<!-- Beginning of JavaScript --------
+
+//this.location = "http://"+location.host+"/docuserver/digitallibrary/digicat.jsp"+location.search;
+
+this.location.replace(this.location.href.replace(/\.html/, ".jsp"));
+
+// -- End of JavaScript code -------------- -->
+
+</SCRIPT>
+
+<body>
+<h1>Digital Library Redirect</h1>
+
+<p>You should automatically be redirected to the Digital Library page.
+    (<tt>digicat.<b>jsp</b></tt>)</p>
+
+<p>If this doesn't happen make shure JavaScript is enabled in your browser. 
+    The Digital Library pages need JavaScript to work. If your problem still 
+    remains, please contact the administrator.</p>
+
+<hr>
+<address>robert.casties@philo.unibe.ch</address>
+</body> </html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digicat.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,39 @@
+<%@ page language="java" %><%!
+// authentication stuff - robert
+// -----------------------------
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><%
+
+// parsing the query
+// -----------------
+
+digilib.servlet.DigilibRequest dcRequest = new digilib.servlet.DigilibRequest(request);
+// check if authentication is needed and redirect if necessary
+docBean.doAuthentication(dcRequest, response);
+
+// set number of pages  
+dcRequest.setValue("pt", docBean.getNumPages(dcRequest));
+String baseUrl = dcRequest.getAsString("base.url");
+%>
+<html>
+<head>
+<title>Digital Document Library - Digicat</title>
+</head>
+
+<frameset cols="*,90" border="0">
+  <frame name="mainFrame" src="oldskin/dcMain.jsp?<%= dcRequest.getAsString() %>" scrolling="auto">
+  <frame name="rightFrame" src="oldskin/dcMenu.html" scrolling="no" noresize>
+</frameset>
+
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digilib-fail.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html> <head>
+<title>Login to digilib</title>
+</head>
+
+<body>
+<h1>Login to digilib failed</h1>
+
+<p>The name and password are incorrect!</p>
+
+<p>You can use the browser's &quot;Back&quot; button and try again.</p>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digilib-login.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html> <head>
+<title>Login to digilib</title>
+</head>
+
+<body>
+
+<h2>This document requires authentication</h2>
+
+<p>Please enter the name and the password to access this document.<p>
+
+<form method=POST action=j_security_check>
+<table>
+  <tr>
+    <td>Name:</td>
+    <td><input type="text" name="j_username"></td>
+  </tr>
+  <tr>
+    <td>Password:</td>
+    <td><input type="password" name="j_password"></td>
+  </tr>
+  <tr>
+    <td></td>
+    <td><input type="SUBMIT" value="  OK  "></td>
+  </tr>
+  </table>
+</form>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digilib.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+<title>Digital Library Redirect</title>
+</head>
+
+<script LANGUAGE="JavaScript">
+<!-- Beginning of JavaScript --------
+
+// this.location = "http://"+location.host+"/docuserver/digitallibrary/digilib.jsp"+location.search;
+
+this.location.replace(this.location.href.replace(/\.html/, ".jsp"));
+
+// -- End of JavaScript code -------------- -->
+</script>
+
+<body>
+<h1>Digital Library Redirect</h1>
+
+<p>You should automatically be redirected to the Digital Library page. 
+    (<tt>digilib.<b>jsp</b></tt>)</p>
+
+<p>If this doesn't happen make shure JavaScript is enabled in your browser. 
+    The Digital Library pages need JavaScript to work. If your problem still 
+    remains, please contact the administrator.</p>
+
+<hr>
+<address>robert.casties@philo.unibe.ch</address>
+</body> </html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digilib.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,40 @@
+<%@ page language="java" %><%!
+// authentication stuff - robert
+// -----------------------------
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><%
+
+// parsing the query
+// -----------------
+
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+// check if authentication is needed and redirect if necessary
+docBean.doAuthentication(dlRequest, response);
+    
+String digiURL = "digimage.jsp?" + dlRequest.getAsString();
+
+%><html>
+<head>
+<title>Digital Document Library</title>
+</head>
+
+<frameset cols="*,90" border="0" onload="pageFrame.show()">
+  <frame name="mainFrame" src="<%= digiURL %>" scrolling="auto">
+  <frameset rows="25,*" border="0">
+    <frame name="pageFrame" src="oldskin/pageWin.html" scrolling="no" noresize>
+    <frame name="rightFrame" src="oldskin/dlMenu.html" scrolling="no" noresize>
+  </frameset>
+</frameset>
+
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digimage.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,86 @@
+<%@ page language="java" %><%!
+// -- JSP init -------------
+
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+// -- end of JSP init -------------
+%><%
+// -- JSP request -------------
+
+// parsing the query
+// -----------------
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+docBean.setRequest(dlRequest);
+// check if authentication is needed and redirect if necessary
+docBean.doAuthentication(response);
+// add number of pages
+dlRequest.setValue("pt", docBean.getNumPages());
+// store objects for jsp:include
+pageContext.setAttribute("docBean", docBean, PageContext.REQUEST_SCOPE);
+%><html>
+<head>
+    <title>Digital Document Library (L1)</title>
+    <script type="text/javascript" src="baselib.js"></script>
+    <script type="text/javascript" src="dllib.js"></script>
+<script type="text/javascript">
+  base_init();
+  var dlTarget = window.name;
+  var baseUrl = '<%= dlRequest.getAsString("base.url") %>';
+  var toolbarEnabledURL = window.location.href;
+  newParameter('fn', '', 1);
+  newParameter('pn', '1', 1);
+  newParameter('ws', '1.0', 2);
+  newParameter('mo', '', 2);
+  newParameter('wx', '0.0', 4);
+  newParameter('wy', '0.0', 4);
+  newParameter('ww', '1.0', 4);
+  newParameter('wh', '1.0', 4);
+  newParameter('brgt', '0.0', 4);
+  newParameter('cont', '0.0', 4);
+  newParameter('rot', '0.0', 4);
+  newParameter('rgba', '', 4);
+  newParameter('rgbm', '', 4);
+  newParameter('ddpi', '', 8);
+  newParameter('ddpix', '', 8);
+  newParameter('ddpiy', '', 8);
+  newParameter('mk', '', 16);
+  newParameter('pt', '0', 32);
+  setParameter('pt', '<%= dlRequest.getAsString("pt") %>');
+  document.id='digilib';
+  dl_param_init();
+</script>
+</head>
+<body bgcolor="#666666" onload="dl_init();">
+<% if (dlRequest.hasOption("clop", "noarrows")) {
+%><jsp:include page="digimage_img_inc.jsp" /><%
+} else {
+%><jsp:include page="digimage_tbl_inc.jsp" /><%
+}
+%>
+
+ <div id="dot0" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark1.gif" border="0"></div>
+ <div id="dot1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark2.gif" border="0"></div>
+ <div id="dot2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark3.gif" border="0"></div>
+ <div id="dot3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark4.gif" border="0"></div>
+ <div id="dot4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark5.gif" border="0"></div>
+ <div id="dot5" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark6.gif" border="0"></div>
+ <div id="dot6" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark7.gif" border="0"></div>
+ <div id="dot7" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark8.gif" border="0"></div>
+ <div id="eck1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/olinks.gif" border="0"></div>
+ <div id="eck2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/orechts.gif" border="0"></div>
+ <div id="eck3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/ulinks.gif" border="0"></div>
+ <div id="eck4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/urechts.gif" border="0"></div>
+
+</body>
+
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digimage_img_inc.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,25 @@
+<%@ page language="java" %><%
+// retrieve objects from context
+digilib.servlet.DocumentBean docBean = (digilib.servlet.DocumentBean) pageContext.getAttribute("docBean", pageContext.REQUEST_SCOPE);
+digilib.servlet.DigilibRequest dlRequest = docBean.getRequest();
+String ua = request.getHeader("User-Agent");
+boolean isN4 = ((ua.indexOf("Mozilla/4.") > -1)&&(ua.indexOf("MSIE") == -1));
+%>
+<%
+    if (isN4) {
+%><ilayer name="scaler"><%
+	    } else {
+%><div id="scaler"><%
+	    }
+%>
+<script type="text/javascript">
+var ps = bestPicSize(getElement('scaler'), 10);
+document.write('<img id="pic" src="<%= dlRequest.getAsString("base.url") + "/servlet/Scaler?" + dlRequest.getAsString('s') %>&dw='+ps.width+'&dh='+ps.height+'" />');
+</script>
+<%   
+    if (isN4) {
+%></ilayer><%
+	    } else {
+%></div><%
+	    }
+%>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/digimage_tbl_inc.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,61 @@
+<%@ page language="java" %><%
+// retrieve objects from context
+digilib.servlet.DocumentBean docBean = (digilib.servlet.DocumentBean) pageContext.getAttribute("docBean", PageContext.REQUEST_SCOPE);
+digilib.servlet.DigilibRequest dlRequest = docBean.getRequest();
+String ua = request.getHeader("User-Agent");
+boolean isN4 = ((ua.indexOf("Mozilla/4.") > -1)&&(ua.indexOf("MSIE") == -1));
+%>
+<table border="0"  cellpadding="0" cellspacing="0">
+  <tr>
+    <td></td>
+    <td align="center"><%
+      if (docBean.canMoveUp()) {
+        %><a href="javascript:moveBy(0, -0.5)"><img src="img/up.gif" border="0" /></a><%
+      }
+      %></td>
+      <td></td>
+  </tr>
+  <tr>
+    <td valign="center"><%
+      if (docBean.canMoveLeft()) {
+        %><a href="javascript:moveBy(-0.5, 0)"><img src="img/left.gif" border="0" /></a><%
+      }
+      %></td>
+	  <td>
+<%
+	  if(isN4) {
+	      %><ilayer name="scaler"><%
+		  } else {
+	      %><div id="scaler" style="visibility:visible"><%
+		  }
+%>
+<script type="text/javascript">
+var ps = bestPicSize(getElement('scaler'), 10);
+document.write('<img id="pic" src="<%=
+  dlRequest.getAsString("base.url") + "/servlet/Scaler?" + dlRequest.getAsString('s')
+%>&dw='+ps.width+'&dh='+ps.height+'" />');
+</script>
+<% 
+    if(isN4) {
+	%></ilayer><%
+	    } else {
+	%></div><%
+	    }
+%>
+    </td>
+    <td valign="center"><%
+      if (docBean.canMoveRight()) {
+        %><a href="javascript:moveBy(0.5, 0)"><img src="img/right.gif" border="0" /></a><%
+      }
+      %></td>
+  </tr>
+  <tr>
+    <td></td>
+    <td align="center"><%
+      if (docBean.canMoveDown()) {
+        %><a href="javascript:moveBy(0, 0.5)"><img src="img/down.gif" border="0" /></a><%
+      }
+      %></td>
+    <td></td>
+  </tr>
+</table>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/dirInfo-xml.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,47 @@
+<%@page import="digilib.io.FileOps"%><%@ page language="java" %><%!
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><?xml version="1.0" encoding="UTF-8" ?>
+<%
+// process request
+// get digilib config
+digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
+// parsing the query
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+// dir cache
+digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+// get directory
+digilib.io.DocuDirectory dir = dirCache.getDirectory(dlRequest.getFilePath());
+FileOps.FileClass fc = FileOps.FileClass.IMAGE;
+int dirSize = dir.size(fc);
+
+%><!-- Automatically generated XML snippet with directory info -->
+<dir><% if (dir != null) { %>
+  <size><%= dirSize %></size>
+  <name><%= dir.getDirName() %></name>
+  <fsname><%= dir.getDir().getPath() %></fsname> 
+<%
+    if (!dlRequest.hasOption("mo", "dir")) {
+      for (int i = 0; i < dirSize; i++) {
+        digilib.io.DocuDirent f = dir.get(i, fc);
+        String fn = (f != null) ? f.getName() : "null";
+%>  <file>
+    <index><%= i+1 %></index>
+    <name><%= digilib.io.FileOps.basename(fn) %></name>
+    <fsname><%= fn %></fsname>
+  </file>
+<%
+      } // for 
+    } // if not dironly
+  } // if dir 
+%></dir>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/dlContext-xml.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,43 @@
+<%@ page language="java" %><%!
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><?xml version="1.0" encoding="UTF-8" ?>
+<%
+// process request
+// get digilib config
+digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
+// parsing the query
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+// dir cache
+digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+
+%><!-- Automatically generated XML snippet with document context -->
+<result>
+<%
+int pn = dlRequest.getAsInt("pn");
+String fn = dlRequest.getFilePath();
+String ctx = "";
+digilib.io.DocuDirent f = dirCache.getFile(fn, pn, digilib.io.FileOps.FileClass.IMAGE);
+if (f != null) {
+    //ctx = "hasfile:"+f.getName();
+    f.checkMeta();
+    java.util.HashMap meta = f.getFileMeta();
+    if (meta != null) {
+	//ctx = "JSP:hasmeta!";
+	if (meta.containsKey("context")) {
+	    ctx = (String) meta.get("context");
+	}
+    }
+}
+%><%= ctx %>
+</result>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/dlInfo-json.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,36 @@
+<%@ page language="java" %>
+<%!
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><%
+// parsing the query
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+docBean.setRequest(dlRequest);
+%>
+// JSON format metadata about request and image
+{
+<%
+    Object[] keys = dlRequest.getParams().keySet().toArray();
+    java.util.Arrays.sort(keys);
+    int l = keys.length;
+    for (int i = 0; i < l; i++) {
+	String key = (String) keys[i];
+	String val = dlRequest.getAsString(key);
+	if (val.length() == 0) {
+	    val = "";
+	}
+	%>"<%= key %>" : "<%= val %>",
+<%
+       }
+%>
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/dlInfo-xml.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,38 @@
+<%@ page language="java" %><%!
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><?xml version="1.0" encoding="UTF-8" ?>
+<%
+// process request
+// get digilib config
+digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
+// parsing the query
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+docBean.setRequest(dlRequest);
+
+%><!-- Automatically generated XML snippet with document parameters -->
+<document-parameters>
+<%
+    Object[] keys = dlRequest.getParams().keySet().toArray();
+    java.util.Arrays.sort(keys);
+    int l = keys.length;
+    for (int i = 0; i < l; i++) {
+	String key = (String) keys[i];
+	String val = dlRequest.getAsString(key);
+	if (val.length() == 0) {
+	    val = "";
+	}
+%>  <parameter name="<%= key %>" value="<%= val %>"/>
+<%
+       }
+%></document-parameters>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/dllib.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,616 @@
+/* Copyright (C) 2003,2004 IT-Group MPIWG, WTWG Uni Bern and others
+ 
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ 
+Authors:
+  Christian Luginbuehl, 01.05.2003 (first version)
+  DW 24.03.2004 (Changed for digiLib in Zope)
+  Robert Casties, 8.11.2005
+
+  ! Requires baselib.js !
+
+*/
+
+
+function identify() {
+        // used for identifying a digilib instance
+        // Relato uses that function - lugi
+        return "Digilib 0.6";
+}
+
+
+/*
+ * more parameter handling
+ */
+
+function parseArea() {
+    // returns area Rectangle from current parameters
+    return new Rectangle(getParameter("wx"), getParameter("wy"), getParameter("ww"), getParameter("wh"));
+}
+
+function setParamFromArea(rect) {
+    // sets digilib wx etc. from rect
+    setParameter("wx", cropFloat(rect.x));
+    setParameter("wy", cropFloat(rect.y));
+    setParameter("ww", cropFloat(rect.width));
+    setParameter("wh", cropFloat(rect.height));
+    return true;
+}
+
+function parseTrafo(elem) {
+    // returns Transform from current dlArea and picsize
+    var picsize = getElementRect(elem);
+    var trafo = new Transform();
+    // subtract area offset and size
+    trafo.concat(getTranslation(new Position(-dlArea.x, -dlArea.y)));
+    trafo.concat(getScale(new Size(1/dlArea.width, 1/dlArea.height)));
+    // scale to screen size
+    trafo.concat(getScale(picsize));
+    trafo.concat(getTranslation(picsize));
+    // rotate
+    //trafo.concat(getRotation(- getParameter("rot"), new Position(0.5*picsize.width, 0.5*picsize.height)));
+    // mirror
+    //if (hasFlag("hmir")) {
+    //trafo.m00 = - trafo.m00;
+    //}
+    //if (hasFlag("vmir")) {
+    //trafo.m11 = - trafo.m11;
+    //}
+    return trafo;
+}
+
+
+function parseMarks() {
+    // returns marks array from current parameters
+    var marks = new Array();
+    var ma;
+    var mk = getParameter("mk");
+    if (mk.indexOf(";") >= 0) {
+        // old format with ";"
+        ma = mk.split(";");
+    } else {
+        ma = mk.split(",");
+    }
+    for (var i = 0; i < ma.length ; i++) {
+        var pos = ma[i].split("/");
+        if (pos.length > 1) {
+            marks.push(new Position(pos[0], pos[1]));
+        }
+    }
+    return marks;
+}
+
+function getAllMarks() {
+    // returns a string with all marks in query format
+    var marks = new Array();
+    for (var i = 0; i < dlMarks.length; i++) {
+        marks.push(cropFloat(dlMarks[i].x) + "/" + cropFloat(dlMarks[i].y));
+    }
+    return marks.join(",");
+}
+
+function addMark(pos) {
+    // add a mark
+    dlMarks.push(pos);
+    setParameter("mk", getAllMarks());
+    return true;
+}
+
+function deleteMark() {
+    // delete the last mark
+    dlMarks.pop();
+    setParameter("mk", getAllMarks());
+    return true;
+}
+
+function hasFlag(mode) {
+    // returns if mode flag is set
+    return (dlFlags[mode]);
+}
+
+function addFlag(mode) {
+    // add a mode flag
+    dlFlags[mode] = mode;
+    setParameter("mo", getAllFlags());
+    return true;
+}
+
+function removeFlag(mode) {
+    // remove a mode flag
+    if (dlFlags[mode]) {
+        delete dlFlags[mode];
+    }
+    setParameter("mo", getAllFlags());
+    return true;
+}
+
+function toggleFlag(mode) {
+    // change a mode flag
+    if (dlFlags[mode]) {
+        delete dlFlags[mode];
+    } else {
+        dlFlags[mode] = mode;
+    }
+    setParameter("mo", getAllFlags());
+    return true;
+}
+
+function getAllFlags() {
+    // returns a string with all flags in query format
+    var fa = new Array();
+    for (var f in dlFlags) {
+        if ((f != "")&&(dlFlags[f] != null)) {
+            fa.push(f);
+        }
+    }
+    return fa.join(",");
+}
+
+function parseFlags() {
+    // sets dlFlags from the current parameters
+    var flags = new Object();
+    var fa = getParameter("mo").split(",");
+    for (var i = 0; i < fa.length ; i++) {
+        var f = fa[i];
+        if (f != "") {
+            flags[f] = f;
+        }
+    }
+    return flags;
+}    
+
+
+function bestPicSize(elem, inset) {
+    // returns a Size with the best image size for the given element
+    if (! defined(inset)) {
+        inset = 25;
+    }
+    var ws = getWinSize();
+    var es = getElementPosition(elem);
+    if (es) {
+        ws.width = ws.width - es.x - inset;
+        ws.height = ws.height - es.y - inset;
+    }
+    return ws;
+}
+
+function setDLParam(e, s, relative) {
+	// sets parameter based on HTML event
+	var nam;
+    var val;
+    if (s.type && (s.type == "select-one")) {
+        nam = s.name;
+        val = s.options[s.selectedIndex].value;
+    } else if (s.name && s.value) {
+        nam = s.name;
+        val = s.value;
+    }
+    if (nam && val) {
+        setParameter(nam, val, relative);
+        display();
+    } else {
+        alert("ERROR: unable to process event!");
+    }
+    return true;
+}
+
+
+/* **********************************************
+ *     digilib specific routines
+ * ******************************************** */
+
+
+function dl_param_init() {
+    // parameter initialisation before onload
+    if (!baseScriptVersion) {
+        base_init();
+    }
+    dlScriptVersion = "1.2b";
+    dlArea = new Rectangle(0.0, 0.0, 1.0, 1.0);
+    dlMaxArea = new Rectangle(0.0, 0.0, 1.0, 1.0);
+    dlTrafo = new Transform();
+    dlMarks = new Array();
+    dlFlags = new Object();
+    elemScaler = null;
+    picElem = null;
+    ZOOMFACTOR = Math.sqrt(2);
+
+    // put the query parameters (sans "?") in the parameters array
+    parseParameters(location.search.slice(1));
+    // treat special parameters
+    dlMarks = parseMarks();
+    dlArea = parseArea();
+    dlFlags = parseFlags();
+}
+
+
+function dl_init() {
+    // initalisation on load
+    if (!dlScriptVersion) {
+        dl_param_init();
+    }
+    elemScaler = getElement("scaler", true);
+    picElem = getElement("pic", true);
+    if (picElem == null && elemScaler) {
+        // in N4 pic is in the scaler layer
+        picElem = elemScaler.document.images[0];
+    }
+    if ((!elemScaler)||(!picElem)) {
+        alert("Sorry, digilib doesn't work here!");
+        return false;
+    }
+    // give a name to the window containing digilib
+    if (defined(dlTarget)&&(dlTarget)) {
+        window.name = dlTarget;
+    } else {
+        window.name = "digilib";
+    }
+    // put the query parameters (sans "?") in the parameters array
+    parseParameters(location.search.slice(1));
+    // treat special parameters
+    dlMarks = parseMarks();
+    dlArea = parseArea();
+    dlFlags = parseFlags();
+    // wait for image to load and display marks
+    renderMarks();
+    // done
+    focus();
+    return;
+}
+
+
+function display(detail) {
+    // redisplay the page
+    if (! detail) {
+        detail = 255;
+    }
+    var queryString = getAllParameters(detail);
+    location.href = location.protocol + "//" + location.host + location.pathname + "?" + queryString;
+}
+
+
+/* **********************************************
+ *     interactive digilib functions
+ * ******************************************** */
+
+
+function renderMarks() {
+    // put the visible marks on the image
+    var mark_count = dlMarks.length;
+    // make shure the image is loaded so we know its size
+    if (defined(picElem.complete) && picElem.complete == false && ! browserType.isN4 ) {
+        setTimeout("renderMarks()", 100);
+    } else {
+        dlTrafo = parseTrafo(picElem);
+        for (var i = 0; i < 8; i++) {
+            var me = getElement("dot"+i);
+            if (i < mark_count) {
+                if (dlArea.containsPosition(dlMarks[i])) {
+                    var mpos = dlTrafo.transform(dlMarks[i]);
+                    // suboptimal to place -5 pixels and not half size of mark-image
+                    mpos.x = mpos.x -5;
+                    mpos.y = mpos.y -5;
+                    moveElement(me, mpos);
+                    showElement(me, true);
+                }
+            } else {
+                // hide the other marks
+                showElement(me, false);
+            }
+        }
+    }
+}
+
+
+function setMark(reload) {
+    // add a mark where clicked
+    if ( dlMarks.length > 7 ) {
+        alert("Only 8 marks are possible at the moment!");
+        return;
+    }
+    window.focus();
+
+    function markEvent(evt) {
+        // event handler adding a new mark
+        unregisterEvent("mousedown", elemScaler, markEvent);
+        var p = dlTrafo.invtransform(evtPosition(evt));
+        addMark(p);
+        if (defined(reload)&&(!reload)) {
+            // don't redisplay
+            renderMarks();
+            return;
+        }
+        display();
+    }
+
+    // starting event capture
+    registerEvent("mousedown", elemScaler, markEvent);
+}
+
+
+function removeMark(reload) {
+    // remove the last mark
+    deleteMark();
+    if (defined(reload)&&(!reload)) {
+        // don't redisplay
+        renderMarks();
+        return;
+    }
+    display();
+}
+
+
+function zoomArea() {
+    var click = 1;
+    var pt1, pt2;
+    var eck1pos, eck2pos, eck3pos, eck4pos;
+    window.focus();
+    var eck1 = getElement("eck1");
+    var eck2 = getElement("eck2");
+    var eck3 = getElement("eck3");
+    var eck4 = getElement("eck4");
+
+    function zoomClick(evt) {
+        // mouse click handler
+        if (click == 1) {
+            // first click -- start moving
+            click = 2;
+            pt1 = evtPosition(evt);
+            pt2 = pt1;
+            eck1pos = pt1;
+            eck2pos = new Position(pt1.x - 12, pt1.y);
+            eck3pos = new Position(pt1.x, pt1.y - 12);
+            eck4pos = new Position(pt1.y - 12, pt1.y - 12);
+            moveElement(eck1, eck1pos);
+            moveElement(eck2, eck2pos);
+            moveElement(eck3, eck3pos);
+            moveElement(eck4, eck4pos);
+            showElement(eck1, true);
+            showElement(eck2, true);
+            showElement(eck3, true);
+            showElement(eck4, true);
+            // show moving
+            registerEvent("mousemove", elemScaler, zoomMove);
+            registerEvent("mousemove", eck4, zoomMove);
+            // enable drag-to-zoom
+            registerEvent("mouseup", elemScaler, zoomClick);
+            registerEvent("mouseup", eck4, zoomClick);
+        } else {
+            // second click -- end moving
+            pt2 = evtPosition(evt);
+            showElement(eck1, false);
+            showElement(eck2, false);
+            showElement(eck3, false);
+            showElement(eck4, false);
+            unregisterEvent("mousemove", elemScaler, zoomMove);
+            unregisterEvent("mousemove", eck4, zoomMove);
+            unregisterEvent("mousedown", elemScaler, zoomClick);
+            unregisterEvent("mousedown", eck4, zoomClick);
+            var p1 = dlTrafo.invtransform(pt1);
+            var p2 = dlTrafo.invtransform(pt2);
+            var ww = p2.x-p1.x;
+            var wh = p2.y-p1.y;
+            if ((ww > 0)&&(wh > 0)) {
+                setParameter("wx", cropFloat(p1.x));
+                setParameter("wy", cropFloat(p1.y));
+                setParameter("ww", cropFloat(ww));
+                setParameter("wh", cropFloat(wh));
+                parseArea();
+                // zoomed is always fit
+                setParameter("ws", 1);
+                display();
+            }
+        }
+    }
+
+    function zoomMove(evt) {
+        // mouse move handler
+        pt2 = evtPosition(evt);
+        // restrict marks to move right and down
+        eck1pos = pt1;
+        eck2pos = new Position(Math.max(pt1.x, pt2.x)-12, pt1.y);
+        eck3pos = new Position(pt1.x, Math.max(pt1.y, pt2.y)-12);
+        eck4pos = new Position(Math.max(pt1.x, pt2.x)-12, Math.max(pt1.y, pt2.y)-12);
+        moveElement(eck1, eck1pos);
+        moveElement(eck2, eck2pos);
+        moveElement(eck3, eck3pos);
+        moveElement(eck4, eck4pos);
+    }
+
+    // starting event capture
+    registerEvent("mousedown", elemScaler, zoomClick);
+    registerEvent("mousedown", eck4, zoomClick);
+}
+
+function zoomBy(factor) {
+    // zooms by the given factor
+    var newarea = dlArea.copy();
+    newarea.width /= factor;
+    newarea.height /= factor;
+    newarea.x -= 0.5 * (newarea.width - dlArea.width);
+    newarea.y -= 0.5 * (newarea.height - dlArea.height);
+    newarea = dlMaxArea.fit(newarea);
+    setParamFromArea(newarea);
+    display();
+}
+
+
+function zoomFullpage() {
+    // zooms out to show the whole image
+    setParameter("wx", 0.0);
+    setParameter("wy", 0.0);
+    setParameter("ww", 1.0);
+    setParameter("wh", 1.0);
+    display();
+}
+
+
+function moveCenter() {
+    // move visible area so that it's centered around the clicked point
+    if ( (dlArea.width == 1.0) && (dlArea.height == 1.0) ) {
+        // nothing to do
+        return;
+    }
+    window.focus();
+
+    function moveCenterEvent(evt) {
+        // move to handler
+        unregisterEvent("mousedown", elemScaler, moveCenterEvent);
+        var pt = dlTrafo.invtransform(evtPosition(evt));
+        var newarea = new Rectangle(pt.x-0.5*dlArea.width, pt.y-0.5*dlArea.height, dlArea.width, dlArea.height);
+        newarea = dlMaxArea.fit(newarea);
+        // set parameters
+        setParamFromArea(newarea);
+        parseArea();
+        display();
+    }
+
+    // starting event capture
+    registerEvent("mousedown", elemScaler, moveCenterEvent);
+}
+
+function moveBy(movx, movy) {
+    // move visible area by movx and movy (in units of ww, wh)
+    if ((dlArea.width == 1.0)&&(dlArea.height == 1.0)) {
+        // nothing to do
+        return;
+    }
+    var newarea = dlArea.copy();
+    newarea.x += parseFloat(movx)*dlArea.width;
+    newarea.y += parseFloat(movy)*dlArea.height;
+    newarea = dlMaxArea.fit(newarea);
+    // set parameters
+    setParamFromArea(newarea);
+    parseArea();
+    display();
+}
+
+function getRef() {
+    // returns a reference to the current digilib set
+    if (! baseUrl) {
+        var baseUrl = location.protocol + "//" + location.host + location.pathname;
+    }
+    var hyperlinkRef = baseUrl;
+    var par = getAllParameters(7+16); // all without ddpi, pt
+    if (par.length > 0) {
+        hyperlinkRef += "?" + par;
+    }
+    return hyperlinkRef;
+}
+
+function getRefWin(type, msg) {
+    // shows an alert with a reference to the current digilib set
+    if (! msg) {
+        msg = "Link for HTML documents";
+    }
+    prompt(msg, getRef());
+}
+
+function getQuality() {
+	// returns the current q setting
+    for (var i = 0; i < 3; i++) {
+        if (hasFlag("q"+i)) {
+        	return i;
+        }
+    }
+    return 1
+}
+
+function setQuality(qual) {
+    // set the image quality
+    for (var i = 0; i < 3; i++) {
+        removeFlag("q"+i);
+        if (i == qual) {
+            addFlag("q"+i);
+        }
+    }
+    setParameter("mo", getAllFlags());
+    display();
+}    
+
+function setQualityWin(msg) {
+	// dialog for setting quality
+	if (! msg) {
+		msg = "Quality (0..2)";
+	}
+	var q = getQuality();
+	var newq = window.prompt(msg, q);
+	if (newq) {
+		setQuality(newq);
+	}
+}
+
+function mirror(dir) {
+    // mirror the image horizontally or vertically
+    if (dir == "h") {
+        toggleFlag("hmir");
+    } else {
+        toggleFlag("vmir");
+    }
+    setParameter("mo", getAllFlags());
+    display();
+}
+
+function gotoPage(gopage, keep) {
+	// goto given page nr (+/-: relative)
+	var oldpn = parseInt(getParameter("pn"));
+	// try setParameter with relative value
+	setParameter("pn", gopage, true);
+	// check the result
+	var pn = parseInt(getParameter("pn"));
+	if (pn < 1) {
+		alert("No such page! (Page number too low)");
+		setParameter("pn", oldpn);
+		return;
+	}
+	if (hasParameter("pt")) {
+		pt = parseInt(getParameter("pt"))
+		if (pn > pt) {
+			alert("No such page! (Page number too high)");
+			setParameter("pn", oldpn);
+			return;
+		}
+	}
+	if (keep) {
+		display(15+32); // all, no mark
+	} else {	
+		display(3+32); // fn, pn, ws, mo + pt
+	}
+}
+
+function gotoPageWin() {
+	// dialog to ask for new page nr
+	var pn = getParameter("pn");
+	var gopage = window.prompt("Go to page", pn);
+	if (gopage) {
+		gotoPage(gopage);
+	}
+}
+
+function setParamWin(param, text, relative) {
+	// dialog to ask for new parameter value
+	var val = getParameter(param);
+	var newval = window.prompt(text, val);
+	if (newval) {
+		setParameter(param, newval, relative);
+		display();
+	}
+}
+
+function showOptions(show) {
+	// show or hide option div
+	var elem = getElement("dloptions");
+	showElement(elem, show);
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/empty.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+<head>
+</head>
+
+<body>
+</body>
+</html>
Binary file client/src/main/webapp/greyskin/Thumbs.db has changed
Binary file client/src/main/webapp/greyskin/back.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/back.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="back.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\back.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="22"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 31.75 13.75 L 31.75 33.3125 L 14.75 23.3125 L 31.75 13.75 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 31.25,13.678571 L 31.25,33.25 L 14.25,23.25 L 31.25,13.678571 z "
+       id="path2474" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/baselib.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,981 @@
+/* Copyright (C) 2003-2006 IT-Group MPIWG, WTWG Uni Bern and others
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ 
+Authors: 
+  Christian Luginbuehl, 01.05.2003 (first version)
+  DW 24.03.2004 (Changed for digiLib in Zope)
+  Robert Casties, 2.11.2004 (almost complete rewrite)
+  Martin Raspe, 12.12.2005 (changes for Digilib NG)
+  Robert Casties, 3.9.2009
+*/
+
+// was: function base_init() {
+baseLibVersion = "2.011";
+browserType = getBrowserType();
+
+sliders = {};
+activeSlider = null;
+
+function getInt(n) {
+    // returns always an integer
+    n = parseInt(n);
+    return (isNaN(n)) ? 0 : n;
+}
+
+function defined(x) {
+    // returns if x is defined
+    return (typeof arguments[0] != "undefined");
+}
+
+function cropFloat(x) {
+    // auxiliary function to crop senseless precision
+    return parseInt(10000 * x) / 10000;
+}
+
+function getBrowserType() {
+    // browser sniffer
+    var bt = Object();
+    bt.doDHTML = false;
+    bt.versIE = 0;
+
+    if ((! document.cssonly && document.layers) || document.all || document.getElementById) {
+        var vers = navigator.appVersion.split('MSIE ');
+        vers = vers[vers.length - 1];
+        bt.versIE = getInt(vers);
+        bt.isIE = navigator.userAgent.indexOf('MSIE') >= 0;
+        bt.isMac = navigator.platform.indexOf('Mac') >= 0;
+        bt.isWin = navigator.platform.indexOf('Win') >= 0;
+        bt.isN4 = (navigator.userAgent.indexOf('Mozilla/4.') >= 0) && ! bt.isIE;
+        bt.isIEWin = bt.versIE > 0 && bt.isWin;
+        if (navigator.appVersion.indexOf('MSIE') < 0 || ! bt.isMac || bt.versIE >= 5) {
+            bt.doDHTML = true;
+            bt.isOpera = navigator.userAgent.indexOf(' Opera ') >= 0;
+            bt.isKonq = navigator.userAgent.indexOf(' Konqueror') >= 0;
+        }
+    }
+    return bt;
+}
+
+// fixes for javascript < 1.2
+if (! Array.prototype.push) {
+    Array.prototype.push = function(val) {
+        this[this.length] = val;
+        return this.length;
+    }
+    Array.prototype.pop = function() {
+        var val = this[this.length-1];
+        this.length -= 1;
+        return val;
+    }
+}
+
+
+/* **********************************************
+ *     geometry classes
+ * ******************************************** */
+
+/*
+ * Size class
+ */
+function Size(w, h) {
+    this.width = parseFloat(w);
+    this.height = parseFloat(h);
+    return this;
+}
+Size.prototype.toString = function() {
+    return this.width + "x" + this.height;
+}
+Size.prototype.equals = function(other) {
+	return (this.width == other.width
+        &&  this.height == other.height)
+    }
+
+/*
+ * Position class
+ */
+function Position(x, y) {
+    this.x = parseFloat(x);
+    this.y = parseFloat(y);
+    return this;
+}
+Position.prototype.toString = function() {
+    return this.x + "," + this.y;
+}
+Position.prototype.equals = function(other) {
+	return (this.x == other.x
+        &&  this.y == other.y)
+}
+/*
+ * Rectangle class
+ */
+function Rectangle(x, y, w, h) {
+	if (typeof x == "object") {
+		// assume x and y are Position
+		this.x = x.x;
+		this.y = x.y;
+		this.width = y.x - x.x;
+		this.height = y.y - x.y;
+		return this;
+	}
+    this.x = parseFloat(x);
+    this.y = parseFloat(y);
+    this.width = parseFloat(w);
+    this.height = parseFloat(h);
+    return this;
+}
+Rectangle.prototype.toString = function() {
+    return this.width+"x"+this.height+"@"+this.x+","+this.y;
+}
+Rectangle.prototype.copy = function() {
+    // returns a copy of this Rectangle
+    return new Rectangle(this.x, this.y, this.width, this.height);
+}
+Rectangle.prototype.getPosition = function() {
+    // returns the position of this Rectangle
+    return new Position(this.x, this.y);
+}
+Rectangle.prototype.getPt1 = Rectangle.prototype.getPosition;
+// returns the upper left corner position
+
+Rectangle.prototype.getPt2 = function() {
+    // returns the lower right corner position of this Rectangle
+    return new Position(this.x + this.width, this.y + this.height);
+}
+Rectangle.prototype.setPt1 = function(pos) {
+    // sets the upper left corner to position pos
+    this.x = pos.x;
+    this.y = pos.y;
+    return this;
+}
+Rectangle.prototype.setPt2 = function(pos) {
+    // sets the lower right corner to position pos
+    this.width = pos.x - this.x;
+    this.height = pos.y - this.y;
+    return this;
+}
+Rectangle.prototype.getCenter = function() {
+    // returns the center position of this Rectangle
+    return new Position(this.x + this.width / 2, this.y + this.height / 2);
+}
+Rectangle.prototype.setCenter = function(pos) {
+    // moves this Rectangle's center to position pos
+    this.x = pos.x - this.width / 2;
+    this.y = pos.y - this.height / 2;
+    return this;
+}
+Rectangle.prototype.getSize = function() {
+    // returns the size of this Rectangle
+    return new Size(this.width, this.height);
+}
+Rectangle.prototype.equals = function(other) {
+    // equal props
+    return (this.getPosition().equals(other.getPosition())
+        &&  this.getSize().equals(other.getSize())
+        );
+}
+Rectangle.prototype.getArea = function() {
+    // returns the area of this Rectangle
+    return (this.width * this.height);
+}
+Rectangle.prototype.normalize = function() {
+    // eliminates negative width and height
+    var p = this.getPt2();
+    this.x = Math.min(this.x, p.x);
+    this.y = Math.min(this.y, p.y);
+    this.width = Math.abs(this.width);
+    this.height = Math.abs(this.height);
+    return this;
+}
+Rectangle.prototype.containsPosition = function(pos) {
+    // returns if Position "pos" lies inside of this rectangle
+    return ((pos.x >= this.x)
+        && (pos.y >= this.y)
+    && (pos.x <= this.x + this.width)
+    && (pos.y <= this.y + this.width)
+    );
+}
+Rectangle.prototype.containsRect = function(rect) {
+    // returns if rectangle "rect" is contained in this rectangle
+    return (this.containsPosition(rect.getPt1()) 
+        && this.containsPosition(rect.getPt2()));
+}
+Rectangle.prototype.stayInside = function(rect) {
+    // changes this rectangle's x/y values so it stays inside of rectangle rect
+    // keeping the proportions
+    if (this.x < rect.x) this.x = rect.x;
+    if (this.y < rect.y) this.y = rect.y;
+    if (this.x + this.width > rect.x + rect.width) 
+        this.x = rect.x + rect.width - this.width;
+    if (this.y + this.height > rect.y + rect.height)
+        this.y = rect.y + rect.height - this.height;
+    return this;
+}
+Rectangle.prototype.clipTo = function(rect) {
+    // clips this rectangle so it stays inside of rectangle rect
+    var p1 = rect.getPt1();
+    var p2 = rect.getPt2();
+    var this2 = this.getPt2();
+    this.setPt1(new Position(Math.max(this.x, p1.x), Math.max(this.y, p1.y)));
+    this.setPt2(new Position(Math.min(this2.x, p2.x), Math.min(this2.y, p2.y)));
+    return this;
+}
+Rectangle.prototype.intersect = function(rect) {
+    // returns the intersection of the given Rectangle and this one
+    // FIX ME: not really, it should return null if there is no overlap 
+    var sec = rect.copy();
+    if (sec.x < this.x) {
+        sec.width = sec.width - (this.x - sec.x);
+        sec.x = this.x;
+    }
+    if (sec.y < this.y) {
+        sec.height = sec.height - (this.y - sec.y);
+        sec.y = this.y;
+    }
+    if (sec.x + sec.width > this.x + this.width) {
+        sec.width = (this.x + this.width) - sec.x;
+    }
+    if (sec.y + sec.height > this.y + this.height) {
+        sec.height = (this.y + this.height) - sec.y;
+    }
+    return sec;
+}
+Rectangle.prototype.fit = function(rect) {
+    // returns a Rectangle that fits into this one (by moving first)
+    var sec = rect.copy();
+    sec.x = Math.max(sec.x, this.x);
+    sec.y = Math.max(sec.y, this.x);
+    if (sec.x + sec.width > this.x + this.width) {
+        sec.x = this.x + this.width - sec.width;
+    }
+    if (sec.y + sec.height > this.y + this.height) {
+        sec.y = this.y + this.height - sec.height;
+    }
+    return sec.intersect(this);
+}
+
+/*
+ * Transform class
+ *
+ * defines a class of affine transformations
+ */
+function Transform() {
+    this.m00 = 1.0;
+    this.m01 = 0.0;
+    this.m02 = 0.0;
+    this.m10 = 0.0;
+    this.m11 = 1.0;
+    this.m12 = 0.0;
+    this.m20 = 0.0;
+    this.m21 = 0.0;
+    this.m22 = 1.0;
+    return this;
+}
+Transform.prototype.concat = function(traf) {
+    // add Transform traf to this Transform
+    for (var i = 0; i < 3; i++) {
+        for (var j = 0; j < 3; j++) {
+            var c = 0.0;
+            for (var k = 0; k < 3; k++) {
+                c += traf["m"+i+k] * this["m"+k+j];
+            }
+            this["m"+i+j] = c;
+        }
+    }
+    return this;
+}
+Transform.prototype.transform = function(rect) {
+    // returns transformed Rectangle or Position with this Transform applied
+    var x = this.m00 * rect.x + this.m01 * rect.y + this.m02;
+    var y = this.m10 * rect.x + this.m11 * rect.y + this.m12;
+    if (rect.width) {
+        // transform the other corner points
+        var pt2 = rect.getPt2();
+        var x2 = this.m00 * pt2.x + this.m01 * pt2.y + this.m02;
+        var y2 = this.m10 * pt2.x + this.m11 * pt2.y + this.m12;
+        var width = x2 - x;
+        var height = y2 - y;
+        return new Rectangle(x, y, width, height);
+    }
+    return new Position(x, y);
+}
+Transform.prototype.invtransform = function(rect) {
+    // returns transformed Rectangle or Position with the inverse of this Transform applied
+    var det = this.m00 * this.m11 - this.m01 * this.m10;
+    var x = (this.m11 * rect.x - this.m01 * rect.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
+    var y = (- this.m10 * rect.x + this.m00 * rect.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
+    if (rect.width) {
+        /* transforming width and height like points seems to be wrong 
+        var width = (this.m11 * rect.width - this.m01 * rect.height - this.m11 * this.m02 + this.m01 * this.m12) / det;
+        var height = (- this.m10 * rect.width + this.m00 * rect.height + this.m10 * this.m02 - this.m00 * this.m12) / det;
+        */
+        // transform the other corner points
+        var pt2 = rect.getPt2();
+        var x2 = (this.m11 * pt2.x - this.m01 * pt2.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
+        var y2 = (- this.m10 * pt2.x + this.m00 * pt2.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
+        var width = x2 - x;
+        var height = y2 - y;
+        return new Rectangle(x, y, width, height);
+    }
+    return new Position(x, y);
+}
+function getRotation(angle, pos) {
+    // returns a Transform that is a rotation by angle degrees around [pos.x, pos.y]
+    var traf = new Transform();
+    if (angle != 0) {
+        var t = 2.0 * Math.PI * parseFloat(angle) / 360.0;
+        traf.m00 = Math.cos(t);
+        traf.m01 = - Math.sin(t);
+        traf.m10 = Math.sin(t);
+        traf.m11 = Math.cos(t);
+        traf.m02 = pos.x - pos.x * Math.cos(t) + pos.y * Math.sin(t);
+        traf.m12 = pos.y - pos.x * Math.sin(t) - pos.y * Math.cos(t);
+    }
+    return traf;
+}
+Transform.prototype.getRotation = getRotation;
+function getTranslation(pos) {
+    // returns a Transform that is a translation by [pos.x, pos,y]
+    var traf = new Transform();
+    traf.m02 = pos.x;
+    traf.m12 = pos.y;
+    return traf;
+}
+Transform.prototype.getTranslation = getTranslation;
+function getScale(size) {
+    // returns a Transform that is a scale by [size.width, size.height]
+    var traf = new Transform();
+    traf.m00 = size.width;
+    traf.m11 = size.height;
+    return traf;
+}
+Transform.prototype.getScale = getScale;
+
+
+/*
+ *  parameters class
+ */
+
+function Parameters() {
+	this.params = new Object();
+	this.PARAM_ALL = 65535;
+	return this;
+}
+Parameters.prototype.define = function(name, defaultValue, detail) {
+    // create a new parameter with a name and a default value
+    if (!this.params[name]) this.params[name] = new Object();
+    this.params[name].defaultValue = defaultValue;
+    this.params[name].hasValue = false;
+    this.params[name].value = defaultValue;
+    this.params[name].detail = detail;
+    return this.params[name];
+}
+Parameters.prototype.reset = function(name) {
+    // resets the given parameter to its default value
+    if (!this.params[name]) {
+    		alert("Could not reset non-existing parameter '" + name + "'");
+		return false;
+    }
+    this.params[name].hasValue = false;
+    this.params[name].value = this.params[name].defaultValue;
+    return this.params[name];
+}
+Parameters.prototype.resetAll = function() {
+    // resets all parameters to their default values
+    for (var p in this.params) {
+    		this.reset(p);
+    	}
+    return true;
+}
+Parameters.prototype.remove = function(name) {
+    if (!defined(this.params[name])) return false;
+    delete this.params[name];
+    return true;
+}
+Parameters.prototype.get = function(name) {
+    // returns the named parameter value or its default value
+    if (!defined(this.params[name])) return null;
+    return this.params[name].hasValue ? this.params[name].value : this.params[name].defaultValue;
+}
+Parameters.prototype.set = function(name, value, relative) {
+    // sets parameter value (relative values with +/- if relative=true)
+    if (!defined(this.params[name])) return null;
+    var p = this.params[name];
+    if (relative && value.slice) {
+    		// value is a string -- check if it starts with +/-
+        var sign = value.slice(0, 1);
+        if (sign == '+') {
+            p.value = parseFloat(p.value) + parseFloat(value.slice(1));
+        } else if (sign == '-') {
+            p.value = parseFloat(p.value) - parseFloat(value.slice(1));
+        } else {
+            p.value = value;
+        }
+    } else {
+    		p.value = value;
+    	}
+    p.hasValue = true;
+    return p.value;
+}
+Parameters.prototype.isSet = function(name) {
+    // returns if the parameter's value has been set
+    if (!defined(this.params[name])) return null;
+    return this.params[name].hasValue;
+}
+Parameters.prototype.getAll = function(detail) {
+    // returns a string of all parameters in query format
+    if (!detail) detail = this.PARAM_ALL;
+    var pa = new Array();
+    for (p in this.params) {
+        if (((this.params[p].detail & detail) > 0)
+        && (this.params[p].hasValue)) {
+            var val = this.params[p].value;
+            if (val != "") {
+                pa.push(p + "=" + val);
+            }
+        }
+    }
+    return pa.join("&");
+}
+Parameters.prototype.parse = function(query) {
+    // gets parameter values from query format string
+    var pa = query.split("&");
+    for (var i = 0; i < pa.length; i++) {
+        var keyval = pa[i].split("=");
+        if (keyval.length == 2) {
+            this.set(keyval[0], keyval[1]);
+        }
+    }
+}
+
+/*
+ * Flags class
+ *
+ * Flags are (hash-) collections of unique strings.
+ */
+function Flags() {
+    this.flags = new Object();
+    return this;
+}
+Flags.prototype.define = function(name, detail) {
+    // create a new flag with a name and detail level
+    this.flags[name] = new Object();
+    this.flags[name].set = false;
+    this.flags[name].detail = detail;
+    return this.flags[name];
+}
+Flags.prototype.get = function(name) {
+	return (this.flags[name]) ? this.flags[name].set : false;
+}
+Flags.prototype.set = function(name, value) {
+	if (!defined(value)) value = true;
+	if (!this.flags[name]) this.flags[name] = new Object;
+	this.flags[name].set = value;
+}
+Flags.prototype.reset = function(name) {
+	if (!this.flags[name]) this.flags[name] = new Object;
+	this.flags[name].set = false;
+}
+Flags.prototype.toggle = function(name) {
+	if (!this.flags[name]) this.flags[name] = new Object;
+	this.flags[name].set = !this.flags[name].set;
+}
+Flags.prototype.resetAll = function() {
+	for (var f in this.flags) {
+		this.flags[f].set = false;
+	}
+}
+Flags.prototype.parse = function(query, sep) {
+    // sets the flags from the string query
+    if (!sep) sep = ",";
+    var fa = query.split(sep);
+    for (var i = 0; i < fa.length ; i++) {
+        var f = fa[i];
+        if (f != "") {
+            this.set(f);
+        }
+    }
+}
+Flags.prototype.getAll = function(detail, sep) {
+    // returns a string of all flags in query format
+    if (!detail) detail = 255;
+    if (!sep) sep = ",";
+    var fa = new Array();
+    for (f in this.flags) {
+        if (this.flags[f].set) {
+        		// if the flag has a detail level it must match
+        		// otherwise we assume detail=128
+        		if (this.flags[f].detail) {
+	        		if ((this.flags[f].detail & detail) > 0) {
+	        			fa.push(f);
+	        		}
+	        	} else {
+        		  	if ((detail & 128) > 0) {
+        				fa.push(f);
+        			}
+        		}
+        	}
+    }
+    return fa.join(sep);
+}
+
+
+/* **********************************************
+ *     HTML/DOM routines
+ * ******************************************** */
+
+function getElement(tagid, quiet) {
+    // returns the element object with the id tagid
+    var e;
+    if (document.getElementById) {
+        e = document.getElementById(tagid);
+    } else if (document.all) {
+        alert("document.all!");
+        e = document.all[tagid];
+    } else if (document.layers) {
+        e = document.layers[tagid];
+    } 
+    if (e) {
+        return e;
+    } else {
+        if (! quiet) {
+            alert("unable to find element: "+tagid);
+        }
+        return null;
+    }
+}
+
+function getElementPosition(elem) {
+    // returns a Position with the position of the element
+    var x = 0;
+    var y = 0;
+    if (defined(elem.offsetLeft)) {
+        var e = elem;
+        while (e) {
+            if (browserType.isIE) {
+                if (browserType.isMac) {
+                    if (e.offsetParent.tagName == "BODY") {
+                        // IE for Mac extraspecial
+                        x += e.clientLeft;
+                        y += e.clientTop;
+                        break;
+                    }
+                } else {
+                    if ((e.tagName != "TABLE") && (e.tagName != "BODY")) {
+                        x += e.clientLeft;
+                        y += e.clientTop;
+                    }
+                }
+            }
+            x += e.offsetLeft;
+            y += e.offsetTop;
+            e = e.offsetParent;
+        }
+    } else if (defined(elem.x)) {
+        // use .x for other (which?)
+        x = elem.x;
+        y = elem.y;
+    } else if (defined(elem.pageX)) {
+        // use pageX for N4
+        x = elem.pageX;
+        y = elem.pageY;
+    } else {
+        alert("unable to get position of " + elem + " (id:" + elem.id + ")");
+    }
+    return new Position(getInt(x), getInt(y));
+}
+
+function getElementSize(elem) {
+    // returns a Rectangle with the size of the element
+    var width = 0;
+    var height = 0;
+    if (defined(elem.offsetWidth)) {
+        width = elem.offsetWidth;
+        height = elem.offsetHeight;
+    } else if (defined(elem.width)) {
+        width = elem.width;
+        height = elem.height;
+    } else if (defined(elem.clip.width)) {
+        width = elem.clip.width;
+        height = elem.clip.height;
+    } else {
+        alert("unable to get size of " + elem + " (id:" + elem.id + ")");
+    }
+    return new Size(getInt(width), getInt(height));
+}
+
+function getElementRect(elem) {
+    // returns a Rectangle with the size and position of the element
+    // FIX ME: what about borders?
+    var pos = getElementPosition(elem);
+    var size = getElementSize(elem);
+    return new Rectangle(pos.x, pos.y, size.width, size.height);
+}
+
+function moveElement(elem, rect) {
+    // moves and sizes the element
+    if (elem.style) {
+        if (defined(rect.x)) {
+            elem.style.left = Math.round(rect.x) + "px";
+            elem.style.top = Math.round(rect.y) + "px";
+        }
+        if (defined(rect.width)) {
+            elem.style.width = Math.round(rect.width) + "px";
+            elem.style.height = Math.round(rect.height) + "px";
+        }
+    } else if (document.layers) {
+        if (defined(rect.x)) {
+            elem.pageX = getInt(rect.x);
+            elem.pageY = getInt(rect.y);
+        }
+        if (defined(rect.width)) {
+            elem.clip.width = getInt(rect.width);
+            elem.clip.height = getInt(rect.height);
+        }
+    } else {
+        alert("moveElement(): element has no style or layer property!");
+        return false;
+    }
+    return true;
+}
+
+function showElement(elem, show) {
+    // shows or hides the element
+    if (elem.style)
+        elem.style.visibility = show ? "visible" : "hidden";
+    else if (defined(elem.visibility))
+        elem.visibility = show ? "show" : "hide";
+    else
+        alert("showElement(): element has no style or layer property!");
+    return true;
+}
+
+function evtPosition(evt) {
+    // returns the on-screen Position of the Event 
+    var x;
+    var y;
+    evt = (evt) ? evt : window.event;
+    if (!evt) {
+        alert("no event found! " + evt);
+        return;
+        }
+    if (defined(evt.pageX)) {
+        x = parseInt(evt.pageX);
+        y = parseInt(evt.pageY);
+    } else if (defined(evt.clientX)) {
+        x = parseInt(document.body.scrollLeft + evt.clientX);
+        y = parseInt(document.body.scrollTop  + evt.clientY);
+    } else {
+        alert("evtPosition(): don't know how to deal with " + evt);
+        }
+    return new Position(x, y);
+}
+
+function registerEvent(type, elem, handler) {
+    // register the given event handler on the indicated element
+    if (elem.addEventListener) {
+        elem.addEventListener(type, handler, false);    // bubble
+        }
+    else if (elem.attachEvent) {
+        elem.attachEvent("on" + type, handler);
+        }
+    else if (elem.captureEvents) {
+        if (Event) { 
+            t = type.toUpperCase();
+            elem.captureEvents(Event[t]);
+            elem[ "on" + type ] = handler;
+            }
+        }
+    else {
+        alert("Could not register event of type " + type);
+        return false;
+        }
+    return true;
+    }
+    
+function unregisterEvent(type, elem, handler) {
+    // unregister the given event handler from the indicated element
+    if (elem.removeEventListener) {
+        elem.removeEventListener(type, handler, false);
+            }
+    else if (elem.detachEvent) {
+        elem.detachEvent("on" + type, handler);
+        }
+    else if (elem.releaseEvents) {
+        if (Event) { 
+            t = type.toUpperCase();
+            elem.releaseEvents(Event[t]);
+            elem[ "on" + type ] = null;
+            }
+        }
+    else {
+        alert("Could not register event of type " + type);
+        return false;
+        }
+    return true;
+}
+
+function registerEventById(type, id, handler) {
+    registerEvent(type, getElement(id), handler);
+    }
+
+function unregisterEventById(type, id, handler) {
+    unregisterEvent(type, getElement(id), handler);
+    }
+
+function stopEvent(e) {
+    if (!e) var e = window.event;
+    e.cancelBubble = true;
+    if (e.stopPropagation) e.stopPropagation();
+    return false;
+}
+
+function getEventSrc(e) {
+    if (e.target) return e.target;
+    if (e.srcElement) return e.srcElement;
+}
+
+// old registerXXYY API for compatibility
+function registerMouseDown(elem, handler) {
+    return registerEvent("mousedown", elem, handler);
+}
+function unregisterMouseDown(elem, handler) {
+    return unregisterEvent("mousedown", elem, handler);
+}
+function registerMouseMove(elem, handler) {
+    return registerEvent("mousemove", elem, handler);
+}
+function unregisterMouseMove(elem, handler) {
+    return unregisterEvent("mousemove", elem, handler);
+}
+function registerKeyDown(handler) {
+    return registerEvent("keypress", elem, handler);
+}
+
+
+function getWinSize() {
+    // returns a Size with the current window size (mostly from www.quirksmode.org)
+    var wsize = new Size(100, 100);
+    if (defined(self.innerHeight))  {
+        // all except Explorer
+        if ((self.innerWidth == 0)||(self.innerHeight == 0)) {
+            // Safari 1.2 (and other) bug
+            if (parent) {
+                wsize.height = parent.innerHeight;
+                wsize.width = parent.innerWidth;
+            }
+        } else {
+            wsize.width = self.innerWidth;
+            wsize.height = self.innerHeight;
+        }
+    } else if (document.documentElement && document.documentElement.clientHeight) {
+        // Explorer 6 Strict Mode
+        wsize.width = document.documentElement.clientWidth;
+        wsize.height = document.documentElement.clientHeight;
+    } else if (document.body) {
+        // other Explorers
+        wsize.width = document.body.clientWidth;
+        wsize.height = document.body.clientHeight;
+    }
+    return wsize;
+}
+
+function getWinRect() {
+    var size = getWinSize();
+    return new Rectangle(0, 0, size.width, size.height);
+}
+    
+function openWin(url, name, params) {
+    // open browser window
+    var ow = window.open(url, name, params);
+    ow.focus();
+}
+
+/* **********************************************
+ *     cookie class
+ * ******************************************** */
+
+function Cookie() {
+    return this.read();
+}
+
+Cookie.prototype.read = function() {
+    var s = document.cookie;
+    var lines = s.split("; ");  // semicolon and space for all browsers?
+    for (var i in lines) {
+        var line = lines[i];
+        var sep = line.indexOf("=");
+        if (sep != -1) this.add(
+            line.substr(0, sep),
+            line.substr(sep + 1)
+            );
+        }
+	return this;
+}
+
+Cookie.prototype.store = function() {
+    var lines = new Array();
+    for (var i in this) {
+        var item = this[i];
+        if (typeof(item) == typeof(lines)) // Array
+            lines.push(i + "=" + item.join(","));
+        else if (typeof(item) != "function") // single item
+            lines.push(i + "=" + item);
+        }
+    // var s = lines.join(";")
+	for (line in lines) document.cookie = lines[line];
+    return this;
+	}
+
+Cookie.prototype.add = function(key, value) {
+    value = value.toString();
+    if (value.indexOf(",") == -1) 
+            this[key] = value;  // single value
+        else
+            this[key] = value.split(",");   // list of values
+    return this[key];
+    }
+
+Cookie.prototype.get = function(key) {
+    return this[key];
+    }
+
+Cookie.prototype.addbool = function(key, value) {
+    this[key] = Boolean(value).toString();
+    return this[key];
+    }
+
+Cookie.prototype.getbool = function(key) {
+    var val = this[key];
+    return (val > "") && (val != "0") && (val != "false");
+    }
+
+Cookie.prototype.remove = function(key) {
+    delete this[key];
+    }
+
+function Slider(id, valMin, valMax, valStart, stepSize, onChange) {
+    // a (horizontal) slider widget
+    this.id = id;
+    this.elem   = getElement(id);
+    this.slider = getElement(id + "-slider");   // the slider handle
+    this.input  = getElement(id + "-input", 1); // optional input field
+    this.bar    = getElement(id + "-bar");      // the slider bar 
+    this.barRect = getElementRect(this.bar);
+    this.sliderRect = getElementRect(this.slider);
+    this.xMin = this.barRect.x;
+    this.xMax = this.xMin + this.barRect.width; 
+    this.xDiff = this.xMax - this.xMin; 
+    this.Y = this.barRect.getCenter().y;        // middle axis of bar 
+    this.valMin = valMin;
+    this.valMax = valMax;
+    this.valDiff = Math.abs(valMax - valMin);
+    this.valStart = valStart;
+    this.value = valStart;
+    this.stepSize = stepSize;
+    this.valueLabel  = getElement(id + "-value", 1);
+    this.valMinLabel = getElement(id + "-valmin", 1);
+    this.valMaxLabel = getElement(id + "-valmax", 1);
+    this.onChange = onChange ? onChange : function() {};
+    this.update();
+    this.activate();
+    sliders[id + '-slider'] = this; // make a handle to the object
+    return this;
+    }
+
+Slider.prototype.show = function(show) {
+    showElement(this.elem, show);
+    this.activate();
+    }
+    
+Slider.prototype.activate = function() {
+    this.setupEvents();
+    }
+
+Slider.prototype.deactivate = function() {
+    unregisterEvent("mousedown", this.slider, this.onDragStart);
+    }
+
+Slider.prototype.reset = function() {
+    this.setValue(this.startVal);
+    }
+
+Slider.prototype.setValue = function(newVal) {
+    // sets slider to new value and updates
+    this.value = newVal;
+    this.update();
+    }
+
+Slider.prototype.calcValue = function() {
+    // calculates value from slider position
+    var xSlider = this.sliderRect.getCenter().x - this.xMin;
+    this.value = xSlider * this.valDiff / this.xDiff;
+    return this.value;
+    }
+
+Slider.prototype.update = function() {
+    // updates slider position to new value
+    var xSlider = this.value * this.xDiff / this.valDiff;
+    moveElement(this.slider, this.sliderRect.setCenter(
+        new Position(xSlider + this.xMin, this.Y)));
+    var strVal = this.value.toString();
+    if (this.valueLabel) this.valueLabel.innerHTML = strVal;
+    if (this.input) this.input.value = strVal;
+    }
+
+Slider.prototype.setupEvents = function() {
+    // installs all event callbacks
+    registerEvent("mousedown", this.slider, this.onDragStart);
+    }
+
+Slider.prototype.onDragStart = function(evt) {
+    var slider = sliders[this.id];
+    activeSlider = slider;
+    unregisterEvent("mousedown", slider.slider, slider.onDragStart);
+    registerEvent("mousemove", document, slider.onDrag);
+    registerEvent("mouseup",   document, slider.onDragEnd);
+    slider.startPos = evtPosition(evt);
+    slider.startX = slider.sliderRect.getCenter().x;
+    return stopEvent(evt);
+    }
+
+Slider.prototype.onDrag = function(evt) {
+    var slider = activeSlider;
+    var pos = evtPosition(evt);
+    var currX = slider.slider
+    var newX = pos.x - slider.startPos + slider.startX;
+    if (newX < slider.xMin) newX = slider.xMin;
+    if (newX > slider.xMax) newX = slider.xMax;
+    moveElement(slider.slider, slider.sliderRect.setCenter(
+        new Position(newX, slider.Y)));
+    return stopEvent(evt);
+    }
+
+Slider.prototype.onDragEnd = function(evt) {
+    var slider = activeSlider;
+    unregisterEvent("mousemove", document, slider.onDrag);
+    unregisterEvent("mouseup",   document, slider.onDragEnd);
+    slider.onChange(slider.calcValue());
+    activeSlider = null;
+    return stopEvent(evt);
+    }
+
+Slider.prototype.onInputChange = function() {
+    var slider = activeSlider;
+    slider.onChange(s.value);
+    }
+
+// :tabSize=4:indentSize=4:noTabs=true:
+
Binary file client/src/main/webapp/greyskin/bg.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/bg.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   id="svg7651"
+   sodipodi:version="0.32"
+   inkscape:version="0.42.2"
+   sodipodi:docbase="/Volumes/User/Users/casties/Desktop/web-devel/digibutton"
+   sodipodi:docname="bg.svg">
+  <defs
+     id="defs7653" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="8.0000000"
+     inkscape:cy="8.0000000"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="688"
+     inkscape:window-height="481"
+     inkscape:window-x="8"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata7656">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.44078943;stroke:none;stroke-width:1.5000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="rect7659"
+       width="12.000000"
+       height="11.432178"
+       x="2.0000000"
+       y="2.0000000"
+       inkscape:export-xdpi="15.000000"
+       inkscape:export-ydpi="15.000000" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/birds-eye.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/birds-eye.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="birds-eye.svg"
+   inkscape:export-filename="C:\digilib\greyskin\birds-eye.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="35.156972"
+     inkscape:cy="33.422353"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1024"
+     inkscape:window-height="749"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 24.5,21.513718 C 23.529478,19.451202 20.04955,17.297524 17.924811,17.280601 C 14.551956,17.154256 13.115556,19.712673 9.7679007,19.880851 C 9.175544,19.995079 7.3045086,19.191243 8.1201307,20.071917 C 9.3529217,21.839129 13.189646,20.035951 15.217464,19.753732 C 17.989372,19.514959 19.047506,20.331214 21.808507,21.214122 C 23.64299,22.764883 23.175698,25.542255 24.233985,26.252244 M 24.5,21.513718 C 25.470522,19.451202 28.636456,17.422524 30.761195,17.405601 C 34.13405,17.279256 35.444825,19.982025 38.792481,20.150203 C 39.384927,20.264152 41.696015,19.191654 40.879073,20.071761 C 39.651613,21.816668 35.758369,19.964307 33.748194,19.710782 C 30.869949,19.485317 29.793252,19.993322 26.924411,20.883904 C 24.731743,21.503029 26.059266,25.524828 24.171484,26.157098"
+       id="path2398"
+       sodipodi:nodetypes="cccccccccccccc" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/blue.png has changed
Binary file client/src/main/webapp/greyskin/brightness-on.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/brightness-on.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="brightness-on.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness-on.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <g
+       id="g2978"
+       style="fill:#ffffff;fill-opacity:0.98214287">
+      <path
+         transform="translate(-10.42857,10.28571)"
+         d="M 44.857142 12.5 A 10.214286 10.214286 0 1 1  24.428571,12.5 A 10.214286 10.214286 0 1 1  44.857142 12.5 z"
+         sodipodi:ry="10.214286"
+         sodipodi:rx="10.214286"
+         sodipodi:cy="12.5"
+         sodipodi:cx="34.642857"
+         id="path2955"
+         style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <g
+         id="g2968"
+         style="fill:#ffffff;fill-opacity:0.98214287">
+        <rect
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2959"
+           width="2.4285715"
+           height="33"
+           x="23"
+           y="6" />
+        <rect
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2966"
+           width="2.4285715"
+           height="33"
+           x="-24"
+           y="7.500001"
+           transform="matrix(0,-1,1,0,0,0)" />
+      </g>
+      <g
+         transform="matrix(0.707107,0.707107,-0.707107,0.707107,23.26192,-10.5061)"
+         id="g2972"
+         style="display:inline;fill:#ffffff;fill-opacity:0.98214287">
+        <rect
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2974"
+           width="2.4285715"
+           height="33"
+           x="23"
+           y="6" />
+        <rect
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2976"
+           width="2.4285715"
+           height="33"
+           x="-24"
+           y="7.500001"
+           transform="matrix(0,-1,1,0,0,0)" />
+      </g>
+    </g>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/brightness.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/brightness.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="brightness.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <g
+       id="g3803"
+       style="fill:#919191;fill-opacity:1">
+      <path
+         transform="translate(-10.42857,10.28571)"
+         d="M 44.857142 12.5 A 10.214286 10.214286 0 1 1  24.428571,12.5 A 10.214286 10.214286 0 1 1  44.857142 12.5 z"
+         sodipodi:ry="10.214286"
+         sodipodi:rx="10.214286"
+         sodipodi:cy="12.5"
+         sodipodi:cx="34.642857"
+         id="path2955"
+         style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <g
+         id="g2968"
+         style="fill:#919191;fill-opacity:1">
+        <rect
+           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2959"
+           width="2.4285715"
+           height="33"
+           x="23"
+           y="6" />
+        <rect
+           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2966"
+           width="2.4285715"
+           height="33"
+           x="-24"
+           y="7.500001"
+           transform="matrix(0,-1,1,0,0,0)" />
+      </g>
+      <g
+         transform="matrix(0.707107,0.707107,-0.707107,0.707107,23.26192,-10.5061)"
+         id="g2972"
+         style="display:inline;fill:#919191;fill-opacity:1">
+        <rect
+           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2974"
+           width="2.4285715"
+           height="33"
+           x="23"
+           y="6" />
+        <rect
+           style="opacity:1;color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="rect2976"
+           width="2.4285715"
+           height="33"
+           x="-24"
+           y="7.500001"
+           transform="matrix(0,-1,1,0,0,0)" />
+      </g>
+    </g>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/calibration-x.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/calibration-x.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="calibration-x.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.791667"
+     inkscape:cx="24"
+     inkscape:cy="24.142434"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <rect
+       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect1503"
+       width="0.093103863"
+       height="10.204791"
+       x="9.2002144"
+       y="18.706682" />
+    <rect
+       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect1505"
+       width="0.093103863"
+       height="10.204791"
+       x="24.200214"
+       y="18.706682" />
+    <rect
+       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect1507"
+       width="0.093103863"
+       height="10.204791"
+       x="39.200214"
+       y="18.706682" />
+    <rect
+       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect1511"
+       width="0.22194758"
+       height="3.6609969"
+       x="32.124527"
+       y="18.653526" />
+    <rect
+       style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect1513"
+       width="0.22194758"
+       height="3.6609969"
+       x="16.653526"
+       y="18.653526" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/calibration-y.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/calibration-y.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="calibration-y.svg"
+   inkscape:export-filename="C:\digilib\greyskin\calibration-y.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.791667"
+     inkscape:cx="24"
+     inkscape:cy="25.408925"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <g
+       id="g1515"
+       transform="matrix(0,-1,1,0,0.437689,47.54928)">
+      <rect
+         y="18.706682"
+         x="9.2002144"
+         height="10.204791"
+         width="0.093103863"
+         id="rect1503"
+         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="18.706682"
+         x="24.200214"
+         height="10.204791"
+         width="0.093103863"
+         id="rect1505"
+         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="18.706682"
+         x="39.200214"
+         height="10.204791"
+         width="0.093103863"
+         id="rect1507"
+         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.4133637;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="18.653526"
+         x="32.124527"
+         height="3.6609969"
+         width="0.22194758"
+         id="rect1511"
+         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="18.653526"
+         x="16.653526"
+         height="3.6609969"
+         width="0.22194758"
+         id="rect1513"
+         style="opacity:1;color:#000000;fill:#ffa060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.30705214;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/cat.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/cat.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="cat.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\cat.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.188034"
+     inkscape:cx="21.038579"
+     inkscape:cy="24.285714"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="vertical"
+       position="11.857143"
+       id="guide2331" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="36.735676"
+       id="guide2333" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       d="M 23.0625 3.53125 C 13.169888 4.224269 5.3749998 12.649853 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 C 23.358917 3.5352791 23.265829 3.5262514 23.1875 3.53125 C 23.148642 3.5337298 23.101295 3.5285323 23.0625 3.53125 z M 13.34375 10.5 L 22.15625 10.5 L 22.15625 20.90625 L 13.34375 20.90625 L 13.34375 10.5 z M 26.6875 10.5 L 35.5 10.5 L 35.5 20.90625 L 26.6875 20.90625 L 26.6875 10.5 z M 13.46875 24.65625 L 22.3125 24.65625 L 22.3125 35.0625 L 13.46875 35.0625 L 13.46875 24.65625 z M 26.75 24.65625 L 35.5625 24.65625 L 35.5625 35.0625 L 26.75 35.0625 L 26.75 24.65625 z "
+       id="path2396" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect2338"
+       width="8.8160076"
+       height="10.410372"
+       x="13.144758"
+       y="10.5" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect2340"
+       width="8.8160076"
+       height="10.410372"
+       x="26.5"
+       y="10.5" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect2342"
+       width="8.8160076"
+       height="10.410372"
+       x="13.287616"
+       y="24.642857" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect2344"
+       width="8.8160076"
+       height="10.410372"
+       x="26.541136"
+       y="24.642857" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline" />
+</svg>
Binary file client/src/main/webapp/greyskin/contrast-on.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/contrast-on.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="brightness-on.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness-on.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 23.375 13.03125 C 18.128391 13.497684 14 17.914036 14 23.28125 C 14 28.716305 18.221162 33.19164 23.5625 33.5625 L 23.5625 13.03125 C 23.497118 13.035814 23.440041 13.025468 23.375 13.03125 z "
+       id="path2882" />
+    <path
+       style="opacity:1;color:#000000;fill:#fefefe;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.625,13.001808 C 30.871609,13.468242 35,17.884594 35,23.251808 C 35,28.686863 30.778838,33.162198 25.4375,33.533058 L 25.4375,13.001808 C 25.502882,13.006372 25.559959,12.996026 25.625,13.001808 z "
+       id="path2891" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/contrast.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/contrast.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="brightness.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\brightness.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="opacity:1;color:#000000;fill:#7f7f7f;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 23.375 13.03125 C 18.128391 13.497684 14 17.914036 14 23.28125 C 14 28.716305 18.221162 33.19164 23.5625 33.5625 L 23.5625 13.03125 C 23.497118 13.035814 23.440041 13.025468 23.375 13.03125 z "
+       id="path2882" />
+    <path
+       style="opacity:1;color:#000000;fill:#d2d2d2;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.625,13.001808 C 30.871609,13.468242 35,17.884594 35,23.251808 C 35,28.686863 30.778838,33.162198 25.4375,33.533058 L 25.4375,13.001808 C 25.502882,13.006372 25.559959,12.996026 25.625,13.001808 z "
+       id="path2891" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/corona.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/corona.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg472"
+   sodipodi:version="0.32"
+   width="210mm"
+   height="210mm"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="corona1.svg"
+   inkscape:version="0.43"
+   inkscape:export-filename="C:\Digilib\greyskin\corona1.png"
+   inkscape:export-xdpi="3.8699999"
+   inkscape:export-ydpi="3.8699999">
+  <metadata
+     id="metadata2508">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs474">
+    <linearGradient
+       id="linearGradient6383">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6385" />
+      <stop
+         id="stop6391"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6387" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient496">
+      <stop
+         style="stop-color:#fcfcfc;stop-opacity:0.47741935;"
+         offset="0"
+         id="stop497" />
+      <stop
+         id="stop2526"
+         offset="0.83177572"
+         style="stop-color:#bdbdbd;stop-opacity:0.2;" />
+      <stop
+         style="stop-color:#404040;stop-opacity:0;"
+         offset="1"
+         id="stop498" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient485">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.50196081;"
+         offset="0"
+         id="stop486" />
+      <stop
+         id="stop2514"
+         offset="0.26168224"
+         style="stop-color:#474747;stop-opacity:0.5032258;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.48387095;"
+         offset="1"
+         id="stop487" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient477">
+      <stop
+         style="stop-color:#ffcb39;stop-opacity:1;"
+         offset="0"
+         id="stop478" />
+      <stop
+         id="stop6394"
+         offset="0.86915886"
+         style="stop-color:#ffe59c;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffcb39;stop-opacity:0;"
+         offset="1"
+         id="stop479" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient477"
+       id="radialGradient480"
+       cx="0.53846157"
+       cy="0.50000000"
+       fx="0.53846157"
+       fy="0.50000000"
+       r="0.66683644"
+       gradientUnits="objectBoundingBox"
+       spreadMethod="pad" />
+    <radialGradient
+       xlink:href="#linearGradient485"
+       id="radialGradient484"
+       cx="293.69321"
+       cy="685.94305"
+       fx="284.35916"
+       fy="748.98859"
+       r="291.13598"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       gradientTransform="matrix(0.203097,0.358167,-0.311967,0.176899,355.5512,235.3307)" />
+    <radialGradient
+       xlink:href="#linearGradient496"
+       id="radialGradient489"
+       cx="0.49386612"
+       cy="0.48700377"
+       fx="0.49386612"
+       fy="0.48700377"
+       r="0.71423900"
+       gradientUnits="objectBoundingBox"
+       spreadMethod="pad" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient496"
+       id="radialGradient2522"
+       cx="565.23035"
+       cy="576.22406"
+       fx="555.30066"
+       fy="573.31244"
+       r="227.42172"
+       gradientTransform="matrix(-0.541407,-0.758332,1.163093,-0.830405,141.165,1490.071)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient485"
+       id="radialGradient3671"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.203097,0.358167,-0.311967,0.176899,355.5512,235.3307)"
+       spreadMethod="pad"
+       cx="310.76443"
+       cy="786.34125"
+       fx="301.43039"
+       fy="849.38678"
+       r="291.13599" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient496"
+       id="radialGradient3673"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.69009,-0.652739,0.900015,-0.951537,391.167,1497.043)"
+       cx="562.72363"
+       cy="597.58929"
+       fx="562.72363"
+       fy="597.58929"
+       r="227.42172" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient477"
+       id="radialGradient6381"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.592132,0.954487,-0.942161,0.584474,329.2198,8.028518)"
+       spreadMethod="pad"
+       cx="288.15497"
+       cy="136.10474"
+       fx="288.15503"
+       fy="136.10484"
+       r="291.13599" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     inkscape:zoom="0.50262434"
+     inkscape:cx="365.2634"
+     inkscape:cy="286.5522"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="121"
+     inkscape:window-y="101"
+     inkscape:current-layer="layer5" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="glass"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient6381);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+       id="path476"
+       d="M 707.05579 362.61322 A 335.4404 335.44043 0 1 1  36.174988,362.61322 A 335.4404 335.44043 0 1 1  707.05579 362.61322 z"
+       sodipodi:cx="371.61539"
+       sodipodi:cy="362.61322"
+       sodipodi:rx="335.4404"
+       sodipodi:ry="335.44043"
+       transform="matrix(0,1.142349,-1.142349,0,790.2569,-58.43568)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;color:#000000;fill:#fefefe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.01823568;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path6426"
+       sodipodi:cx="372.04724"
+       sodipodi:cy="366.07858"
+       sodipodi:rx="274.55893"
+       sodipodi:ry="260.63202"
+       d="M 646.60617 366.07858 A 274.55893 260.63202 0 1 1  97.488312,366.07858 A 274.55893 260.63202 0 1 1  646.60617 366.07858 z"
+       transform="translate(5.968672,5.968672)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="draw"
+     style="display:inline" />
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/debug.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,111 @@
+var Debug = null;
+var _now = {};
+
+function element(name, content) {
+	var E = document.createElement(name);
+	if (content) {
+		if (content.nodeType) // it's a node
+			E.appendChild(content)
+		else // it's text
+			E.appendChild(document.createTextNode(content))
+		};
+	return E;
+	}
+	
+function appendElement(node, name, content) {
+	if (node == null || ! node.appendChild)
+        return node;
+	return node.appendChild(element(name,content));
+	}
+
+function getDebug() {
+	if (Debug == null) {
+		Debug = document.getElementById('debug');
+		if (Debug == null) {
+			Debug = appendElement(document.body, 'div');
+			Debug.setAttribute('class', 'debug');
+			Debug.setAttribute('id', 'debug');
+			Debug.innerhtml = '<h3>Debug</h3>';
+			};
+		};
+	return Debug;
+	}
+
+function debug() {
+	var D = getDebug();
+	// return alertObject(D);
+	var msg = "";
+	for (var i = 0; i<arguments.length; i++) msg += arguments[i] + " ";
+	return appendElement(D, "p", msg);
+	}
+
+function debugObject(obj, exclude) {
+	if (exclude == null)
+	    exclude = '';
+	var noConst = exclude.indexOf('const') > -1;
+	var A = new Array();
+	for (var prop in obj) A.push(prop); 
+	A.sort();
+	var D = getDebug();
+	var T = appendElement(D, "table");
+	for (var i = 0; i < A.length; i++) {
+		var key = A[i];
+		var value = obj[key];
+		var type = typeof(value);
+		// exclude specified types
+		if (exclude.indexOf(type) > -1)
+			continue;
+		// exclude uppercase-only properties (= constants)
+		if (noConst && key.search(/^[A-Z0-9_]+$/) > -1)
+			continue;
+		var TR = appendElement(T, "tr");
+		appendElement(TR, "td", element("b", key));
+		appendElement(TR, "td", type); 
+		appendElement(TR, "td", value + ""); 
+		if (type == "function") 
+			appendElement(TR, "td", value.toSource());
+		};
+	}
+
+function strObject(obj) {
+	var res = "";
+	var A = new Array();
+	try {
+		for (var i in obj) A[i] = typeof(obj[i]);
+		}
+	catch(e) { typ = "unknown" };
+    var count = 0;
+	for (var item in A) {
+		count++;
+        typ = A[item];
+		res += item + " (" + typ + "): ";
+		if (typ != "function") res += obj[item];
+		res += "\t";
+        if (count % 4 == 0)
+            res += "\n";
+		}
+	return res;
+	}
+
+function alertObject(obj) {
+	return alert(strObject(obj));
+	}
+
+function alertHTML(obj) {
+	if (obj)
+        return alert(obj.tagName + ".innerHTML:\n" + obj.innerHTML);
+	}
+
+function serialize(xmlobject) {
+	return (new XMLSerializer()).serializeToString(xmlobject);
+	}
+	
+function startTime(s) {
+	_now[s] = new Date();
+	}
+	
+function elapsedTime(s) {
+	var diff = new Date(new Date - _now[s]);
+	debug(s + ": " + diff.getSeconds() + "." + diff.getMilliseconds() + " sec.");
+	}
+
Binary file client/src/main/webapp/greyskin/delmark.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/delmark.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="delmark.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\delmark.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="60"
+     inkscape:window-y="26" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52965354;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <rect
+       style="opacity:1;color:#000000;fill:#818181;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:1.01823568;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2405"
+       width="18.981764"
+       height="18.981375"
+       x="14.573074"
+       y="13.296871" />
+    <text
+       xml:space="preserve"
+       style="font-size:23.58337593px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="15.091353"
+       y="33.00325"
+       id="text2403"
+       transform="scale(1.074523,0.930646)"><tspan
+         sodipodi:role="line"
+         id="tspan2405"
+         x="15.091353"
+         y="33.00325">1</tspan></text>
+    <rect
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2510"
+       width="30.717447"
+       height="2.8014932"
+       x="-14.440524"
+       y="-34.634766"
+       transform="matrix(0.707107,-0.707107,-0.707107,-0.707107,0,0)" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/diginew.css	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,276 @@
+/* Styles for Digilib NG */
+/* (c) 2005 by Martin Raspe <hertzhaft@biblhertz.it> */
+/* Bibliotheca Hertziana (Max-Planck-Institute for Art History), Rome */
+
+body {
+	background-color: #E0E0E0;
+	color: black;
+	font-size: 8pt;
+	margin-left: 8px;
+	margin-top: 8px;
+	padding: 0px;
+	}
+
+code {
+	font-family: monospace;
+	color: blue;
+	}
+
+pre	{ color: #006060; }
+
+
+a.icon {
+	margin: 0px;
+	padding: 0px;
+	}
+
+a.arrow {
+	display: block;
+	position: absolute;
+	border: none;
+	z-index: 50;
+	background-repeat: no-repeat;
+	background-position: center;
+	}
+
+a#up:hover {
+	background-image: url('up.png');
+	}
+
+a#down:hover {
+	background-image: url('down.png');
+	}
+
+a#left:hover {
+	background-image: url('left.png');
+	}
+
+a#right:hover {
+	background-image: url('right.png');
+	}
+
+/* Images */
+
+img.logo {
+	border: none;
+	}
+
+img.png {
+	border: none;
+	}
+
+img.png:hover {
+	background-image: url('corona.png');
+	}
+	
+img#bird-image {
+	border: none;
+	position: fixed;
+	bottom: 8px;
+	right:  48px;
+	visibility: hidden;
+	z-index: 1;
+	}
+
+/* DIVs */
+
+div.button {
+	padding: 0px;
+	}
+
+div.separator {
+	margin-bottom: 4px;
+	border-top: 2px solid lightgrey;
+	}
+
+div.mark {
+	position: absolute;
+	color: white;
+	background: url('mark-bg-16.png');
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	font-size:11px;
+	height: 15px;
+	width: 16px;
+	padding-top: 1px;
+	text-align: center;
+	z-index: 10;
+	visibility: hidden;
+	/* filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='mark-bg-16.png') */
+	}
+		
+div#bg {
+	position: absolute;
+	background-color: grey;
+    background-repeat:no-repeat;
+    cursor: move;
+    visibility: hidden;
+}
+	
+div#scaler {
+    margin-right: 50px;
+    /*	position: absolute;
+	left: 8px;
+	top: 8px;
+	bottom: 8px;
+	right: 44px;
+*/	/* overflow: auto; */
+	}
+
+div#scaler img {
+    cursor: default;
+}
+
+div#overlay, div#bird-overlay {
+	position: fixed;
+	background-color: transparent;
+	border: none;
+	z-index: 100;
+	visibility: hidden;
+	/* box-sizing: border-box;
+	-moz-box-sizing: border-box; */
+	}
+
+div#buttons {
+	position: fixed;
+	right: 5px;
+	top: 5px;
+	padding: 3px;
+/*	background-color: #E0E0E0; */
+    background-color: lightgrey;	 
+  }
+
+div#dloptions {
+	position: fixed;
+	right: 5px;
+	top: 5px;
+	padding: 3px;
+/*	background-color: #E0E0E0; */
+    background-color: lightgrey;
+	visibility: hidden;
+	}
+
+div#zoom {
+	position: absolute;
+	/* border: 2px solid #ffa060; */
+	border: 2px solid #ff0000;
+	z-index: 200;
+	visibility: hidden;
+	/* box-sizing: border-box;
+	-moz-box-sizing: border-box; */
+	}
+
+div#bird-area {
+	position: fixed;
+	/* border: 2px solid #ffa060; */
+	border: 2px solid #ff0000;
+	background-color: transparent;
+	/* box-sizing: border-box;
+	-moz-box-sizing: border-box; */
+	z-index: 10;
+	visibility: hidden;
+	}
+
+div#calibration {
+	background: url('blue.png');
+	position: absolute;
+	top: 0px;
+	width: 400px;
+	padding: 0px;
+	visibility: hidden;
+	z-index: 1000;
+	}
+
+div#calibration div {
+	width: 100%;
+	height: 100%;
+	margin: 0px;
+	padding: 0px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	text-align: center;
+	color: lightcyan;
+	border: 1px solid lightcyan;
+	background: url('ruler-top.gif') 0px -1px repeat-x;
+	z-index: 1001;
+	}
+
+p.cm {
+	font-weight: bold;
+	}
+
+div.popup-menu {
+	position: absolute;
+	top: 0px;
+	padding: 0px 2px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	border: 2px solid lightcyan;
+	background-color: lightgrey;
+	text-align: center;
+	visibility: hidden;
+	z-index: 1005;
+	}
+
+div.popup-menu p {
+	margin: 2px 0px;
+	padding: 0px;
+	}
+
+div.popup-menu p:hover {
+	background-color: #ffa060;
+	}
+
+div.popup-menu a {
+	text-decoration: none;
+	color: black;
+	}
+
+div#about {
+	position: absolute;
+	width: 200px;
+	top: 100px;
+	left: 350px;
+	height: 200px;
+	padding: 0px 2px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	border: 2px solid lightcyan;
+	background-color: lightgrey;
+	text-align: center;
+	visibility: hidden;
+	z-index: 1000;
+	}
+
+div#about p {
+	margin: 6px;
+	}
+
+	
+/* DEBUG elements */
+
+div#debug {
+	position: absolute;
+	width: 150px;
+	top: 50px;
+	right: 36px;
+	bottom: 50px;
+	overflow: auto;
+	padding: 0px 2px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	color: lightgreen;
+	border: 1px dotted black;
+	background-color: transparent;
+	visibility: hidden;
+	}
+
+div#debug p.debug, h1 {
+	font-weight: bold;
+	color: lightcyan;
+	}
+
+div#debug p, h1 {
+	margin: 0px;
+	padding: 2px 0px;
+	font-size: 9px;
+	background-color: black;
+	}	
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/diginew.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,618 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ page language="java" pageEncoding="UTF-8"%><%!
+	// -- JSP init -------------
+	
+	// create DocumentBean instance for all JSP requests
+	digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+	
+	// initialize DocumentBean instance in JSP init
+	public void jspInit() {
+	    try {
+            // set servlet init-parameter
+		    docBean.setConfig(getServletConfig());
+	    } catch (javax.servlet.ServletException e) {
+		    System.out.println(e);
+	    }
+	}
+	// -- end of JSP init -------------
+%><%
+	// -- JSP request -------------
+	
+	// parsing the query
+	// -----------------
+	digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+	docBean.setRequest(dlRequest);
+	// check if authentication is needed and redirect if necessary
+	docBean.doAuthentication(response);
+	// add number of pages
+	dlRequest.setValue("pt", docBean.getNumPages());
+	// store objects for jsp:include
+	pageContext.setAttribute("docBean", docBean, PageContext.REQUEST_SCOPE);
+
+%><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>Digital Document Library NG</title>
+	
+	<link rel="stylesheet" type="text/css" href="diginew.css" />
+	
+<!-- <script type="text/javascript" src="debug.js"></script> -->
+
+	<script type="text/javascript" src="baselib.js"></script>
+	
+	<script type="text/javascript" src="dllib.js"></script>
+
+	<script language="JavaScript">
+
+	var jspVersion = "diginew.jsp 1.023";
+	var cookie = new Cookie();
+	// alert(strObject(cookie));
+
+	var isOptionDivVisible = cookie.getbool("isOptionDivVisible");
+	var isBirdDivVisible = cookie.getbool("isBirdDivVisible");
+	var isAboutDivVisible = false;
+	var isSizeMenuVisible = false;
+    var isScaleMenuVisible = false;
+	var isOriginalSize = false;
+	var isPixelByPixel = false;
+	var dlTarget = window.name;
+	var baseUrl = '<%= dlRequest.getAsString("base.url") %>';
+	var toolbarEnabledURL = window.location.href;
+	var waited = 0;
+
+	function toggleOptionDiv() {
+		isOptionDivVisible = !isOptionDivVisible;
+		cookie.addbool("isOptionDivVisible", isOptionDivVisible);
+		showOptions(isOptionDivVisible);
+		}
+
+	function toggleBirdDiv() {
+		isBirdDivVisible = !isBirdDivVisible;
+		cookie.addbool("isBirdDivVisible", isBirdDivVisible);
+		showBirdDiv(isBirdDivVisible);
+		}
+
+	function toggleAboutDiv() {
+		isAboutDivVisible = !isAboutDivVisible;
+		showAboutDiv(isAboutDivVisible);
+		}
+
+	function toggleSizeMenu() {
+		isSizeMenuVisible = !isSizeMenuVisible;
+		showMenu("size-menu", "size", isSizeMenuVisible);
+		}
+
+    function toggleScaleMenu() {
+        isScaleMenuVisible = !isScaleMenuVisible;
+        showMenu("scale-menu", "scale", isScaleMenuVisible);
+        }
+
+	function setOnImage(id, src, value) {
+	// replace img src and display "on" status
+		var elem = getElement(id);
+		elem.src = src;
+		if (value)
+			elem.title += ": " + value;
+		else
+			elem.title += ": on";
+		}
+
+	// change icons if image functions are on
+	function reflectImageStatus() {
+		if (hasFlag("hmir")) setOnImage("hmir", "mirror-horizontal-on.png");
+		if (hasFlag("vmir")) setOnImage("vmir", "mirror-vertical-on.png");
+		if (hasParameter("brgt"))
+			setOnImage("brgt", "brightness-on.png", getParameter("brgt"));
+		if (hasParameter("cont"))
+			setOnImage("cont", "contrast-on.png", getParameter("cont"));
+		if (hasParameter("rot"))
+			setOnImage("rot", "rotate-on.png", getParameter("rot"));
+		if (hasParameter("rgb"))
+			setOnImage("rgb", "rgb-on.png", getParameter("rgb"));
+		}
+    
+
+	// initialize digilib; called by body.onload
+	function onBodyLoad() {
+		document.id = 'digilib';
+        dl.onLoad();
+        dl.showOptions(isOptionDivVisible);
+        reflectImageStatus(); // adjust icons
+	}
+
+	function onBodyUnload() {
+		// alert(strObject(cookie));
+		cookie.store();
+		}
+
+	</script>
+</head>
+
+<body onload="onBodyLoad();" onunload="onBodyUnload();">
+ <!-- slot for the scaled image -->
+ 
+ <div id="bg"></div>
+ 
+ <div id="scaler">
+	<img id="pic"></img>
+ </div>
+
+ <!-- sensitive overlay for zoom area etc -->
+ <div id="overlay"></div>
+ <div id="bird-overlay"></div>
+ 
+ <!-- the zoom area selection rectangle -->
+ <div id="zoom"></div>
+ 
+ <!-- the bird's eye overview image -->
+ <img id="bird-image"></img>
+
+ <!-- the bird's eye select area -->
+ <div id="bird-area"></div>
+
+ <!-- the arrows -->
+ <a class="arrow" id="up"    href="javascript:moveBy(0, -0.5)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
+ <a class="arrow" id="down"  href="javascript:moveBy(0, 0.5)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
+ <a class="arrow" id="left"  href="javascript:moveBy(-0.5, 0)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
+ <a class="arrow" id="right" href="javascript:moveBy(0.5, 0)"><img style="border: 0px; width: 100%; height: 100%;" src="trans.gif"/></a>
+
+ <!-- the about window -->
+ <div id="about" class="about" onclick="toggleAboutDiv()">
+ 	<p>Digilib Graphic Viewer</p>
+ 	<a href="http://digilib.berlios.de" target="_blank" >
+ 		<img class="logo" src="../img/digilib-logo-text1.png" title="digilib"></img>
+	</a>
+	<p id="digilib-version"></p>
+	<p id="jsp-version"></p>
+	<p id="baselib-version"></p>
+	<p id="dllib-version"></p>
+ </div>
+
+ <!-- the calibration div -->
+ <div id="calibration">
+ 	<div>
+ 	<p class="cm">measure the length of this scale on your screen</p>
+	</div>
+ </div>
+
+ <!-- the size menu -->
+ <div id="size-menu" class="popup-menu">
+	<p><a href="javascript:setSize(1)">1 x</a></p>
+	<p><a href="javascript:setSize(1.41)">1.41 x</a></p>
+	<p><a href="javascript:setSize(2)">2 x</a></p>
+	<p><a href="javascript:setSize(3)">3 x</a></p>
+	<div id="sizes-bar">
+		<div id="sizes-slider"></div>
+	</div>
+	<p id="sizes-value"></p>
+ </div>
+
+<!-- the scale menu -->
+ <div id="scale-menu" class="popup-menu">
+  <p><a href="javascript:setScale('fit')">fit to screen</a></p>
+  <p><a href="javascript:setScale('pixel')">pixel by pixel</a></p>
+  <p><a href="javascript:setScale('original')">original size</a></p>
+ </div>
+
+ <!-- the buttons -->
+ <div id="buttons">
+	<div class="separator">
+	</div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:getRefWin()"
+			>
+
+			<img
+				class="png"
+				id="reference"
+				title="get a reference URL"
+				src="reference.png"
+			>
+		</a> 
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:dl.zoomBy(1.4)"
+			>
+
+			<img
+				class="png"
+				id="zoom-in"
+				title="zoom in"
+				src="zoom-in.png"
+			>
+	</a> 
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:zoomBy(0.7)"
+			>
+
+			<img
+				class="png"
+				id="zoom-out"
+				title="zoom out"
+				src="zoom-out.png"
+			>
+	</a> 
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:zoomArea()"
+			>
+
+			<img
+				class="png"
+				id="zoom-area"
+				title="zoom area"
+				src="zoom-area.png"
+			>
+		</a> 
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:zoomFullpage()"
+			>
+
+			<img
+				class="png"
+				id="zoom-full"
+				title="view the whole image"
+				src="zoom-full.png"
+			>
+	</a> 
+	</div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:zoomFullpage('width')"
+			>
+
+			<img
+				class="png"
+				id="page-width"
+				title="page width"
+				src="pagewidth.png"
+			>
+		</a> 
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:gotoPage('-1')"
+			>
+
+			<img
+				class="png"
+				id="back"
+				title="goto previous image"
+				src="back.png"
+			>
+	</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:gotoPage('+1')"
+			>
+
+			<img
+				class="png"
+				id="fwd"
+				title="goto next image"
+				src="fwd.png"
+			>
+	</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:gotoPageWin()"
+			>
+
+			<img
+				class="png"
+				id="page"
+				title="specify image"
+				src="page.png"
+			>
+	</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:toggleBirdDiv()"
+			>
+
+			<img
+				class="png"
+				id="bird"
+				title="show bird's eye view"
+				src="birds-eye.png"
+			>
+		</a>
+	</div>
+	
+	<div class="separator">
+	</div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:toggleAboutDiv()"
+			>
+
+			<img
+				class="png"
+				id="help"
+				title="about Digilib"
+				src="help.png"
+			>
+		</a>
+	</div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:resetImage()"
+			>
+
+			<img
+				class="png"
+				id="help"
+				title="reset image"
+				src="reset.png"
+			>
+		</a>
+	</div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:toggleOptionDiv()"
+			>
+
+			<img
+				class="png"
+				id="options"
+				title="more options"
+				src="options.png"
+			>
+		</a>
+	</div>
+
+	<div class="separator">
+	</div>
+</div>
+
+<!-- options div -->
+
+<div id="dloptions">
+	<div class="separator">
+	</div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:setMark();"
+			>
+
+			<img
+				class="png"
+				id="mark"
+				title="set a mark"
+				src="mark.png"
+			>
+		</a> 
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:removeMark()"
+			>
+
+			<img
+				class="png"
+				id="delmark"
+				title="delete the last mark"
+				src="delmark.png"
+				>
+		</a> 
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:mirror('h')"
+			>
+
+			<img
+				class="png"
+				id="hmir"
+				title="mirror horizontally"
+				src="mirror-horizontal.png"
+			>
+		</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:mirror('v')"
+			>
+
+			<img
+				class="png"
+				id="vmir"
+				title="mirror vertically"
+				src="mirror-vertical.png"
+			>
+		</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:setParamWin('rot', 'Rotate (0..360) clockwise')"
+			>
+
+			<img
+				class="png"
+				id="rot"
+				title="rotate image"
+				src="rotate.png"
+			>
+		</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:setParamWin('brgt', 'Brightness (-255..255)')"
+			>
+
+			<img
+				class="png"
+				id="brgt"
+				title="set brightness"
+				src="brightness.png"
+			>
+		</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:setParamWin('cont', 'Contrast (0..8)')"
+			>
+
+			<img
+				class="png"
+				id="cont"
+				title="set contrast"
+				src="contrast.png"
+			>
+		</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:setParamWin('rgb', '...')"
+			>
+
+			<img
+				class="png"
+				id="rgb"
+				title="set rgb values"
+				src="rgb.png"
+			>
+		</a>
+	</div>
+	
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:setQualityWin('Quality (0..2)')"
+			>
+
+			<img
+				class="png"
+				id="quality"
+				title="set image quality"
+				src="quality.png"
+			>
+		</a>
+	</div>
+	
+  <div class="button">
+    <a
+      class="icon"
+      href="javascript:toggleSizeMenu()"
+      >
+
+      <img
+        class="png"
+        id="size"
+        title="set page size"
+        src="size.png"
+      >
+    </a>
+  </div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:calibrate('x')"
+			>
+
+			<img
+				class="png"
+				id="calibration-x"
+				title="calibrate screen x-ratio"
+				src="calibration-x.png"
+			>
+		</a>
+	</div>
+  
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:toggleScaleMenu()"
+			>
+
+			<img
+				class="png"
+				id="scale"
+				title="change image scale"
+				src="original-size.png"
+			>
+		</a>
+	</div>
+
+	<div class="separator">
+	</div>
+
+	<div class="button">
+		<a
+			class="icon"
+			href="javascript:toggleOptionDiv()"
+			>
+
+			<img
+				class="png"
+				id="options-1"
+				title="hide options"
+				src="options.png"
+			>
+		</a>
+	</div>
+
+	<div class="separator">
+	</div>
+
+</div>
+
+<div class="debug" id="debug"><p class="debug">Debug</p></div>
+
+</body>
+
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/dlMenu.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,175 @@
+<html>
+<head>
+<style type="text/css">
+body { margin: 3px; background-color: #f0f0f0 }
+.menu {position:absolute; visibility:hidden}
+img { border: none }
+
+.item1 {position:absolute; left:33; width:50; height:14; clip:rect(0,50,14,0); visibility:hidden}
+.item2 {position:absolute; left:43; width:40; height:14; clip:rect(0,40,14,0); visibility:hidden}
+.item3 {position:absolute; left:3; width:80; height:14; clip:rect(0,80,14,0); visibility:hidden}
+.logo { margin-left: 5px; margin-top: 10px; }
+
+.text {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none}
+</style>
+<script language="JavaScript" src="../oldskin/buttons/menu.js"></script>
+
+<script language="JavaScript">
+// because on a netscape 4.xx bug (messing up with layers on resize) we cache the window
+// resize event and redisplay the navigation frame
+if (document.layers && !document.getElementById) {
+    window.onresize = function() {parent.rightFrame.location.reload();}
+}
+
+/**
+ * overriding 'page' in navigation.js
+ */
+function page(page, details) {
+
+    var pn = parseInt(parent.mainFrame.getParameter("pn"));
+    var pt = parseInt(parent.mainFrame.getParameter("pt"));
+
+    if ( details == null ) {
+	details = 1;
+    }
+  
+    if ( page && page.indexOf('-') == 0 ) {
+	if ( pn > 1 ) {
+	    page = Math.max(pn - parseInt(page.slice(1)), 1);
+	    parent.mainFrame.setParameter("pn", page);
+	    display(details);
+	} else {
+	    alert("You are already on the first page!");
+	}
+
+    } else if ( page && page.indexOf('+') == 0 ) {
+	if ( pn < pt ) {
+	    page = Math.min(pn + parseInt(page.slice(1)), pt);
+	    parent.mainFrame.setParameter("pn", page);
+	    display(details);
+	} else {
+	    alert("You are already on the last page!");
+	}
+    } else if ( page && page == parseInt(page) ) {
+	if ( (page > 0) && (page <= pt) ) {
+	    parent.mainFrame.setParameter("pn", page);
+	    display(details);
+	} else {
+	    alert ("Illegal page number (should be 1 - " + pt + ")!");
+	}
+    }
+}
+
+/*
+ * new display function to refresh the pagesTotal frame
+ */
+
+function display(detail) {
+    parent.pageFrame.show();
+    parent.mainFrame.display(detail);
+}
+
+
+function askPage() {
+    do {
+	p = prompt("Goto Page:", 1);
+    } while ((p != null) && (p < 1));
+    page(p);
+}
+
+function showRef(select) {
+    var hyperlinkRef = parent.mainFrame.baseUrl + "/digilib.jsp?";
+    hyperlinkRef += parent.mainFrame.getAllParameters();
+    if ( select == 0 ) {
+	prompt("Link for LaTeX-documents", "\\href{" + hyperlinkRef + "}{TEXT}");
+    } else if ( select == 1 ) {
+	prompt("Link for HTML-documents", hyperlinkRef);
+    }
+}
+
+function setSize(size) {
+    parent.mainFrame.setParameter('ws', size);
+    display();
+}
+
+function digicat() {
+    var fn = parent.mainFrame.getParameter("fn");
+    var pn = parent.mainFrame.getParameter("pn");
+    var url = parent.mainFrame.baseUrl + "/digicat.jsp?fn=" + fn + "&pn=" + pn;
+    win = window.open(url, "digicat");
+    win.focus();
+}
+
+// boolean variable to either show or not show the additional help
+// change in the menuitem its original mark
+var showHelp = false;
+
+// variable to tell if while changing to another page it should keep the area
+// change in the menuitem its original mark (1 = false, 2 = true)
+var keepArea = 2;
+
+
+// variable that store the texts for contexthelp
+var helpText = new Array();
+
+helpText[0]  = "'back'-button|Click on this button to load the previous image (usually the next page from a manuscript).";
+helpText[1]  = "'next'-button|Click on this button to load the next image (usually the next page from a manuscript).";
+helpText[2]  = "'page'-button|After clicking 'page' you will be prompted for a specific page you want to see.<br>Note that the page number refers to the same serie you are in now.";
+helpText[3]  = "'digicat'-button|Click here to open a new window containing thumbnails of the current series pages to navigate.";
+helpText[4]  = "'mark'-button|You can set marks into the picture. After hitting 'mark' you have to click on the desired picures location, a numbered mark appears.<br>Check out 'reference' to make these marks (up to 8) visible for others.";
+helpText[5]  = "'reference'-button|Choose LaTeX or HTML mode to get a link for the actual (zoomed) picture with all set marks.<br>This link can easily be included in a TeX- or HTML-formatted document/page.";
+helpText[6]  = "'zoom area'-button|With 'zoom area' you can zoom into any rectangular field for the current picture.<br>After clicking on the button click on the image to set any corner (ex. topleft), release the mousebutton and move the mouse until you have the desired size, then click again.";
+helpText[7]  = "'zoom in'-button|Clicking on 'zoom in' zooms in around the current center.";
+helpText[8]  = "'zoom out'-button|Clicking on 'zoom out' zooms out around the current center.";
+helpText[9]  = "'full page'-button|To gain the original unzoomed picture, click on 'full page'.<br>Note that any set marks are still saved at their positions.";
+helpText[10] = "'size'-button|By clicking on one of the menu entries you can select the size of the currently displayed picture in relation to your browser window.<br>Note: a scale factor of '1.0' means that the picture fits right into the working area, while '2.0' means that it will be twice as high and wide.";
+helpText[11] = "'?'-button|In its menu you are able change options like the visibility of this contextsensitive help, with 'Keep area' digilib keeps its current zoom area when changing to another page.";
+
+</script>
+</head>
+
+<body onload="preloadImages()" onunload="closeContextHelp()">
+
+<a href="javascript:page('-1', keepArea)" onmouseover="highlightButton(1)" onmouseout="awayButton(0)"><img src="left.png" title="next image"></a><br>
+<a href="javascript:page('+1', keepArea)" onmouseover="overButton(1)" onmouseout="awayButton(1)"><img src="right.png" title="previous image"></a><br>
+<a href="javascript:askPage()" onmouseover="overButton(2)" onmouseout="awayButton(2)"><img src="page.png" title="select image by index"></a><br>
+<a href="javascript:digicat()" onmouseover="overButton(3)" onmouseout="awayButton(3)"><img src="cat.png" title="image catalogue"></a><br><br>
+<a href="javascript:parent.mainFrame.setMark(false);" onmouseover="overButton(4)" onmouseout="awayButton(4)"><img src="mark.png" title="set a mark"></a><br>
+<a href="javascript:hideMenu(); showMenu(1)" onmouseover="overButton(5)" onmouseout="awayButton(5)"><img src="reference.png" title="get an URL to this view"></a><br><br>
+<a href="javascript:parent.mainFrame.zoomArea()" onmouseover="overButton(6)" onmouseout="awayButton(6)"><img src="zoom-area.png" title="zoom to selected area"></a><br>
+<a href="javascript:parent.mainFrame.zoomBy(1.4142)" onmouseover="overButton(7)" onmouseout="awayButton(7)"><img src="zoom-in.png" title="zoom in"></a><br>
+<a href="javascript:parent.mainFrame.zoomBy(0.7071)" onmouseover="overButton(8)" onmouseout="awayButton(8)"><img src="zoom-out.png" title="zoom out"></a><br>
+<a href="javascript:parent.mainFrame.zoomFullpage()" onmouseover="overButton(9)" onmouseout="awayButton(9)"><img src="zoom-full.png" title="full image"></a><br><br>
+<a href="javascript:hideMenu(); showMenu(2)" onmouseover="overButton(10)" onmouseout="awayButton(10)"><img src="size.png" title="set image size"></a><br><br>
+<a href="javascript:hideMenu(); showMenu(3)" onmouseover="overButton(11)" onmouseout="awayButton(11)"><img src="buttons/questionmark0.gif" ></a><br><br>
+
+<div id="menu1" class="menu" style="top:201; left:31; width:54; height:33; clip:rect(0,54,33,0)"></div>
+ <div id="menu11" class="item1" style="top:203"><center><a href="#" class="text" onClick="hideMenu(); showRef(0); return false;" onmouseover="overItem(11)" onmouseout="awayItem(11)">LaTeX</a></center></div>
+ <div id="menu12" class="item1" style="top:218"><center><a href="#" class="text" onClick="hideMenu(); showRef(1); return false;" onmouseover="overItem(12)" onmouseout="awayItem(12)">HTML</a></center></div>
+
+<div id="menu2" class="menu" style="top:379; left:41; width:44; height:93; clip:rect(0,44,93,0)"></div>
+ <div id="menu21" class="item2" style="top:381"><center><a href="#" class="text" onClick="hideMenu(); setSize(0.7); return false;" onmouseover="overItem(21)" onmouseout="awayItem(21)">0.7</a></center></div>
+ <div id="menu22" class="item2" style="top:396"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.0); return false;" onmouseover="overItem(22)" onmouseout="awayItem(22)">1.0</a></center></div>
+ <div id="menu23" class="item2" style="top:411"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.5); return false;" onmouseover="overItem(23)" onmouseout="awayItem(23)">1.5</a></center></div>
+ <div id="menu24" class="item2" style="top:426"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.0); return false;" onmouseover="overItem(24)" onmouseout="awayItem(24)">2.0</a></center></div>
+ <div id="menu25" class="item2" style="top:441"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.5); return false;" onmouseover="overItem(25)" onmouseout="awayItem(25)">2.5</a></center></div>
+ <div id="menu26" class="item2" style="top:456"><center><a href="#" class="text" onClick="hideMenu(); setSize(3.0); return false;" onmouseover="overItem(26)" onmouseout="awayItem(26)">3.0</a></center></div>
+
+<div id="menu3" class="menu" style="top:430; left:1; width:84; height:33; clip:rect(0,84,33,0)"></div>
+ <div id="menu31" class="item3" style="top:432"><center><a href="#" class="text" onclick="changeMark(31); hideMenu(); changeHelp(); return false;" onmouseover="overItem(31)" onmouseout="awayItem(31)"><img id="mark31" src="buttons/nomark.gif" >Contexthelp</a></center></div>
+ <div id="menu32" class="item3" style="top:447"><center><a href="#" class="text" onclick="changeMark(32); keepArea = (keepArea == 1) ? 2 : 1; return false;" onmouseover="overItem(32)" onmouseout="awayItem(32)"><img id="mark32" src="buttons/mark.gif" >Keep&nbsp;area</a></center></div>
+ <div id="logo" class="logo">
+ 	<a href="http://digilib.berlios.de" target="_blank" >
+ 		<img  src="../img/digilib-logo-text1.png" title="digilib"></img>
+	</a>
+ </div>
+
+<script language="Javascript">
+// initial background color of the menues (has to be done like this, 
+// otherwise menues in ns4 you will have wrong dimensions)
+changeBc("menu1", "#666666");
+changeBc("menu2", "#666666");
+changeBc("menu3", "#666666");
+</script>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/dllib.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1045 @@
+/* Copyright (C) 2003,2004 IT-Group MPIWG, WTWG Uni Bern and others
+ 
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ 
+Authors:
+  Christian Luginbuehl, 01.05.2003 (first version)
+  DW 24.03.2004 (Changed for digiLib in Zope)
+  Robert Casties, 8.11.2005
+  Martin Raspe <hertzhaft@biblhertz.it>, 12.12.2005
+  Robert Casties, 4.9.2009
+  
+  ! Requires baselib.js !
+*/
+digilibVersion = "Digilib NG";
+dllibVersion = "2.042";
+
+function identify() {
+        // used for identifying a digilib instance
+        // Relato uses that function - lugi
+        return digilibVersion;
+}
+
+function createMarkDiv(index) {
+    var div = document.createElement("div");
+    div.className = "mark";
+    div.id = "mark" + index;
+    div.innerHTML = index + 1;
+    document.body.appendChild(div);
+    return div;
+}
+
+function bestPicSize(elem, inset) {
+    // returns a Size with the best image size for the given element
+    if (! defined(inset)) {
+        inset = 0; 
+        // original value was 25 
+        // digilib seems to use the available space better without inset
+        }
+    var ws = getWinSize();
+    var es = getElementPosition(elem);
+    if (es) {
+        ws.width = ws.width - es.x - inset;
+        ws.height = ws.height - es.y - inset;
+    }
+    return ws;
+}
+
+
+/****************************************************
+ * digilib specific classes (must be defined first)
+ ****************************************************/
+ 
+/*
+ * Marks class
+ */ 
+function Marks() {
+	return this;
+}
+// Marks inherits from Array
+Marks.prototype = new Array();
+Marks.prototype.parse = function(query) {
+	this.length = 0;
+    if (query.indexOf(";") >= 0) {
+        var pa = query.split(";");    // old format with ";"
+    } else {
+        var pa = query.split(",");    // new format
+    }
+    for (var i = 0; i < pa.length ; i++) {
+        var pos = pa[i].split("/");
+        if (pos.length > 1) this.push(new Position(pos[0], pos[1]));
+    }
+}
+Marks.prototype.getAll = function() {
+    var ma = new Array();
+    for (var i = 0; i < this.length; i++) {
+        ma.push(cropFloat(this[i].x) + "/" + cropFloat(this[i].y));
+   	}
+    return ma.join(",");
+}
+Marks.prototype.addEvent = function(evt, digilib) {
+    // add a mark from a screen event
+    if (!digilib) digilib = dl;
+    var pos = digilib.trafo.invtransform(evtPosition(evt));
+    this.push(pos);
+}
+
+/*
+ * DLParameters -- digilib parameter class
+ */
+function DLParameters() {
+	// flags for parameter sets
+	this.PARAM_FILE = 1;
+	this.PARAM_MODE = 2;
+	this.PARAM_DIM = 4;
+	this.PARAM_IMAGE = 8;
+	this.PARAM_DPI = 16;
+	this.PARAM_SIZE = 32;
+	this.PARAM_MARK = 64;
+	this.PARAM_PAGES = 128;
+	this.PARAM_CLIENT = 256;
+	/* request parameters */
+	with (this) {
+	// file
+	    define('fn', '',    PARAM_FILE);
+	    define('pn', '1',   PARAM_FILE);
+	// mode
+	    define('mo', '',    PARAM_MODE);
+	// relative dimensions of zoomed image
+	    define('wx', '0.0', PARAM_DIM);
+	    define('wy', '0.0', PARAM_DIM);
+	    define('ww', '1.0', PARAM_DIM);
+	    define('wh', '1.0', PARAM_DIM);
+	// image manipulation
+	    define('brgt', '0.0', PARAM_IMAGE);
+	    define('cont', '0.0', PARAM_IMAGE);
+	    define('rot',  '0.0', PARAM_IMAGE);
+	    define('rgba', '',    PARAM_IMAGE);
+	    define('rgbm', '',    PARAM_IMAGE);
+	// resolution
+	    define('ddpi',  '', PARAM_DPI);
+	    define('ddpix', '', PARAM_DPI);
+	    define('ddpiy', '', PARAM_DPI);
+	// marks
+	    define('mk', '', PARAM_MARK);
+	// pages total
+	    define('pt', '0', PARAM_PAGES);
+	// size
+	    define('ws', '1.0', PARAM_SIZE);
+	    // client side options
+	    define('clop', '', PARAM_CLIENT);
+	}
+	return this;
+}
+DLParameters.prototype = new Parameters();
+// move the inherited getAll because we need it later
+DLParameters.prototype._getAll = Parameters.prototype.getAll;
+DLParameters.prototype.getAll = function(paDetail, moDetail, digilib) {
+	if (!digilib) digilib = dl;
+	// get Flags and Marks first
+    var mo = digilib.flags.getAll(moDetail);
+    this.set("mo", mo);
+    var clop = digilib.opts.getAll();
+    this.set("clop", clop);
+    var mk = digilib.marks.getAll();
+    this.set("mk", mk);
+    var ret = this._getAll(paDetail);
+	return ret;
+}
+
+/*
+ * DLModes -- digilib flags class
+ */
+function DLFlags() {
+    // flags for mode sets
+    this.MODE_QUAL = 1;
+    this.MODE_SIZE = 2;
+    this.MODE_MIR = 4;
+    this.MODE_OTHER = 128;
+    this.MODE_ALL = 255;
+    /* mode flags */
+    with (this) {
+        define('q0', MODE_QUAL);
+        define('q1', MODE_QUAL);
+        define('q2', MODE_QUAL);
+        define('fit',   MODE_SIZE);
+        define('clip',  MODE_SIZE);
+        define('osize', MODE_SIZE);
+        define('vmir', MODE_MIR);
+        define('hmir', MODE_MIR);
+    }
+    return this;
+}
+// inherits from Flags
+DLFlags.prototype = new Flags();
+
+
+/*
+ * Digilib -- digilib base class
+ */
+function Digilib() {
+    if (!baseLibVersion) alert("ERROR: baselib.js not loaded!");
+    /* constants */
+    this.MAX_AREA = new Rectangle(0.0, 0.0, 1.0, 1.0);
+    // default inset (for scalerImg relativ to scalerDiv 
+    this.INSET = 40; // because of scrollbars of main window and scaler [Firefox bug?]
+    // mouse drag area that counts as one click 
+    this.MIN_AREA_SIZE = 3 * 3 + 1;
+    // standard zoom factor
+    this.ZOOMFACTOR = Math.sqrt(2);
+    // bird's eye view dimensions
+    this.BIRD_MAXX = 200;
+    this.BIRD_MAXY = 200;
+    // witdh of arrow bars
+    this.ARROW_WIDTH = 32;
+    // width of calibration bar
+    this.CALIBRATION_WIDTH = 64;
+    /* variables */
+    this.fitOnlyWidth = false;
+    this.fitOnlyHeight = false;
+    this.trafo = null;
+    // page elements
+    this.scalerDiv = null;
+    this.scalerImg = null;
+    this.buttons1Div = null;
+    this.buttons2Div = null;
+    /* parse parameters */
+    this.params = new DLParameters();
+    // put the query parameters (sans "?") in the parameters array
+    this.params.parse(location.search.slice(1));
+    // treat special parameters
+    this.area = this.parseArea();
+    this.marks = new Marks();
+    this.marks.parse(this.params.get("mk"));
+    this.flags = new DLFlags();
+    this.flags.parse(this.params.get("mo"));
+    this.opts = new Flags();
+    this.opts.parse(this.params.get("clop"));
+    return this;
+}
+Digilib.prototype.setDLParam = function(e, s, relative) {
+    // sets parameter based on HTML event
+    var nam;
+    var val;
+    if (s.type && (s.type == "select-one")) {
+        nam = s.name;
+        val = s.options[s.selectedIndex].value;
+    } else if (s.name && s.value) {
+        nam = s.name;
+        val = s.value;
+    }
+    if (nam && val) {
+        dl.params.set(nam, val, relative);
+        display();
+    } else {
+        alert("ERROR: unable to process event!");
+    }
+    return true;
+}
+Digilib.prototype.parseArea = function() {
+    // returns area Rectangle from current parameters
+    return new Rectangle(
+        this.params.get("wx"),
+        this.params.get("wy"),
+        this.params.get("ww"),
+        this.params.get("wh"));
+}
+Digilib.prototype.setParamFromArea = function(rect) {
+    // sets digilib wx etc. from rect
+    this.params.set("wx", cropFloat(rect.x));
+    this.params.set("wy", cropFloat(rect.y));
+    this.params.set("ww", cropFloat(rect.width));
+    this.params.set("wh", cropFloat(rect.height));
+    return true;
+}
+
+Digilib.prototype.parseTrafo = function(elem) {
+    // returns Transform from current dlArea and picsize
+    var picsize = getElementRect(elem);
+    var trafo = new Transform();
+    // subtract area offset and size
+    trafo.concat(trafo.getTranslation(new Position(-this.area.x, -this.area.y)));
+    trafo.concat(trafo.getScale(new Size(1/this.area.width, 1/this.area.height)));
+    // scale to screen size
+    trafo.concat(trafo.getScale(picsize));
+    trafo.concat(trafo.getTranslation(picsize));
+    // FIX ME: Robert, kannst Du mal nachsehen, ob das folgende tut, was es soll?
+    // oder gibt es dafuer neuen Code? -- ROC: Bisher funktioniert es nicht!
+    // rotate
+    //var rot = getRotation(- dl.params.get("rot"), new Position(0.5*picsize.width, 0.5*picsize.height));
+    //trafo.concat(rot);
+    // mirror
+    //if (hasFlag("hmir")) trafo.m00 = - trafo.m00; // ??
+    //if (hasFlag("vmir")) trafo.m11 = - trafo.m11; // ??
+    return trafo;
+}
+
+Digilib.prototype.onLoad = function() {
+    // initialize digilib; called by body.onload
+    this.scalerDiv = getElement("scaler", true);
+    this.scalerImg = getElement("pic", true);
+    this.buttons1Div = getElement("buttons", true);
+    this.buttons2Div = getElement("options", true);
+    /*
+     * if (this.scalerImg == null && this.scalerDiv) { // in N4 pic is in the
+     * scaler layer this.scalerImg = this.scalerDiv.document.images[0]; }
+     */
+    if ((!this.scalerImg)||(!this.scalerDiv)) {
+        alert("Sorry, digilib doesn't work here!");
+        return false;
+    }
+    // fix fixed menus
+    var ms1 = getElementSize(this.buttons1Div);
+    var ms2 = getElementSize(this.buttons2Div);
+    var maxh = (ms1.height > ms2.height) ? ms1.height : ms2.height;
+    var wins = getWinSize();
+    if ((wins.height <= maxh) || (browserType.isIE && (browserType.versIE < 7))) {
+        // unlock fixed menus to absolute if window is too small or IE
+        this.buttons1Div.style.position = "absolute";
+        this.buttons2Div.style.position = "absolute";
+    }
+    this.setScalerImage();	// setzt auch onImgLoad
+    this.setBirdImage();	// laedt das Bird's Eye Bild
+}
+
+Digilib.prototype.setScalerImage = function() {
+    // set the scaler image source (needs the browser size)
+    var picsize = bestPicSize(this.scalerDiv);
+    var menusize = getElementSize(this.buttons1Div);
+    // subtract menu width
+    picsize.width -= menusize.width;
+    picsize.height -= this.INSET;
+    // compose Scaler URL
+    var src = "../servlet/Scaler?" 
+        + this.params.getAll(this.params.PARAM_ALL & ~(this.params.PARAM_MARK | this.params.PARAM_PAGES));
+    if (this.opts.get('fitwidth')) {
+        src += "&dw=" + picsize.width;
+    } else if (this.opts.get('fitheight')) {
+        src += "&dh=" + picsize.height;
+    } else {
+        src += "&dw=" + picsize.width + "&dh=" + picsize.height;
+    }
+    // debug(src);
+    this.scalerImg.onload = onImgLoad;
+    this.scalerImg.src = src;
+
+    var digilib = this;
+    // this is a local callback function that can use the current scope
+
+    function onImgLoad() {
+        if (! digilib)
+            return;
+        // make sure the image is loaded so we know its size
+        /* this test seems to have problems sometimes :-(
+	    if (defined(digilib.scalerImg.complete) && !digilib.scalerImg.complete) {
+			alert("ERROR: the image seems not to be complete in onImgLoad!?");
+		} */
+        digilib.trafo = digilib.parseTrafo(digilib.scalerImg);
+        // display marks
+        digilib.renderMarks();
+        digilib.showBirdDiv(isBirdDivVisible);
+        digilib.showArrows();		// show arrow overlays for zoom navigation
+        //digilib.moveCenter(true);	// click to move point to center
+        // new Slider("sizes", 1, 5, 2);
+        
+        //Drag Image (8.9.2009)
+        if (!digilib.isFullArea())
+            registerEvent("mousedown", digilib.scalerDiv, dragImage);
+
+        focus();
+    }
+}
+
+Digilib.prototype.renderMarks = function() {
+    // make sure the image is loaded so we know its size
+    if (!this.trafo) {
+        alert("ERROR: trafo missing, cannot render marks!");
+        return;
+    }
+    // debugProps(dlArea, "dlArea");
+    for (var i = 0; i < this.marks.length; i++) {
+        var div = getElement("mark" + i, true) || createMarkDiv(i);
+        var mark = this.marks[i];
+        // debugProps(mark, "mark");
+        if (this.area.containsPosition(mark)) {
+            var mpos = this.trafo.transform(mark);
+            // debugProps(mark, "mpos");
+            // better not hide the marked spot (MR)
+            // suboptimal to place -5 pixels and not half size of mark-image
+            // mpos.x = mpos.x -5;
+            // mpos.y = mpos.y -5;
+            moveElement(div, mpos);
+            showElement(div, true);
+        } else {
+            // hide the other marks
+            showElement(div, false);
+        }
+    }
+}
+
+Digilib.prototype.display = function(detail, moDetail) {
+    // redisplay the page
+    var queryString = this.params.getAll(detail, moDetail);
+	location.href
+        = location.protocol + "//"
+    	    + location.host
+    	    + location.pathname
+        + "?" + queryString;
+}
+
+/* **********************************************
+ *     interactive digilib functions
+ * ******************************************** */
+
+Digilib.prototype.setMark = function() {
+    // add a mark where clicked
+    window.focus();
+    this.moveCenter(false);
+    
+    // start event capturing
+    registerEvent("mousedown", this.scalerDiv, markEvent);
+
+    // our own reference to this for the local function
+    var digilib = this;
+	
+    function markEvent(evt) {
+    // event handler adding a new mark
+        unregisterEvent("mousedown", digilib.scalerDiv, markEvent);
+        digilib.marks.addEvent(evt);
+        digilib.display();
+        return stopEvent(evt);
+    }
+    
+}
+
+Digilib.prototype.removeMark = function() {
+    // remove the last mark
+    this.marks.pop();
+    this.display();
+}
+
+Digilib.prototype.resetImage = function() {
+    // reset the image to its original state
+    this.display(this.params.PARAM_FILE); // keep only fn/pn
+}
+
+Digilib.prototype.dragImage = function(evt) {
+    // drag the image and load a new detail on mouse up
+    // makes sense only when zoomed
+    if (this.isFullArea())
+        return;
+    if(evt.preventDefault) evt.preventDefault(); // no Firefox drag and drop
+	var digilib = this; // our own reference to this for the local function
+    var startPos = evtPosition(evt);
+    var pic = this.scalerImg;
+    var picRect = getElementRect(pic);
+     // fit the grey div to the scaler image
+    var div = getElement("bg");
+    var dx = 0;
+    var dy = 0;
+    moveElement(div, picRect);
+    // hide the scaler image, show it as background of div instead
+    showElement(pic, false); 
+    showElement(div, true);
+    div.style.backgroundImage = "url(" + pic.src + ")";
+    div.style.cursor = "move";
+    // start event capturing
+    registerEvent("mousemove", document, moveDragEvent);
+    registerEvent("mouseup", document, moveEndEvent);
+    window.focus();
+
+	function moveDragEvent(evt) {
+    // mousemove handler: drag
+        var pos = evtPosition(evt);
+        // don't use Firefox Drag and Drop feature 
+        if(evt.preventDefault) evt.preventDefault();
+        dx = pos.x - startPos.x;
+        dy = pos.y - startPos.y;
+        // move the background image to the new position
+        div.style.backgroundPosition = dx + "px " + dy + "px";
+        return stopEvent(evt);
+	    }
+
+	function moveEndEvent(evt) {
+    // mouseup handler: reload digilib
+        div.style.cursor = "default";
+        unregisterEvent("mousemove", document, moveDragEvent);
+        unregisterEvent("mouseup", document, moveEndEvent);
+        // calculate relative offset
+        var x = -dx / pic.width;
+        var y = -dy / pic.height;
+        stopEvent(evt);
+        if (dx == 0 && dy == 0)
+            return // no movement
+        // reload with scaler image showing the new ausschnitt
+        return digilib.moveBy(x, y);
+    }
+}
+
+Digilib.prototype.zoomArea = function() {
+    var pt1, pt2;
+    var zoomdiv = getElement("zoom");
+    var overlay = getElement("overlay");
+    // use overlay div to avoid <img> mousemove problems
+    var picRect = getElementRect(this.scalerImg);
+    // FIX ME: is there a way to query the border width from CSS info?
+    // rect.x -= 2; // account for overlay borders
+    // rect.y -= 2;
+    moveElement(overlay, picRect);
+    showElement(overlay, true);
+    // start event capturing
+    registerEvent("mousedown", overlay, zoomStart);
+    registerEvent("mousedown", this.scalerImg, zoomStart);
+    window.focus();
+
+    // our own reference to "this" for the local functions
+    var digilib = this;
+	
+    // mousedown handler: start moving
+    function zoomStart(evt) {
+        pt1 = evtPosition(evt);
+        unregisterEvent("mousedown", overlay, zoomStart);
+        unregisterEvent("mousedown", digilib.scalerImg, zoomStart);
+        // setup and show zoom div
+        moveElement(zoomdiv, Rectangle(pt1.x, pt1.y, 0, 0));
+        showElement(zoomdiv, true);
+        // register events
+        registerEvent("mousemove", document, zoomMove);
+        registerEvent("mouseup", document, zoomEnd);
+        return stopEvent(evt);
+    }
+    
+    // mouseup handler: end moving
+    function zoomEnd(evt) {
+        pt2 = evtPosition(evt);
+        // assume a click if the area is too small (up to 3 x 3 pixel)
+        var clickRect = new Rectangle(pt1, pt2);
+        clickRect.normalize();
+        if (clickRect.getArea() <= digilib.MIN_AREA_SIZE) {
+            return stopEvent(evt);
+        }
+        // hide zoom div
+        showElement(zoomdiv, false);
+        showElement(overlay, false);
+        // unregister events
+        unregisterEvent("mousemove", document, zoomMove);
+        unregisterEvent("mouseup", document, zoomEnd);
+        // clip and transform
+        clickRect.clipTo(picRect);
+        var area = digilib.trafo.invtransform(clickRect);
+        digilib.setParamFromArea(area);
+        // zoomed is always fit
+        digilib.params.set("ws", 1);
+        digilib.display();
+        return stopEvent(evt);
+    }
+    
+    // mouse move handler
+    function zoomMove(evt) {
+        pt2 = evtPosition(evt);
+        var rect = new Rectangle(pt1, pt2);
+        rect.normalize();
+        rect.clipTo(picRect);
+        // update zoom div
+        moveElement(zoomdiv, rect);
+        return stopEvent(evt);
+    	}
+}
+
+Digilib.prototype.zoomBy = function(factor) {
+    // zooms by the given factor
+    var newarea = this.area.copy();
+    newarea.width /= factor;
+    newarea.height /= factor;
+    newarea.x -= 0.5 * (newarea.width - this.area.width);
+    newarea.y -= 0.5 * (newarea.height - this.area.height);
+    newarea = this.MAX_AREA.fit(newarea);
+    this.setParamFromArea(newarea);
+    this.display();
+}
+
+
+Digilib.prototype.zoomFullpage = function(fit) {
+    // zooms out to show the whole image
+    this.params.set("wx", 0.0);
+    this.params.set("wy", 0.0);
+    this.params.set("ww", 1.0);
+    this.params.set("wh", 1.0);
+    if (fit == "width") {
+    		this.opts.set('fitwidth');
+    	} else if (fit == "height") {
+    		this.opts.set('fitheight');
+    	} else {
+    		this.opts.reset('fitwidth');
+    		this.opts.reset('fitheight');
+	}
+    this.display();
+}
+
+
+Digilib.prototype.moveCenter = function(on) {
+    // move visible area so that it's centered around the clicked point
+    if (this.isFullArea()) return; // nothing to do
+    // starting event capture
+    if (on) registerEvent("mousedown", this.scalerImg, moveCenterEvent);
+    else  unregisterEvent("mousedown", this.scalerImg, moveCenterEvent);
+    window.focus();
+    
+	// our own reference to this for the local function
+	var digilib = this;
+
+	function moveCenterEvent(evt) {
+	    // move to handler
+	    var pt = digilib.trafo.invtransform(evtPosition(evt));
+	    var newarea = digilib.area.copy();
+		newarea.setCenter(pt);
+	    newarea.stayInside(this.MAX_AREA);
+	    // newarea = dlMaxArea.fit(newarea);
+	    // debugProps(newarea, "newarea");
+	    // debugProps(dlArea, "dlArea");
+	    if (newarea.equals(digilib.area)) return; // keep event handler
+	    unregisterEvent("mousedown", digilib.scalerImg, moveCenterEvent);
+	    // set parameters
+	    digilib.setParamFromArea(newarea);
+		digilib.display();
+	}
+}
+
+Digilib.prototype.isFullArea = function(area) {
+    if (!area) area = this.area;
+    return (area.width == 1.0) && (area.height == 1.0);
+}
+
+Digilib.prototype.canMove = function(movx, movy) {
+    if (this.isFullArea()) return false;
+    var x2 = this.area.x + this.area.width;
+    var y2 = this.area.y + this.area.height;
+    // debugProps(dlArea);
+    return ((movx < 0) && (this.area.x > 0))
+    	|| ((movx > 0) && (x2 < 1.0))
+	|| ((movy < 0) && (this.area.y > 0))
+    	|| ((movy > 0) && (y2 < 1.0))
+}
+
+Digilib.prototype.moveBy = function(movx, movy) {
+    // move visible area by movx and movy (in units of ww, wh)
+    if (!this.canMove(movx, movy)) return; // nothing to do
+    var newarea = this.area.copy();
+    newarea.x += parseFloat(movx)*this.area.width;
+    newarea.y += parseFloat(movy)*this.area.height;
+    newarea = this.MAX_AREA.fit(newarea);
+    // set parameters
+    this.setParamFromArea(newarea);
+    this.display();
+}
+
+Digilib.prototype.getRef = function(baseUrl) {
+    // returns a reference to the current digilib set
+    if (!baseUrl) baseUrl 
+        = location.protocol
+        + "//" 
+        + location.host
+        + location.pathname;
+    var hyperlinkRef = baseUrl;
+    with (this.params) {
+    		// all without ddpi, pt
+    		var ps = getAll(PARAM_ALL & ~(PARAM_DPI | PARAM_PAGES | PARAM_CLIENT)); 
+    	}
+    if (ps.length > 0) hyperlinkRef += "?" + ps;
+    return hyperlinkRef;
+}
+
+Digilib.prototype.getRefWin = function(type, msg) {
+    // shows an alert with a reference to the current digilib set
+    if (! msg) msg = "URL reference to the current view";
+    prompt(msg, this.getRef());
+}
+
+Digilib.prototype.getQuality = function() {
+    // returns the current q setting
+    for (var i = 0; i < 3; i++) {
+        if (this.flags.get("q"+i)) return i;
+    }
+    return 1
+}
+
+Digilib.prototype.setQuality = function(qual) {
+    // set the image quality
+    if ((qual < 0)||(qual > 2)) return alert("Quality setting not supported");
+    for (var i = 0; i < 3; i++) this.flags.reset("q" + i);
+    this.flags.set("q" + qual);
+    this.display();
+}
+
+Digilib.prototype.setQualityWin = function(msg) {
+    // dialog for setting quality
+    if (! msg) msg = "Quality (0..2)";
+    var q = this.getQuality();
+    var newq = window.prompt(msg, q);
+    if (newq) this.setQuality(newq);
+}
+
+Digilib.prototype.mirror = function(dir) {
+    // mirror the image horizontally or vertically
+    if (dir == "h") {
+    		this.flags.toggle("hmir");
+    	} else {
+    		this.flags.toggle("vmir");
+	}
+    this.display();
+}
+
+Digilib.prototype.gotoPage = function(gopage, keep) {
+    // goto given page nr (+/-: relative)
+    var oldpn = parseInt(this.params.get("pn"));
+    // set with relative=true uses the sign
+    this.params.set("pn", gopage, true);
+    // now check the outcome
+    var pn = parseInt(this.params.get("pn"));
+    if (pn < 1) {
+        alert("No such page! (Page number too low)");
+        this.params.set("pn", oldpn);
+        return;
+    }
+    if (this.params.isSet("pt")) {
+        pt = parseInt(this.params.get("pt"))
+        if (pn > pt) {
+            alert("No such page! (Page number too high)");
+            this.params.set("pn", oldpn);
+            return;
+        }
+    }
+    if (keep) {
+        this.display(this.params.PARAM_ALL & ~this.params.PARAM_MARK); // all, no mark
+    } else {
+        this.display(this.params.PARAM_FILE | this.params.PARAM_MODE | this.params.PARAM_PAGES, this.params.MODE_QUAL | this.params.MODE_OTHER); // fn, pn, ws, mo + pt
+    }
+}
+
+Digilib.prototype.gotoPageWin = function() {
+    // dialog to ask for new page nr
+    var pn = this.params.get("pn");
+    var gopage = window.prompt("Go to page", pn);
+    if (gopage) this.gotoPage(gopage);
+}
+
+Digilib.prototype.setParamWin = function(param, text, relative) {
+    // dialog to ask for new parameter value
+    var val = this.params.get(param);
+    var newval = window.prompt(text, val);
+    if (newval) {
+        this.params.set(param, newval, relative);
+        this.display();
+    }
+}
+
+Digilib.prototype.showOptions = function(show) {
+    // show or hide option div
+    var elem = getElement("dloptions");
+    showElement(elem, show);
+    // FIX ME: get rid of the dotted line around the buttons when focused
+    }
+
+Digilib.prototype.showAboutDiv = function(show) {
+    // show or hide "about" div
+    var elem = getElement("about");
+    if (elem == null) {
+        if (show) alert("About Digilib - dialog missing in HTML code!"
+            + "\nDigilib Version: " + digilibVersion
+            + "\JSP Version: " + jspVersion
+            + "\ndlLib Version: " + dllibVersion
+            + "\nbaseLib Version: " + baseLibVersion);
+        return;
+        }
+    if (show) {
+        getElement("digilib-version").innerHTML = "Digilib Version: " + digilibVersion;
+        getElement("jsp-version").innerHTML = "JSP Version: " + jspVersion;
+        getElement("baselib-version").innerHTML = "baseLib Version: " + baseLibVersion;
+        getElement("dllib-version").innerHTML = "dlLib Version: " + dllibVersion;
+        var aboutRect = getElementRect(elem);
+        aboutRect.setCenter(getWinRect().getCenter());
+        moveElement(elem, aboutRect);
+        }
+    showElement(elem, show);
+    }
+    
+Digilib.prototype.setBirdImage = function() {
+    var img = getElement("bird-image");
+    var src = "../servlet/Scaler?" 
+        + this.params.getAll(this.params.PARAM_FILE)
+        + "&dw=" + this.BIRD_MAXX 
+        + "&dh=" + this.BIRD_MAXY;
+    img.src = src;
+}
+    
+Digilib.prototype.showBirdDiv = function(show) {
+    // show or hide "bird's eye" div
+    var startPos; // anchor for dragging
+    var newRect;  // position after drag
+    var birdImg = getElement("bird-image");
+    var birdArea = getElement("bird-area");
+    var overlay = getElement("bird-overlay");
+    showElement(birdImg, show);
+    // dont show selector if area has full size
+    if (!show || this.isFullArea()) {
+        // hide area
+        showElement(birdArea, false);
+        showElement(overlay, false);
+        return;
+    };
+    var birdImgRect = getElementRect(birdImg);
+    var area = this.area;
+    if (this.flags.get("osize") || this.flags.get("clip")) {
+    		// in original-size and pixel-by-pixel mode the area size is not valid
+    		var birdAreaRect = new Rectangle(
+        		birdImgRect.x + birdImgRect.width  * area.x,
+        		birdImgRect.y + birdImgRect.height * area.y, 
+        		5, 
+        		5);
+    } else {
+    		// scale area down to img size
+    		var birdAreaRect = new Rectangle(
+        		// what about borders ??
+        		birdImgRect.x + birdImgRect.width  * area.x,
+	        birdImgRect.y + birdImgRect.height * area.y,
+	        birdImgRect.width  * area.width,
+	        birdImgRect.height * area.height);
+	}
+    moveElement(birdArea, birdAreaRect);
+    showElement(birdArea, true);
+    moveElement(overlay, birdImgRect);
+    showElement(overlay, true);
+    registerEvent("mousedown", overlay, birdAreaStartDrag);
+    registerEvent("mousedown", birdImg, birdAreaStartDrag);
+
+	// our own reference to this for local functions
+	var digilib = this;
+
+    function birdAreaStartDrag(evt) {
+    // mousedown handler: start drag
+        startPos = evtPosition(evt);
+        unregisterEvent("mousedown", overlay, birdAreaStartDrag);
+        unregisterEvent("mousedown", birdImg, birdAreaStartDrag);
+        registerEvent("mousemove", document, birdAreaMove);
+        registerEvent("mouseup",   document, birdAreaEndDrag);
+        // debugProps(getElementRect(bird))
+        return stopEvent(evt);
+    }
+
+    function birdAreaMove(evt) {
+    // mousemove handler: drag
+        var pos = evtPosition(evt);
+        var dx = pos.x - startPos.x;
+        var dy = pos.y - startPos.y;
+        // move birdArea div, keeping size
+        newRect = new Rectangle(
+            birdAreaRect.x + dx,
+            birdAreaRect.y + dy,
+            birdAreaRect.width,
+            birdAreaRect.height);
+        // stay within image
+        newRect.stayInside(birdImgRect);
+        moveElement(birdArea, newRect);
+        showElement(birdArea, true);
+        return stopEvent(evt);
+    }
+
+    function birdAreaEndDrag(evt) {
+    // mouseup handler: reload page
+        unregisterEvent("mousemove", document, birdAreaMove);
+        unregisterEvent("mouseup",   document, birdAreaEndDrag);
+        showElement(overlay, false);
+        if (newRect == null) { // no movement happened
+            startPos = birdAreaRect.getCenter();
+            birdAreaMove(evt); // set center to click position
+            }
+        digilib.params.set("wx", cropFloat((newRect.x - birdImgRect.x) / birdImgRect.width));
+        digilib.params.set("wy", cropFloat((newRect.y - birdImgRect.y) / birdImgRect.height));
+        // zoomed is always fit
+        digilib.params.set("ws", 1);
+        digilib.display();
+        return stopEvent(evt);
+    }
+}
+
+Digilib.prototype.showArrow = function(name, rect, show) {
+    var arrow = getElement(name);
+    moveElement(arrow, rect);
+    showElement(arrow, show);
+}
+	
+Digilib.prototype.showArrows = function() {
+    // show the 4 arrow bars on top of scaler img according to current dlArea
+    var r = getElementRect(this.scalerImg);
+    this.showArrow('up',
+        new Rectangle(r.x, r.y, r.width, this.ARROW_WIDTH), 
+        this.canMove(0, -1)
+        );
+    this.showArrow('down',
+        new Rectangle(r.x, r.y + r.height - this.ARROW_WIDTH, r.width, this.ARROW_WIDTH),
+        this.canMove(0, 1)
+        );
+    this.showArrow('left',
+        new Rectangle(r.x, r.y, this.ARROW_WIDTH, r.height),
+        this.canMove(-1, 0)
+        );
+    this.showArrow('right',
+        new Rectangle(r.x + r.width - this.ARROW_WIDTH, r.y, this.ARROW_WIDTH, r.height),
+        this.canMove(1, 0)
+        );
+	}
+
+Digilib.prototype.calibrate = function() {
+    // calibrate screen resolution
+    var calDiv = getElement("calibration");
+    var calRect = getElementRect(calDiv);
+    moveCenter(false);
+    var wins = getWinSize();
+    calRect.setCenter(new Position(wins.width / 2, wins.height / 2));
+    moveElement(calDiv, calRect);
+    showElement(calDiv, true);
+    var cm = window.prompt("The length of the scale on your screen in centimeter:");
+    if (cm) {
+    		var dpi = calRect.width / parseFloat(cm) * 2.54;
+    		this.params.set("ddpi", cropFloat(dpi));
+    	}
+    	showElement(calDiv, false);
+}
+
+
+Digilib.prototype.setScale = function(scale) {
+	// sets original-size, pixel-by-pixel or fit-to-screen scale type
+	if (scale == "pixel") {
+		// pixel by pixel
+		this.flags.set("clip");
+		this.flags.reset("osize");
+		this.flags.reset("fit");
+	} else if (scale == "original") {
+		// original size -- needs calibrated screen
+        if (!this.params.isSet("ddpi")) {
+        		var dpi = cookie.get("ddpi");
+	        if (dpi == null) {
+    		        alert("Your screen has not yet been calibrated - using default value of 72 dpi");
+            		dpi = 72;
+            	}
+        		this.params.set("ddpi", dpi);
+        	}
+        this.flags.set("osize");
+        this.flags.reset("clip");
+		this.flags.reset("fit");
+    } else {
+    		// scale to screen size (default)
+    		this.flags.reset("clip");
+    		this.flags.reset("osize");
+    	}
+    this.display();
+}
+
+Digilib.prototype.getScale = function() {
+	// returns scale type
+	if (this.flags.get("clip")) {
+		return "pixel";
+	} else if (this.flags.get("osize")) {
+		return "original";
+	} else {
+		return "fit";
+	}
+}	
+
+Digilib.prototype.pageWidth = function() {
+	this.zoomFullpage('width');
+}
+
+Digilib.prototype.setSize = function(factor) {
+    this.params.set("ws", factor);
+    this.display();
+}
+
+Digilib.prototype.showMenu = function(menuId, buttonId, show) {
+    var menu = getElement(menuId);
+    if (show) {
+        // align right side of menu with button
+        var buttonPos = getElementPosition(getElement(buttonId));
+        var menusize = getElementSize(menu);
+        moveElement(menu, new Position(buttonPos.x - menusize.width - 3, buttonPos.y));
+        }
+    showElement(menu, show);
+}
+
+
+/********************************
+ * global variables
+ ********************************/
+
+var dl = new Digilib();
+
+/* old parameter function compatibility stuff */
+function newParameter(a,b,c) {return dl.params.define(a,b,c)};
+function resetParameter(a) {return dl.params.reset(a)};
+function deleteParameter(a) {return dl.params.remove(a)};
+function getParameter(a) {return dl.params.get(a)};
+function setParameter(a,b,c) {return dl.params.set(a,b,c)};
+function hasParameter(a) {return dl.params.isSet(a)};
+function getAllParameters(a) {return dl.params.getAll(a)};
+getQueryString = getAllParameters;
+function parseParameters(a) {return dl.params.parse(a)};
+function getAllMarks() {return dl.marks.getAll()};
+getMarksQueryString = getAllMarks;
+function addMark(evt) {return dl.marks.addEvent(evt)};
+function deleteMark() {return dl.marks.pop()};
+function deleteAllMarks() {return dl.marks = new Marks()};
+function hasFlag(mode) {return dl.flags.get(mode)};
+function addFlag(mode) {return dl.flags.set(mode)};
+function removeFlag(mode) {return dl.flags.reset(mode)};
+function toggleFlag(mode) {return dl.flags.toggle(mode)};
+function getAllFlags() {return dl.flags.getAll()};
+/* old digilib function compatibility */
+function setDLParam(e, s, relative) {dl.setDLParam(e, s, relative)};
+function display(detail, moDetail) {dl.display(detail, moDetail)};
+function setMark(reload) {dl.setMark(reload)};
+function removeMark(reload) {dl.removeMark(reload)};
+function resetImage() {dl.resetImage()};
+function dragImage(evt) {dl.dragImage(evt)};
+function zoomArea() {dl.zoomArea()};
+function zoomBy(factor) {dl.zoomBy(factor)};
+function zoomFullpage(a) {dl.zoomFullpage(a)};
+function moveCenter(on) {dl.moveCenter(on)};
+function isFullArea(area) {dl.isFullArea(area)};
+function canMove(movx, movy) {dl.canMove(movx, movy)};
+function moveBy(movx, movy) {dl.moveBy(movx, movy)};
+function getRef(baseURL) {dl.getRef(baseURL)};
+function getRefWin(type, msg) {dl.getRefWin(type, msg)};
+function getQuality() {dl.getQuality()};
+function setQuality(qual) {dl.setQuality(qual)};
+function setQualityWin(msg) {dl.setQualityWin(msg)};
+function mirror(dir) {dl.mirror(dir)};
+function gotoPage(gopage, keep) {dl.gotoPage(gopage, keep)};
+function gotoPageWin() {dl.gotoPageWin()};
+function setParamWin(param, text, relative) {dl.setParamWin(param, text, relative)};
+function showOptions(show) {dl.showOptions(show)};
+function showBirdDiv(show) {dl.showBirdDiv(show)};
+function showAboutDiv(show) {dl.showAboutDiv(show)};
+function calibrate(direction) {dl.calibrate(direction)};
+function setScale(a) {dl.setScale(a)};
+function getScale(a) {dl.getScale(a)};
+function originalSize(on) {dl.originalSize(on)};
+function pixelByPixel(on) {dl.pixelByPixel(on)};
+function pageWidth() {dl.pageWidth()};
+function setSize(factor) {dl.setSize(factor)};
+function showMenu(a,b,c) {dl.showMenu(a,b,c)};
+
+
+// :tabSize=4:indentSize=4:noTabs=true:
+
Binary file client/src/main/webapp/greyskin/down.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/down.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="down.svg"
+   inkscape:export-filename="C:\digilib\greyskin\down.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000"
+   version="1.0">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="30.235294"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="234"
+     inkscape:window-y="77" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875,42.214557 C 13.517688,41.821426 5.3749998,33.298347 5.375,22.870807 C 5.375,12.193005 13.927192,3.5270576 24.4375,3.5270566 C 31.499113,3.5270566 37.650231,7.4400376 40.9375,13.245807 L 24.5,13.245807 L 8,13.245807 L 16.25,27.527057 L 24.5,41.808307 L 32.75,27.527057 L 40.96875,13.308307 C 42.552395,16.129468 43.46875,19.392821 43.46875,22.870807 C 43.46875,33.548609 34.947807,42.214557 24.4375,42.214557 C 24.191165,42.214557 23.931575,42.223992 23.6875,42.214557 z "
+       id="path2396" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/first.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/first.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="first.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\first.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 33.15625 16 L 33.15625 32.09375 L 19.1875 23.875 L 33.15625 16 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;display:inline"
+       d="M 17.017857,14.285715 L 17.017857,33.142857"
+       id="path1372" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 33.383475,15.616525 L 33.383475,31.704904 L 19.408897,23.484565 L 33.383475,15.616525 z "
+       id="path2576" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/firstlast.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.42.2"
+   sodipodi:docbase="/Volumes/User/Users/casties/Desktop/web-devel/digibutton"
+   sodipodi:docname="firstlast.svg"
+   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/first.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.0000000"
+     inkscape:cx="24.000000"
+     inkscape:cy="20.000000"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="688"
+     inkscape:window-height="491"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2330508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+       d="M 33.000000,13.571429 L 33.000000,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2330508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;display:inline"
+       d="M 33.151332,16.009382 L 33.151332,32.097761 L 19.176755,23.877422 L 33.151332,16.009382 z "
+       id="path1370" />
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;display:inline"
+       d="M 17.017857,14.285715 L 17.017857,33.142857"
+       id="path1372" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/fixed.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,354 @@
+// fixed.js: fix fixed positioning and fixed backgrounds in IE/Win
+// version 1.8, 08-Aug-2003
+// written by Andrew Clover <and@doxdesk.com>, use freely
+
+/*@cc_on
+@if (@_win32 && @_jscript_version>4)
+
+var fixed_positions= new Array();
+var fixed_backgrounds= new Array();
+var fixed_viewport;
+
+// Initialisation. Called when the <body> tag arrives. Set up viewport so the
+// rest of the script knows we're going, and add a measurer div, used to detect
+// font size changes and measure image sizes for backgrounds later   
+
+function fixed_init() {
+  fixed_viewport= (document.compatMode=='CSS1Compat') ?
+    document.documentElement : document.body;
+  var el= document.createElement('div');
+  el.setAttribute('id', 'fixed-measure');
+  el.style.position= 'absolute';
+  el.style.top= '0'; el.style.left= '0';
+  el.style.overflow= 'hidden'; el.style.visibility= 'hidden';
+  el.style.fontSize= 'xx-large'; el.style.height= '5em';
+  el.style.setExpression('width', 'fixed_measureFont()');
+  document.body.insertBefore(el, document.body.firstChild);
+}
+
+// Binding. Called every time an element is added to the document, check it
+// for fixed features, if found add to our lists and set initial props   
+
+function fixed_bind(el) {
+  var needLayout= false;
+  var tag= el.tagName.toLowerCase();
+  var st= el.style;
+  var cst= el.currentStyle;
+  var anc;
+
+  // find fixed-position elements
+  if (cst.position=='fixed') {
+    needLayout= true;
+    fixed_positions[fixed_positions.length]= el;
+    // store original positioning as we'll overwrite it
+    st.position= 'absolute';
+    st.fixedPLeft=   cst.left;
+    st.fixedPTop=    cst.top;
+    st.fixedPRight=  cst.right;
+    st.fixedPBottom= cst.bottom;
+    st.fixedPWidth=  fixed_parseLength(cst.width);
+    st.fixedPHeight= fixed_parseLength(cst.height);
+    // find element that will act as containing box, for convenience later
+    st.fixedCB= null;
+    for (anc= el; (anc= anc.parentElement).parentElement;) {
+      if (anc.currentStyle.position!='static') {
+        st.fixedCB= anc;
+        break;
+    } }
+    // detect nested fixed positioning (only ancestor need move)
+    st.fixedNest= false;
+    for (anc= el; anc= anc.parentElement;) {
+      if (anc.style.fixedNest!=null)
+        st.fixedNest= true;
+        break;
+    }
+  }
+
+  // find fixed-background elements (not body/html which IE already gets right)
+  if (cst.backgroundAttachment=='fixed' && tag!='body' && tag!='html') {
+    needLayout= true;
+    fixed_backgrounds[fixed_backgrounds.length]= el;
+    // get background offset, converting from keyword if necessary
+    st.fixedBLeft= fixed_parseLength(cst.backgroundPositionX);
+    st.fixedBTop=  fixed_parseLength(cst.backgroundPositionY);
+    // if it's a non-zero %age, need to know size of image for layout
+    if (st.fixedBLeft[1]=='%' || st.fixedBTop[1]=='%') {
+      st.fixedBWidth= 0; st.fixedBHeight= 0;
+      fixed_measureBack(el);
+    }
+  }
+  if (needLayout) fixed_layout();
+}
+
+// Layout. On every window or font size change, recalculate positioning   
+
+// Request re-layout at next free moment
+var fixed_delaying= false;
+function fixed_delayout() {
+  if (fixed_delaying) return;
+  fixed_delaying= true;
+  window.setTimeout(fixed_layout, 0);
+}
+
+var fixed_ARBITRARY= 200;
+
+function fixed_layout() {
+  fixed_delaying= false;
+  if (!fixed_viewport) return;
+  var i, el, st, j, pr, tmp, A= 'auto';
+  var cb, cbLeft, cbTop, cbRight, cbBottom, oLeft, oTop, oRight, oBottom;
+  var vpWidth=fixed_viewport.clientWidth, vpHeight=fixed_viewport.clientHeight;
+
+  // calculate initial position for fixed-position elements [black magic]
+  for (i= fixed_positions.length; i-->0;) {
+    el= fixed_positions[i]; st= el.style;
+    // find positioning of containing block
+    cb= st.fixedCB; if (!cb) cb= fixed_viewport;
+    cbLeft= fixed_pageLeft(cb); cbTop= fixed_pageTop(cb);
+    if (cb!=fixed_viewport) { cbLeft+= cb.clientLeft; cbTop+= cb.clientTop; }
+    cbRight= fixed_viewport.clientWidth-cbLeft-cb.clientWidth;
+    cbBottom= fixed_viewport.clientHeight-cbTop-cb.clientHeight;
+    // if size is in %, must recalculate relative to viewport
+    if (st.fixedPWidth[1]=='%')
+      st.width= Math.round(vpWidth*st.fixedPWidth[0]/100)+'px';
+    if (st.fixedPHeight[1]=='%')
+      st.height= Math.round(vpHeight*st.fixedPHeight[0]/100)+'px';
+    // find out offset values at max size, to account for margins
+    st.left= A; st.right= '0'; st.top= A; st.bottom= '0';
+    oRight= el.offsetLeft+el.offsetWidth; oBottom= el.offsetTop+el.offsetHeight;
+    st.left= '0'; st.right= A; st.top= '0'; st.bottom= A;
+    oLeft= el.offsetLeft; oTop= el.offsetTop;
+    // use this to convert all edges to pixels
+    st.left= A; st.right= st.fixedPRight;
+    st.top= A; st.bottom= st.fixedPBottom;
+    oRight-= el.offsetLeft+el.offsetWidth;
+    oBottom-= el.offsetTop+el.offsetHeight;
+    st.left= st.fixedPLeft; st.top= st.fixedPTop;
+    oLeft= el.offsetLeft-oLeft; oTop= el.offsetTop-oTop;
+    // edge positioning fix
+    if (st.fixedPWidth[1]==A && st.fixedPLeft!=A && st.fixedPRight!=A) {
+      tmp= el.offsetLeft; st.left= A; st.width= fixed_ARBITRARY+'px';
+      tmp= fixed_ARBITRARY+el.offsetLeft-tmp+cbLeft+cbRight;
+      st.left= st.fixedPLeft; st.width= ((tmp<1)?1:tmp)+'px';
+    }
+    if (st.fixedPHeight[1]==A && st.fixedPTop!=A && st.fixedPBottom!=A) {
+      tmp= el.offsetTop; st.top= A; st.height= fixed_ARBITRARY+'px';
+      tmp= fixed_ARBITRARY+el.offsetTop-tmp+cbTop+cbBottom;
+      st.top= st.fixedPTop; st.height= ((tmp<1)?1:tmp)+'px';
+    }
+    // move all non-auto edges relative to the viewport
+    st.fixedCLeft= (st.fixedPLeft=='auto') ? oLeft : oLeft-cbLeft;
+    st.fixedCTop= (st.fixedPTop=='auto') ? oTop : oTop-cbTop;
+    st.fixedCRight= (st.fixedPRight=='auto') ? oRight : oRight-cbRight;
+    st.fixedCBottom= (st.fixedPBottom=='auto') ? oBottom : oBottom-cbBottom;
+    // remove left-positioning of right-positioned elements
+    if (st.fixedPLeft=='auto' && st.fixedPRight!='auto') st.fixedCLeft= 'auto';
+    if (st.fixedPTop=='auto' && st.fixedPBottom!='auto') st.fixedCTop= 'auto';
+  }
+
+
+  // calculate initial positioning of fixed backgrounds
+  for (i= fixed_backgrounds.length; i-->0;) {
+    el= fixed_backgrounds[i]; st= el.style;
+    tmp= st.fixedBImage;
+    if (tmp) {
+      if (tmp.readyState!='uninitialized') {
+        st.fixedBWidth= tmp.offsetWidth;
+        st.fixedBHeight= tmp.offsetHeight;
+        st.fixedBImage= window.undefined;
+      }
+    }
+    st.fixedBX= fixed_length(el, st.fixedBLeft, vpWidth-st.fixedBWidth);
+    st.fixedBY= fixed_length(el, st.fixedBTop, vpHeight-st.fixedBHeight);
+  }
+
+  // now call scroll() to set the positions from the values just calculated
+  fixed_scroll();
+}
+
+// Scrolling. Offset fixed elements relative to viewport scrollness
+
+var fixed_lastX, fixed_lastY;
+var fixed_PATCHDELAY= 300;
+var fixed_patching= false;
+
+// callback function after a scroll, because incorrect scroll position is
+// often reported first go!
+function fixed_patch() {
+  fixed_patching= false;
+  var scrollX= fixed_viewport.scrollLeft, scrollY= fixed_viewport.scrollTop;
+  if (scrollX!=fixed_lastX && scrollY!=fixed_lastY) fixed_scroll();
+}
+
+function fixed_scroll() {
+  if (!fixed_viewport) return;
+  var i, el, st, viewportX, viewportY;
+  var scrollX= fixed_viewport.scrollLeft, scrollY= fixed_viewport.scrollTop;
+  fixed_lastX= scrollX; fixed_lastY= scrollY;
+
+  // move non-nested fixed-position elements
+  for (i= fixed_positions.length; i-->0;) {
+    st= fixed_positions[i].style;
+    viewportX= (st.fixedNest) ? 0 : scrollX;
+    viewportY= (st.fixedNest) ? 0 : scrollY;
+    if (st.fixedCLeft!='auto') st.left= (st.fixedCLeft+viewportX)+'px';
+    if (st.fixedCTop!='auto') st.top= (st.fixedCTop+viewportY)+'px';
+    viewportX= (st.fixedCB==null || st.fixedCB==fixed_viewport) ? 0 : viewportX;
+    viewportY= (st.fixedCB==null || st.fixedCB==fixed_viewport) ? 0 : viewportY;
+    st.right= (st.fixedCRight-viewportX+1)+'px'; st.right= (st.fixedCRight-viewportX)+'px';
+    st.bottom= (st.fixedCBottom-viewportY+1)+'px'; st.bottom= (st.fixedCBottom-viewportY)+'px';
+  }
+
+  // align fixed backgrounds to viewport
+  for (i= fixed_backgrounds.length; i-->0;) {
+    el= fixed_backgrounds[i]; st= el.style;
+    viewportX= scrollX;
+    viewportY= scrollY;
+    while (el.offsetParent) {
+      viewportX-= el.offsetLeft+el.clientLeft;
+      viewportY-= el.offsetTop +el.clientTop;
+      el= el.offsetParent;
+    }
+    st.backgroundPositionX= (st.fixedBX+viewportX)+'px';
+    st.backgroundPositionY= (st.fixedBY+viewportY)+'px';
+  }
+
+  // call back again in a tic
+  if (!fixed_patching) {
+    fixed_patching= true;
+    window.setTimeout(fixed_patch, fixed_PATCHDELAY);
+  }
+}
+
+// Measurement. Load bg-image into an invisible element on the page, when
+// loaded write the width/height to an element's style for layout use; detect
+// when font size changes
+
+function fixed_measureBack(el) {
+  var measure= document.getElementById('fixed-measure');
+  var img= document.createElement('img');
+  img.setAttribute('src', fixed_parseURL(el.currentStyle.backgroundImage));
+  measure.appendChild(img);
+  el.style.fixedBImage= img;
+  if (img.readyState=='uninitialized')
+    img.attachEvent('onreadystatechange', fixed_measureBackImage_ready);
+}
+
+function fixed_measureBackImage_ready() {
+  var img= event.srcElement;
+  if (img && img.readyState!='uninitialized') {
+    img.detachEvent('onreadystatechange', fixed_measureBackImage_ready);
+    fixed_layout();
+  }
+}
+
+var fixed_fontsize= 0;
+function fixed_measureFont() {
+  var fs= document.getElementById('fixed-measure').offsetHeight;
+  if (fixed_fontsize!=fs && fixed_fontsize!=0)
+    fixed_delayout();
+  fixed_fontsize= fs;
+  return '5em';
+}
+
+// Utility. General-purpose functions
+
+// parse url() to get value inside
+
+function fixed_parseURL(v) {
+  v= v.substring(4, v.length-1);
+  if (v.charAt(0)=='"' && v.charAt(v.length-1)=='"' ||
+      v.charAt(0)=="'" && v.charAt(v.length-1)=="'")
+    return v.substring(1, v.length-1);
+  else return v;
+}
+
+// parse length or auto or background-position keyword into number and unit
+
+var fixed_numberChars= '+-0123456789.';
+var fixed_ZERO= new Array(0, 'px');
+var fixed_50PC= new Array(50, '%');
+var fixed_100PC= new Array(100, '%');
+var fixed_AUTO= new Array(0, 'auto');
+
+function fixed_parseLength(v) {
+  var num, i;
+  if (v=='left'  || v=='top')    return fixed_ZERO;
+  if (v=='right' || v=='bottom') return fixed_100PC;
+  if (v=='center') return fixed_50PC;
+  if (v=='auto')   return fixed_AUTO;
+  i= 0;
+  while (i<v.length && fixed_numberChars.indexOf(v.charAt(i))!=-1)
+    i++;
+  num= parseFloat(v.substring(0, i));
+  if (num==0) return fixed_ZERO;
+  else return new Array(num, v.substring(i));
+}
+
+// convert parsed (number, unit) into a number of pixels
+
+function fixed_length(el, l, full) {
+  var tmp, x;
+  if (l[1]=='px') return l[0];
+  if (l[1]=='%')  return Math.round(full*l[0]/100);
+  // other units - measure by setting position; this is rather inefficient
+  // but then these units are used for background-position so seldom...
+  tmp= el.currentStyle.left;
+  el.style.left= '0';
+  x= el.offsetLeft;
+  el.style.left= l[0]+l[1];
+  x= el.offsetLeft-x;
+  el.style.left= tmp;
+  return x;
+}
+
+// convert stupid IE offsetLeft/Top to page-relative values
+
+function fixed_pageLeft(el) {
+  var v= 0;
+  while (el.offsetParent) {
+    v+= el.offsetLeft;
+    el= el.offsetParent;
+  }
+  return v;
+}
+function fixed_pageTop(el) {
+  var v= 0;
+  while (el.offsetParent) {
+    v+= el.offsetTop;
+    el= el.offsetParent;
+  }
+  return v;
+}
+
+// Scanning. Check document every so often until it has finished loading. Do
+// nothing until <body> arrives, then call main init. Pass any new elements
+// found on each scan to be bound   
+
+var fixed_SCANDELAY= 500;
+
+function fixed_scan() {
+  if (!document.body) return;
+  if (!fixed_viewport) fixed_init();
+  var el;
+  for (var i= 0; i<document.all.length; i++) {
+    el= document.all[i];
+    if (!el.fixed_bound) {
+      el.fixed_bound= true;
+      fixed_bind(el);
+  } }
+}
+
+var fixed_scanner;
+function fixed_stop() {
+  window.clearInterval(fixed_scanner);
+  fixed_scan();
+}
+
+fixed_scan();
+fixed_scanner= window.setInterval(fixed_scan, fixed_SCANDELAY);
+window.attachEvent('onload', fixed_stop);
+window.attachEvent('onresize', fixed_delayout);
+window.attachEvent('onscroll', fixed_scroll);
+
+@end @*/
Binary file client/src/main/webapp/greyskin/fwd.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/fwd.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="fwd.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\fwd.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="22"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 25.15625,3.53125 C 35.326062,3.9243803 43.46875,12.44746 43.46875,22.875 C 43.46875,33.552802 34.916558,42.218749 24.40625,42.21875 C 13.895943,42.21875 5.375001,33.552802 5.375,22.875 C 5.375,12.197198 13.895943,3.53125 24.40625,3.53125 C 24.652585,3.53125 24.912175,3.5218149 25.15625,3.53125 z M 17.09375,13.75 L 17.09375,33.3125 L 34.09375,23.3125 L 17.09375,13.75 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 17.59375,13.678571 L 17.59375,33.25 L 34.59375,23.25 L 17.59375,13.678571 z "
+       id="path2474" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/help.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/help.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="help.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\help.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <text
+       xml:space="preserve"
+       style="font-size:39.96018219px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="13.12768"
+       y="39.322536"
+       id="text4225"
+       transform="scale(1.062771,0.940936)"><tspan
+         sodipodi:role="line"
+         id="tspan4227"
+         x="13.12768"
+         y="39.322536">?</tspan></text>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/last.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/last.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="last.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\last.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 25.15625,3.53125 C 35.326062,3.9243803 43.46875,12.44746 43.46875,22.875 C 43.46875,33.552802 34.916558,42.218749 24.40625,42.21875 C 13.895943,42.21875 5.375001,33.552802 5.375,22.875 C 5.375,12.197198 13.895943,3.53125 24.40625,3.53125 C 24.652585,3.53125 24.912175,3.5218149 25.15625,3.53125 z M 15.6875,16 L 15.6875,32.09375 L 29.65625,23.875 L 15.6875,16 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       d="M 31.825893,14.285715 L 31.825893,33.142857"
+       id="path1372" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 15.460275,15.616525 L 15.460275,31.704904 L 29.434853,23.484565 L 15.460275,15.616525 z "
+       id="path2576" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/left.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/left.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="left.svg"
+   inkscape:export-filename="C:\digilib\greyskin\left.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000"
+   version="1.0">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="30.235294"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 5.0802215,22.138528 C 5.4733525,11.968716 13.996431,3.8260283 24.423971,3.8260285 C 35.101773,3.8260285 43.767721,12.37822 43.767722,22.888528 C 43.767722,29.950141 39.854741,36.101259 34.048971,39.388528 L 34.048971,22.951028 L 34.048971,6.4510285 L 19.767721,14.701028 L 5.4864715,22.951028 L 19.767721,31.201028 L 33.986471,39.419778 C 31.16531,41.003423 27.901957,41.919778 24.423971,41.919778 C 13.746169,41.919778 5.0802215,33.398835 5.0802215,22.888528 C 5.0802215,22.642193 5.0707865,22.382603 5.0802215,22.138528 z "
+       id="path2396" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/mark-bg-16.png has changed
Binary file client/src/main/webapp/greyskin/mark-bg.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mark-bg.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin"
+   sodipodi:docname="mark-bg2.svg"
+   inkscape:export-filename="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin/mark-bg-16.png"
+   inkscape:export-xdpi="4.654716"
+   inkscape:export-ydpi="4.654716">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3076">
+      <stop
+         id="stop3078"
+         offset="0"
+         style="stop-color:#651f0f;stop-opacity:1;" />
+      <stop
+         id="stop3080"
+         offset="1"
+         style="stop-color:#e46648;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3963">
+      <stop
+         style="stop-color:#c49c85;stop-opacity:1;"
+         offset="0"
+         id="stop3965" />
+      <stop
+         style="stop-color:#db4521;stop-opacity:1;"
+         offset="1"
+         id="stop3967" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3082">
+      <stop
+         id="stop3084"
+         offset="0"
+         style="stop-color:#ff0000;stop-opacity:1;" />
+      <stop
+         id="stop3086"
+         offset="1"
+         style="stop-color:#ff0000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1310">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop1312" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop1314" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.8757764"
+     inkscape:cx="151.17398"
+     inkscape:cy="906.44231"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="879"
+     inkscape:window-height="711"
+     inkscape:window-x="88"
+     inkscape:window-y="88"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="vertical"
+       position="110.152"
+       id="guide1315" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="944.16"
+       id="guide1317" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#f12d00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 86.073825,86.856886 C 110.16054,119.9571 127.91147,196.14366 127.15806,199.22781 C 127.15806,199.22781 120.92452,223.45391 120.92452,245.85115 C 120.92452,323.13115 174.1575,389.5 251.4375,389.5 C 328.7175,389.5 391.43749,326.78 391.4375,249.5 C 391.4375,172.22 326.99551,114.81273 249.97796,121.17633 L 207.73033,124.66706 C 202.54179,125.44165 124.88498,107.49727 86.073825,86.856886 z "
+       id="path3088"
+       sodipodi:nodetypes="ccsssscc"
+       inkscape:export-filename="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin/mark-bg.png"
+       inkscape:export-xdpi="6.9820738"
+       inkscape:export-ydpi="6.9820738" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mark-bg_old.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/Volumes/Schlachteplatte/Users/casties/Documents/prog/java/workspace/client/digitallibrary/greyskin"
+   sodipodi:docname="mark-bg.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3963">
+      <stop
+         style="stop-color:#c49c85;stop-opacity:1;"
+         offset="0"
+         id="stop3965" />
+      <stop
+         style="stop-color:#db4521;stop-opacity:1;"
+         offset="1"
+         id="stop3967" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3082">
+      <stop
+         id="stop3084"
+         offset="0"
+         style="stop-color:#ff0000;stop-opacity:1;" />
+      <stop
+         id="stop3086"
+         offset="1"
+         style="stop-color:#ff0000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1310">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop1312" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop1314" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3963"
+       id="radialGradient3969"
+       cx="163.01688"
+       cy="332.7197"
+       fx="163.01688"
+       fy="332.7197"
+       r="140.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.18401e-7,0.572953,-0.63396,-5.735991e-7,373.7883,110.3898)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3283607"
+     inkscape:cx="250.79029"
+     inkscape:cy="803.50858"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="88"
+     inkscape:window-y="88"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="vertical"
+       position="110.152"
+       id="guide1315" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="944.16"
+       id="guide1317" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#da4521;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 181.33867,127.68485 L 110.152,108.20218 L 135.62933,169.64752 L 181.33867,127.68485 z "
+       id="path1319" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3969);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3088"
+       sodipodi:cx="222.85715"
+       sodipodi:cy="238.07646"
+       sodipodi:rx="140"
+       sodipodi:ry="140"
+       d="M 362.85715 238.07646 A 140 140 0 1 1  82.857147,238.07646 A 140 140 0 1 1  362.85715 238.07646 z"
+       transform="translate(28.57143,11.42857)"
+       inkscape:export-filename="C:\Digilib\greyskin\mark-bg-16.png"
+       inkscape:export-xdpi="5.1245551"
+       inkscape:export-ydpi="5.1245551" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/mark.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mark.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="mark.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mark.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <rect
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.01823568;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2405"
+       width="18.981764"
+       height="18.981375"
+       x="14.573074"
+       y="13.296871" />
+    <text
+       xml:space="preserve"
+       style="font-size:23.58337593px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="15.091353"
+       y="33.00325"
+       id="text2403"
+       transform="scale(1.074523,0.930646)"><tspan
+         sodipodi:role="line"
+         id="tspan2405"
+         x="15.091353"
+         y="33.00325">1</tspan></text>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/mirror-horizontal-on.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mirror-horizontal-on.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="mirror-horizontal-on.svg"
+   inkscape:export-filename="C:\digilib\greyskin\mirror-horizontal-on.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 11.4375 13 L 23.4375 13 L 23.4375 36 L 11.4375 13 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:0.98214287;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
+       id="rect2628"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/mirror-horizontal.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mirror-horizontal.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="mirror-horizontal.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-horizontal.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 11.4375 13 L 23.4375 13 L 23.4375 36 L 11.4375 13 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="color:#000000;fill:#818181;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
+       id="rect2628"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/mirror-vertical-on.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mirror-vertical-on.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="mirror-vertical-on.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-horizontal-on.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="15.983193"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <g
+       id="g2685"
+       transform="matrix(0,-1,1,0,1.548972,47.29478)"
+       inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-vertical-on.png"
+       inkscape:export-xdpi="60"
+       inkscape:export-ydpi="60">
+      <path
+         id="path2396"
+         d="M 23.6875,3.5312497 C 13.517688,3.92438 5.3749993,12.44746 5.3750003,22.875 C 5.3750003,33.552802 13.927192,42.218749 24.4375,42.21875 C 34.947807,42.21875 43.468749,33.552802 43.46875,22.875 C 43.46875,12.197198 34.947807,3.5312497 24.4375,3.5312497 C 24.191165,3.5312497 23.931575,3.5218146 23.6875,3.5312497 z M 11.4375,13 L 23.4375,13 L 23.4375,36 L 11.4375,13 z "
+         style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128;display:inline" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="rect2628"
+         d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
+         style="color:#000000;fill:#000000;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/mirror-vertical.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mirror-vertical.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="mirror-vertical.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-vertical.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <g
+       id="g2813"
+       transform="matrix(0,-1,1,0,1.548972,47.29478)"
+       inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\mirror-vertical.png"
+       inkscape:export-xdpi="60"
+       inkscape:export-ydpi="60">
+      <path
+         id="path2396"
+         d="M 23.6875,3.53125 C 13.517688,3.9243803 5.3749998,12.44746 5.375,22.875 C 5.375,33.552802 13.927192,42.218749 24.4375,42.21875 C 34.947807,42.21875 43.468749,33.552802 43.46875,22.875 C 43.46875,12.197198 34.947807,3.53125 24.4375,3.53125 C 24.191165,3.53125 23.931575,3.5218149 23.6875,3.53125 z M 11.4375,13 L 23.4375,13 L 23.4375,36 L 11.4375,13 z "
+         style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128;display:inline" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="rect2628"
+         d="M 25.428571,13 L 37.428571,13 L 25.428571,36 L 25.428571,13 z "
+         style="color:#000000;fill:#818181;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/mirror.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="mirror.svg"
+   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/first.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2330508;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;display:inline"
+       d="M 33.151332,16.009382 L 33.151332,32.097761 L 19.176755,23.877422 L 33.151332,16.009382 z "
+       id="path1370" />
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;display:inline"
+       d="M 17.017857,14.285715 L 17.017857,33.142857"
+       id="path1372" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/options.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/options.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="options.svg"
+   inkscape:export-filename="C:\digilib\greyskin\options.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.1875 3.53125 C 13.239732 4.1660714 5.3749998 12.609754 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 C 23.358917 3.5352791 23.265829 3.5262514 23.1875 3.53125 z M 12 23 L 17.5625 23 L 17.5625 28.5625 L 12 28.5625 L 12 23 z M 21.5 23 L 27.0625 23 L 27.0625 28.5625 L 21.5 28.5625 L 21.5 23 z M 31 23 L 36.5625 23 L 36.5625 28.5625 L 31 28.5625 L 31 23 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline" />
+</svg>
Binary file client/src/main/webapp/greyskin/original-size.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/original-size.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="original-size.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\original-size.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="18.655462"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <g
+       id="g3544"
+       transform="translate(-0.642857,0.428572)">
+      <path
+         transform="translate(-1.071429,-0.714287)"
+         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
+         sodipodi:ry="1.9285715"
+         sodipodi:rx="1.9285715"
+         sodipodi:cy="18.785715"
+         sodipodi:cx="25.357143"
+         id="path3538"
+         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-1.071429,8.285713)"
+         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
+         sodipodi:ry="1.9285715"
+         sodipodi:rx="1.9285715"
+         sodipodi:cy="18.785715"
+         sodipodi:cx="25.357143"
+         id="path3542"
+         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:23.75772667px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="7.5327549"
+       y="31.319475"
+       id="text3548"><tspan
+         sodipodi:role="line"
+         id="tspan3550"
+         x="7.5327549"
+         y="31.319475">1</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:23.75772667px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"
+       x="25.077103"
+       y="31"
+       id="text3552"><tspan
+         sodipodi:role="line"
+         id="tspan3554"
+         x="25.077103"
+         y="31">1</tspan></text>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/page.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/page.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="page.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\page.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="22"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 15 10 L 29 10 L 29.15625 10 L 34.4375 16.84375 L 34.4375 36 L 15 36 L 15 10 z "
+       id="path2396" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 29,10 C 29,17 29,17 29,17 L 35,17"
+       id="path2414" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 15.285714,9.75 L 29.285713,9.75 L 29.428571,9.75 L 34.714286,16.607143 L 34.714286,35.75 L 15.285714,35.75 L 15.285714,9.75 z "
+       id="path2438"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/pagewidth.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/pagewidth.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="pagewidth.svg"
+   inkscape:export-filename="C:\digilib\pagewidth.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.791667"
+     inkscape:cx="24"
+     inkscape:cy="24.142434"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1024"
+     inkscape:window-height="749"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 26.436406 6.3451688 29.758089 8 32.625 L 8 13.4375 L 41 13.4375 L 41 32.40625 C 42.570104 29.594036 43.46875 26.336944 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 14 39.0625 C 16.993555 41.054839 20.594037 42.21875 24.4375 42.21875 C 28.271488 42.21875 31.823448 41.045827 34.8125 39.0625 L 14 39.0625 z "
+       id="path2396" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2222"
+       sodipodi:sides="3"
+       sodipodi:cx="15.514512"
+       sodipodi:cy="22.353563"
+       sodipodi:r1="3.2910488"
+       sodipodi:r2="1.6455244"
+       sodipodi:arg1="1.046877"
+       sodipodi:arg2="2.0940745"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 17.16095,25.203168 L 14.692207,23.778893 L 12.223463,22.354618 L 14.691293,20.928761 L 17.159123,19.502904 L 17.160036,22.353036 L 17.16095,25.203168 z "
+       transform="matrix(1.056109,0,0,1.093566,-3.711289,-1.423286)" />
+    <rect
+       style="opacity:1;color:#000000;fill:#adadad;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.69064897;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2227"
+       width="23"
+       height="0.45308331"
+       x="13.345325"
+       y="22.795227" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3103"
+       sodipodi:sides="3"
+       sodipodi:cx="15.514512"
+       sodipodi:cy="22.353563"
+       sodipodi:r1="3.2910488"
+       sodipodi:r2="1.6455244"
+       sodipodi:arg1="1.046877"
+       sodipodi:arg2="2.0940745"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 17.16095,25.203168 L 14.692207,23.778893 L 12.223463,22.354618 L 14.691293,20.928761 L 17.159123,19.502904 L 17.160036,22.353036 L 17.16095,25.203168 z "
+       transform="matrix(-1.056109,0,0,1.093566,52.66117,-1.410426)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline" />
+</svg>
Binary file client/src/main/webapp/greyskin/pixel-by-pixel.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/pixel-by-pixel.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="pixel-by-pixel.svg"
+   inkscape:export-filename="C:\digilib\greyskin\pixel-by-pixel.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14"
+     inkscape:cx="27.241845"
+     inkscape:cy="23.144712"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <g
+       id="g3773"
+       transform="translate(0.251193,0)">
+      <rect
+         y="18.237497"
+         x="10.237497"
+         height="8.8062553"
+         width="8.8062553"
+         id="rect3532"
+         style="opacity:1;color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.4749949;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         y="18.237497"
+         x="29.297611"
+         height="8.8062553"
+         width="8.8062553"
+         id="rect3534"
+         style="opacity:1;color:#000000;fill:#7f7f7f;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.4749949;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <g
+       id="g3544"
+       transform="translate(0.214285,0.428572)">
+      <path
+         transform="translate(-1.071429,-0.714287)"
+         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
+         sodipodi:ry="1.9285715"
+         sodipodi:rx="1.9285715"
+         sodipodi:cy="18.785715"
+         sodipodi:cx="25.357143"
+         id="path3538"
+         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-1.071429,8.285713)"
+         d="M 27.285715 18.785715 A 1.9285715 1.9285715 0 1 1  23.428572,18.785715 A 1.9285715 1.9285715 0 1 1  27.285715 18.785715 z"
+         sodipodi:ry="1.9285715"
+         sodipodi:rx="1.9285715"
+         sodipodi:cy="18.785715"
+         sodipodi:cx="25.357143"
+         id="path3542"
+         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/quality.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/quality.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="quality.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\quality.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <text
+       xml:space="preserve"
+       style="font-size:23.83600235px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="15.291191"
+       y="30.690783"
+       id="text3673"><tspan
+         sodipodi:role="line"
+         id="tspan3675"
+         x="15.291191"
+         y="30.690783">Q</tspan></text>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/reference.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/reference.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="reference.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\reference.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875 3.53125 C 17.438542 3.7728135 11.984671 7.0989567 8.6875 12.03125 L 40.1875 12.03125 C 36.761546 6.9063083 30.990651 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 8.25 33.03125 C 11.607176 38.538487 17.596957 42.218749 24.4375 42.21875 C 31.278043 42.21875 37.267824 38.538487 40.625 33.03125 L 8.25 33.03125 z "
+       id="path2396" />
+    <text
+       xml:space="preserve"
+       style="font-size:16.89605904px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="3.6020906"
+       y="28.190752"
+       id="text3313"
+       transform="scale(1.056842,0.946215)"><tspan
+         sodipodi:role="line"
+         id="tspan3315"
+         x="3.6020906"
+         y="28.190752">http:</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline" />
+</svg>
Binary file client/src/main/webapp/greyskin/reset.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/reset.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="reset.svg"
+   inkscape:export-filename="/home/wolfdietrich/mounts/hertz/grafik-button-create/reset/reset.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2390">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective18" />
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective829"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.4748737"
+     inkscape:cx="27.338402"
+     inkscape:cy="-32.044727"
+     inkscape:current-layer="layer4"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="738"
+     inkscape:window-x="-4"
+     inkscape:window-y="-3"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="24.857143,20.571429"
+       id="guide22" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="37.285714,24.571429"
+       id="guide24" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Ebene">
+    <g
+       id="g845"
+       inkscape:export-xdpi="60"
+       inkscape:export-ydpi="60">
+      <path
+         sodipodi:nodetypes="cssssc"
+         id="path2396"
+         d="M 23.6875,3.53125 C 13.517688,3.9243803 5.3749998,12.44746 5.375,22.875 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.34375 -19.03125,-19.34375 -0.246335,0 -0.505925,-0.00944 -0.75,0 z"
+         style="display:inline;fill:#707070;fill-opacity:0.35526315000000003;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128000000003;stroke-dasharray:none" />
+      <path
+         id="path811"
+         d="M 15.5625 12.84375 C 15.471394 12.841739 15.374159 12.880561 15.28125 12.90625 C 15.27061 12.90915 15.26062 12.90295 15.25 12.90625 L 15.25 12.9375 C 14.899967 13.050963 14.670821 13.327726 14.59375 13.625 C 14.51797 13.917276 14.60406 14.263512 14.84375 14.53125 L 14.8125 14.5625 L 14.84375 14.59375 L 23.28125 23.5625 L 14.53125 31.8125 C 14.52275 31.8196 14.53945 31.8364 14.53125 31.84375 C 14.24365 32.100575 14.115992 32.472114 14.21875 32.84375 C 14.22165 32.85439 14.21545 32.86438 14.21875 32.875 L 14.25 32.875 C 14.363463 33.225033 14.640226 33.454179 14.9375 33.53125 C 15.229776 33.60703 15.576012 33.52094 15.84375 33.28125 L 15.875 33.3125 L 15.90625 33.28125 L 24.65625 25.03125 L 32.8125 33.6875 C 33.602654 34.549486 35.102654 33.174486 34.3125 32.3125 L 26.15625 23.65625 L 35 15.3125 C 35.861986 14.522346 34.486986 13.022346 33.625 13.8125 L 24.75 22.1875 L 16.3125 13.21875 C 16.3054 13.21025 16.2886 13.22695 16.28125 13.21875 C 16.088631 13.00305 15.835818 12.849784 15.5625 12.84375 z "
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 16.866525,15.295096 0,16.088379 13.974577,-8.220339 -13.974577,-7.86804 z"
+       id="path7614" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 33,13.571429 0,18.857142"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline" />
+</svg>
Binary file client/src/main/webapp/greyskin/rgb-on.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/rgb-on.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="rgb-on.svg"
+   inkscape:export-filename="C:\digilib\greyskin\rgb-on.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 24.3125 14.71875 C 24.347511 14.718306 24.402384 14.71875 24.4375 14.71875 C 28.932357 14.71875 32.5625 18.380143 32.5625 22.875 C 32.5625 27.369858 28.932357 31.03125 24.4375 31.03125 C 19.942642 31.031249 16.28125 27.369857 16.28125 22.875 C 16.28125 18.415259 19.866057 14.775135 24.3125 14.71875 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <rect
+       style="opacity:1;color:#000000;fill:#ff2424;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4326"
+       width="11"
+       height="11.428572"
+       x="19"
+       y="8.5714283" />
+    <rect
+       style="opacity:1;color:#000000;fill:#3cff27;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4328"
+       width="11"
+       height="11.428572"
+       x="12"
+       y="22" />
+    <rect
+       style="opacity:1;color:#000000;fill:#2330ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4330"
+       width="11"
+       height="11.428572"
+       x="26"
+       y="22" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/rgb.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/rgb.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="rgb.svg"
+   inkscape:export-filename="C:\digilib\greyskin\rgb.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <rect
+       style="opacity:1;color:#000000;fill:#ff2424;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4326"
+       width="11"
+       height="11.428572"
+       x="19"
+       y="8.5714283" />
+    <rect
+       style="opacity:1;color:#000000;fill:#3cff27;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4328"
+       width="11"
+       height="11.428572"
+       x="12"
+       y="22" />
+    <rect
+       style="opacity:1;color:#000000;fill:#2330ff;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4330"
+       width="11"
+       height="11.428572"
+       x="26"
+       y="22" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/right.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/right.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="right.svg"
+   inkscape:export-filename="C:\\digilib\greyskin\right.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000"
+   version="1.0">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="30.235294"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 43.763529,23.607278 C 43.370398,33.77709 34.847319,41.919778 24.419779,41.919778 C 13.741977,41.919778 5.0760293,33.367586 5.0760283,22.857278 C 5.0760283,15.795665 8.9890093,9.644547 14.794779,6.3572783 L 14.794779,22.794778 L 14.794779,39.294778 L 29.076029,31.044778 L 43.357279,22.794778 L 29.076029,14.544778 L 14.857279,6.3260283 C 17.67844,4.7423833 20.941793,3.8260283 24.419779,3.8260283 C 35.097581,3.8260283 43.763529,12.346971 43.763529,22.857278 C 43.763529,23.103613 43.772964,23.363203 43.763529,23.607278 z "
+       id="path2396"
+       inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\right.png"
+       inkscape:export-xdpi="60"
+       inkscape:export-ydpi="60" />
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/rightleft.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.42.2"
+   sodipodi:docbase="/Volumes/User/Users/casties/Desktop/web-devel/digibutton"
+   sodipodi:docname="rightleft.svg"
+   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/left.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.0000000"
+     inkscape:cx="24.000000"
+     inkscape:cy="22.000000"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="688"
+     inkscape:window-height="509"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0.000000,0.000000,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;display:inline"
+       d="M 31.750000,13.750000 L 31.750000,33.321429 L 14.750000,23.321429 L 31.750000,13.750000 z "
+       id="path7649" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/rotate-on.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/rotate-on.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="rotate-on.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\rotate-on.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 24.286853,12.87354 C 19.030287,13.204565 14.87354,17.597075 14.87354,22.93677 C 14.87354,22.965702 14.873296,22.991755 14.87354,23.02063 L 17.074871,23.02063 C 17.074597,22.993581 17.074871,22.963883 17.074871,22.93677 C 17.074871,18.70033 20.424718,15.23459 24.622294,15.074871 C 24.723036,15.071038 24.835095,15.074871 24.93677,15.074871 C 29.274884,15.074871 32.798668,18.598655 32.798668,22.93677 C 32.798668,27.146097 29.474235,30.597972 25.314141,30.798668 L 25.314141,33 C 30.696611,32.803733 35,28.366904 35,22.93677 C 35,17.381867 30.491673,12.87354 24.93677,12.87354 C 24.784878,12.87354 24.625795,12.866869 24.475538,12.87354 C 24.412904,12.87632 24.349184,12.869615 24.286853,12.87354 z "
+       id="path3724" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3738"
+       sodipodi:sides="3"
+       sodipodi:cx="7.7142859"
+       sodipodi:cy="23.142857"
+       sodipodi:r1="5.1448407"
+       sodipodi:r2="2.5724204"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 7.714286,28.287697 L 5.4865044,24.429067 L 3.258723,20.570436 L 7.7142859,20.570436 L 12.169849,20.570436 L 9.9420672,24.429067 L 7.714286,28.287697 z "
+       transform="matrix(0.991317,0,0,0.991317,8.494228,1.957927)" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/rotate.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/rotate.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="rotate.svg"
+   inkscape:export-filename="/Volumes/User/Users/casties/Desktop/web-devel/digibutton/first.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       id="path2396"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="M 48.142857 26.214285 A 17.928572 18.214285 0 1 1  12.285713,26.214285 A 17.928572 18.214285 0 1 1  48.142857 26.214285 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       style="color:#000000;fill:#797979;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 24.286853,12.87354 C 19.030287,13.204565 14.87354,17.597075 14.87354,22.93677 C 14.87354,22.965702 14.873296,22.991755 14.87354,23.02063 L 17.074871,23.02063 C 17.074597,22.993581 17.074871,22.963883 17.074871,22.93677 C 17.074871,18.70033 20.424718,15.23459 24.622294,15.074871 C 24.723036,15.071038 24.835095,15.074871 24.93677,15.074871 C 29.274884,15.074871 32.798668,18.598655 32.798668,22.93677 C 32.798668,27.146097 29.474235,30.597972 25.314141,30.798668 L 25.314141,33 C 30.696611,32.803733 35,28.366904 35,22.93677 C 35,17.381867 30.491673,12.87354 24.93677,12.87354 C 24.784878,12.87354 24.625795,12.866869 24.475538,12.87354 C 24.412904,12.87632 24.349184,12.869615 24.286853,12.87354 z "
+       id="path3724" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#797979;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3738"
+       sodipodi:sides="3"
+       sodipodi:cx="7.7142859"
+       sodipodi:cy="23.142857"
+       sodipodi:r1="5.1448407"
+       sodipodi:r2="2.5724204"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 7.714286,28.287697 L 5.4865044,24.429067 L 3.258723,20.570436 L 7.7142859,20.570436 L 12.169849,20.570436 L 9.9420672,24.429067 L 7.714286,28.287697 z "
+       transform="matrix(0.991317,0,0,0.991317,8.494228,1.957927)" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/ruler-top.gif has changed
Binary file client/src/main/webapp/greyskin/size.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/size.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="size.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\size.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="21.142857"
+     inkscape:cy="17.503443"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="13.142857"
+       y="20.142857"
+       id="text3280"><tspan
+         sodipodi:role="line"
+         id="tspan3282"
+         x="13.142857"
+         y="20.142857" /></text>
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.0625 3.53125 C 13.169888 4.224269 5.3749998 12.649853 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 C 23.358917 3.5352791 23.265829 3.5262514 23.1875 3.53125 C 23.148642 3.5337298 23.101295 3.5285323 23.0625 3.53125 z M 24.78125 4.625 L 27.59375 9.53125 L 30.375 14.40625 L 24.75 14.375 L 19.125 14.375 L 21.96875 9.5 L 24.78125 4.625 z M 16.21875 17.8125 L 16.25 23.4375 L 16.25 29.0625 L 11.375 26.25 L 6.5 23.46875 L 11.34375 20.625 L 16.21875 17.8125 z M 33.1875 17.8125 L 38.0625 20.625 L 42.9375 23.46875 L 38.03125 26.25 L 33.15625 29.0625 L 33.1875 23.4375 L 33.1875 17.8125 z M 24.75 31.3125 L 30.375 31.3125 L 27.59375 36.1875 L 24.78125 41.0625 L 21.96875 36.1875 L 19.125 31.34375 L 24.75 31.3125 z "
+       id="path2396" />
+    <g
+       id="g2382"
+       transform="translate(34.36755,-3.061025)">
+      <path
+         transform="matrix(0.832068,0.650269,-0.650269,0.832068,-25.54226,-3.7102)"
+         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.4277039"
+         sodipodi:arg1="0.38050638"
+         sodipodi:r2="3.0772371"
+         sodipodi:r1="6.1544743"
+         sodipodi:cy="20"
+         sodipodi:cx="20.571428"
+         sodipodi:sides="3"
+         id="path2370"
+         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="star" />
+      <path
+         transform="matrix(-0.832068,0.650269,0.650269,0.832068,6.113689,-3.7102)"
+         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.4277039"
+         sodipodi:arg1="0.38050638"
+         sodipodi:r2="3.0772371"
+         sodipodi:r1="6.1544743"
+         sodipodi:cy="20"
+         sodipodi:cx="20.571428"
+         sodipodi:sides="3"
+         id="path2372"
+         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="star" />
+      <path
+         transform="matrix(0.650269,-0.832068,0.832068,0.650269,-39.67515,41.54226)"
+         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.4277039"
+         sodipodi:arg1="0.38050638"
+         sodipodi:r2="3.0772371"
+         sodipodi:r1="6.1544743"
+         sodipodi:cy="20"
+         sodipodi:cx="20.571428"
+         sodipodi:sides="3"
+         id="path2374"
+         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="star" />
+      <path
+         transform="matrix(0.650269,0.832068,0.832068,-0.650269,-39.67515,9.886315)"
+         d="M 26.285714,22.285714 L 21.010257,23.045787 L 15.734799,23.80586 L 17.714285,18.857143 L 19.693772,13.908426 L 22.989743,18.09707 L 26.285714,22.285714 z "
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.4277039"
+         sodipodi:arg1="0.38050638"
+         sodipodi:r2="3.0772371"
+         sodipodi:r1="6.1544743"
+         sodipodi:cy="20"
+         sodipodi:cx="20.571428"
+         sodipodi:sides="3"
+         id="path2376"
+         style="color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/trans.gif has changed
Binary file client/src/main/webapp/greyskin/up.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/up.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\Digilib\greyskin"
+   sodipodi:docname="up.svg"
+   inkscape:export-filename="C:\digilib\greyskin\up.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000"
+   version="1.0">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="30.235294"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 31.499113 42.21875 37.650231 38.305769 40.9375 32.5 L 24.5 32.5 L 8 32.5 L 16.25 18.21875 L 24.5 3.9375 L 32.75 18.21875 L 40.96875 32.4375 C 42.552395 29.616339 43.46875 26.352986 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z "
+       id="path2396" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/zoom-area.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/zoom-area.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="zoom-area.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-area.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="18.655462"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.529;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
+       id="path2396" />
+    <rect
+       style="opacity:1;color:#000000;fill:#707070;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:0.52899998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;visibility:visible;display:inline;overflow:visible"
+       id="rect2218"
+       width="11.125114"
+       height="10.765433"
+       x="18.755346"
+       y="17.050652" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;display:inline"
+       id="path3286"
+       sodipodi:cx="18.857143"
+       sodipodi:cy="16.857143"
+       sodipodi:rx="6"
+       sodipodi:ry="5.5714288"
+       d="M 24.857143 16.857143 A 6 5.5714288 0 1 1  12.857143,16.857143 A 6 5.5714288 0 1 1  24.857143 16.857143 z"
+       transform="matrix(1.088683,0,0,1.172638,-8.357024,16.759)" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:3.0204308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 7.4897846,41.510215 C 1.7078166,46.946991 1.7078166,46.946991 1.7078166,46.946991"
+       id="path3290" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/zoom-full.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/zoom-full.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="zoom-full.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-full.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="18.655462"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50331128;opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none"
+       d="M 23.6875 3.53125 C 13.517688 3.9243803 5.3749998 12.44746 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 z M 12.1875 8.5625 C 20.242446 8.5625 28.288805 8.5625 36.34375 8.5625 C 36.165958 16.203164 36.198276 28.144598 35.96875 37.4375 C 28.043342 37.4375 20.112909 37.4375 12.1875 37.4375 C 12.1875 27.807871 12.1875 18.192129 12.1875 8.5625 z "
+       id="path2396" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.5000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 17.000000,13.428571 L 17.000000,33.000000 L 34.000000,23.000000 L 17.000000,13.428571 z "
+       id="path7614" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;display:inline"
+       id="path3286"
+       sodipodi:cx="18.857143"
+       sodipodi:cy="16.857143"
+       sodipodi:rx="6"
+       sodipodi:ry="5.5714288"
+       d="M 24.857143 16.857143 A 6 5.5714288 0 1 1  12.857143,16.857143 A 6 5.5714288 0 1 1  24.857143 16.857143 z"
+       transform="matrix(1.088683,0,0,1.172638,-8.357024,16.759)" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:3.0204308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 7.4897846,41.510215 C 1.7078166,46.946991 1.7078166,46.946991 1.7078166,46.946991"
+       id="path3290" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/zoom-in.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/zoom-in.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="zoom-in.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-in.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.4375 3.53125 C 13.378936 4.04697 5.3749998 12.528925 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 z M 23.3125 11.4375 C 23.355991 11.433691 23.393865 11.440789 23.4375 11.4375 C 23.442997 11.437086 23.463446 11.437656 23.46875 11.4375 C 23.489416 11.437624 23.510548 11.437243 23.53125 11.4375 C 23.536568 11.437394 23.556985 11.437848 23.5625 11.4375 C 23.56528 11.437324 23.587298 11.437439 23.59375 11.4375 C 23.614386 11.437591 23.635578 11.437274 23.65625 11.4375 C 23.661589 11.437416 23.681923 11.437783 23.6875 11.4375 C 23.871718 11.42815 24.063473 11.4375 24.25 11.4375 C 30.21888 11.4375 35.0625 16.280052 35.0625 22.25 C 35.062502 28.219949 30.21888 33.0625 24.25 33.0625 C 18.281121 33.062498 13.4375 28.219948 13.4375 22.25 C 13.4375 16.601105 17.789186 11.921302 23.3125 11.4375 z "
+       id="path2396" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:1.46576595;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3217"
+       sodipodi:cx="27.142857"
+       sodipodi:cy="19.714285"
+       sodipodi:rx="10.428572"
+       sodipodi:ry="10.142858"
+       d="M 37.571428 19.714285 A 10.428572 10.142858 0 1 1  16.714285,19.714285 A 10.428572 10.142858 0 1 1  37.571428 19.714285 z"
+       transform="matrix(1,0,0,1.047257,-3.321428,1.726256)" />
+    <rect
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.18805659;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2223"
+       width="2.5"
+       height="10.969203"
+       x="-23.834541"
+       y="18.436769"
+       transform="matrix(0,-1,1,0,0,0)" />
+    <rect
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.18805659;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2244"
+       width="2.5"
+       height="10.969203"
+       x="22.594028"
+       y="17.022598" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="13.142857"
+       y="20.142857"
+       id="text3280"><tspan
+         sodipodi:role="line"
+         id="tspan3282"
+         x="13.142857"
+         y="20.142857" /></text>
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.5,30.071429 C 6.928571,39.071429 6.928571,39.071429 6.928571,39.071429"
+       id="path3290" />
+  </g>
+</svg>
Binary file client/src/main/webapp/greyskin/zoom-out.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/greyskin/zoom-out.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\src\ECHO\digilib\client\digitallibrary\greyskin"
+   sodipodi:docname="zoom-out.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\zoom-out.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="20"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="830"
+     inkscape:window-height="540"
+     inkscape:window-x="17"
+     inkscape:window-y="22" />
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="opacity:1.0000000;fill:#707070;fill-opacity:0.35526314;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:0.50331128"
+       d="M 23.4375 3.53125 C 13.378936 4.04697 5.3749998 12.528925 5.375 22.875 C 5.375 33.552802 13.927192 42.218749 24.4375 42.21875 C 34.947807 42.21875 43.468749 33.552802 43.46875 22.875 C 43.46875 12.197198 34.947807 3.53125 24.4375 3.53125 C 24.191165 3.53125 23.931575 3.5218149 23.6875 3.53125 C 23.608048 3.5343213 23.516701 3.5271892 23.4375 3.53125 z M 23.3125 11.4375 C 23.355991 11.433691 23.393865 11.440789 23.4375 11.4375 C 23.442997 11.437086 23.463446 11.437656 23.46875 11.4375 C 23.489416 11.437624 23.510548 11.437243 23.53125 11.4375 C 23.536568 11.437394 23.556985 11.437848 23.5625 11.4375 C 23.56528 11.437324 23.587298 11.437439 23.59375 11.4375 C 23.614386 11.437591 23.635578 11.437274 23.65625 11.4375 C 23.661589 11.437416 23.681923 11.437783 23.6875 11.4375 C 23.871718 11.42815 24.063473 11.4375 24.25 11.4375 C 30.21888 11.4375 35.0625 16.280052 35.0625 22.25 C 35.062502 28.219949 30.21888 33.0625 24.25 33.0625 C 18.281121 33.062498 13.4375 28.219948 13.4375 22.25 C 13.4375 16.601105 17.789186 11.921302 23.3125 11.4375 z "
+       id="path2396" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.35294118;fill-rule:nonzero;stroke:#000000;stroke-width:1.46576595;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3217"
+       sodipodi:cx="27.142857"
+       sodipodi:cy="19.714285"
+       sodipodi:rx="10.428572"
+       sodipodi:ry="10.142858"
+       d="M 37.571428 19.714285 A 10.428572 10.142858 0 1 1  16.714285,19.714285 A 10.428572 10.142858 0 1 1  37.571428 19.714285 z"
+       transform="matrix(1,0,0,1.047257,-3.321428,1.726256)" />
+    <rect
+       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.18805659;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2223"
+       width="2.5"
+       height="10.969203"
+       x="-23.834541"
+       y="18.436769"
+       transform="matrix(0,-1,1,0,0,0)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="l2"
+     style="display:none">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.866525,15.295096 L 16.866525,31.383475 L 30.841102,23.163136 L 16.866525,15.295096 z "
+       id="path7614" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 33,13.571429 L 33,32.428571"
+       id="path1367" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="l3"
+     style="display:inline">
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="13.142857"
+       y="20.142857"
+       id="text3280"><tspan
+         sodipodi:role="line"
+         id="tspan3282"
+         x="13.142857"
+         y="20.142857" /></text>
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.5,30.071429 C 6.928571,39.071429 6.928571,39.071429 6.928571,39.071429"
+       id="path3290" />
+  </g>
+</svg>
Binary file client/src/main/webapp/img/Thumbs.db has changed
Binary file client/src/main/webapp/img/digilib-denied.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/img/digilib-denied.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg1307"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\temp"
+   sodipodi:docname="digilib-denied.svg"
+   inkscape:export-filename="C:\temp\digilib-denied.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs1309" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.2782051"
+     inkscape:cx="34.898932"
+     inkscape:cy="35.775981"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4">
+    <sodipodi:guide
+       orientation="vertical"
+       position="-1.9327861"
+       id="guide23493" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect1319"
+       width="34.523312"
+       height="42.631897"
+       x="-73.168289"
+       y="40.459969"
+       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
+    <rect
+       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect8613"
+       width="2.4545455"
+       height="0"
+       x="58.545456"
+       y="6" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect9490"
+       width="18.989349"
+       height="30.290173"
+       x="-63.894802"
+       y="44.831184"
+       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1"
+       id="rect10365"
+       width="10"
+       height="7.5454545"
+       x="-43"
+       y="11.454545" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect16478"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19107"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19109"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19111"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.538849"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19113"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19115"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19117"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.723278"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19119"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24390"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="26.132593"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24392"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24394"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24396"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24398"
+       width="8.6068287"
+       height="8.6778221"
+       x="-11.682427"
+       y="0.20279986"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24400"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24404"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24406"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.519249"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#d20000;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="path3136"
+       sodipodi:cx="35.152546"
+       sodipodi:cy="24.377884"
+       sodipodi:rx="12.079913"
+       sodipodi:ry="11.596717"
+       d="M 47.232459 24.377884 A 12.079913 11.596717 0 1 1  23.072633,24.377884 A 12.079913 11.596717 0 1 1  47.232459 24.377884 z"
+       transform="matrix(1.769606,0,0,1.869472,-29.36785,-18.58286)" />
+    <rect
+       style="fill:#fffdfd;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="rect3140"
+       width="27.137299"
+       height="11.311166"
+       x="18.862701"
+       y="21" />
+  </g>
+</svg>
Binary file client/src/main/webapp/img/digilib-error.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/img/digilib-error.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg1307"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\temp"
+   sodipodi:docname="digilib-error.svg"
+   inkscape:export-filename="C:\temp\digilib-error.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs1309" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.2782051"
+     inkscape:cx="34.898932"
+     inkscape:cy="35.775981"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4">
+    <sodipodi:guide
+       orientation="vertical"
+       position="-1.9327861"
+       id="guide23493" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect1319"
+       width="34.523312"
+       height="42.631897"
+       x="-73.168289"
+       y="40.459969"
+       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
+    <rect
+       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect8613"
+       width="2.4545455"
+       height="0"
+       x="58.545456"
+       y="6" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect9490"
+       width="18.989349"
+       height="30.290173"
+       x="-63.894802"
+       y="44.831184"
+       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1"
+       id="rect10365"
+       width="10"
+       height="7.5454545"
+       x="-43"
+       y="11.454545" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect16478"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19107"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19109"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19111"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.538849"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19113"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19115"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19117"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.723278"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19119"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24390"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="26.132593"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24392"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24394"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24396"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24398"
+       width="8.6068287"
+       height="8.6778221"
+       x="-11.682427"
+       y="0.20279986"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24400"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24404"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24406"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.519249"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <text
+       xml:space="preserve"
+       style="font-size:87.45126343px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f20000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
+       x="13.068455"
+       y="68.538353"
+       id="text2236"
+       sodipodi:linespacing="125%"
+       transform="scale(1.196511,0.835764)"><tspan
+         sodipodi:role="line"
+         id="tspan2238"
+         x="13.068455"
+         y="68.538353">!</tspan></text>
+  </g>
+</svg>
Binary file client/src/main/webapp/img/digilib-logo-small.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/img/digilib-logo-sw.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg1307"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\temp"
+   sodipodi:docname="Digilib-logo-2-sw.svg">
+  <defs
+     id="defs1309" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.2782051"
+     inkscape:cx="34.898932"
+     inkscape:cy="26.066316"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4">
+    <sodipodi:guide
+       orientation="vertical"
+       position="-1.9327861"
+       id="guide23493" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect1319"
+       width="34.523312"
+       height="42.631897"
+       x="-73.168289"
+       y="40.459969"
+       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
+    <rect
+       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect8613"
+       width="2.4545455"
+       height="0"
+       x="58.545456"
+       y="6" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect9490"
+       width="18.989349"
+       height="30.290173"
+       x="-63.894802"
+       y="44.831184"
+       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1"
+       id="rect10365"
+       width="10"
+       height="7.5454545"
+       x="-43"
+       y="11.454545" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect16478"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19107"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19109"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19111"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.538849"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19113"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19115"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19117"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.723278"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19119"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24390"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="26.132593"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24392"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24394"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24396"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24398"
+       width="8.6068287"
+       height="8.6778221"
+       x="-11.682427"
+       y="0.20279986"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24400"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24404"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24406"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.519249"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+  </g>
+</svg>
Binary file client/src/main/webapp/img/digilib-logo-text1.png has changed
Binary file client/src/main/webapp/img/digilib-logo.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/img/digilib-logo.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg1307"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\temp"
+   sodipodi:docname="Digilib-logo-2.svg">
+  <defs
+     id="defs1309" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.2782051"
+     inkscape:cx="34.898932"
+     inkscape:cy="35.775981"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4">
+    <sodipodi:guide
+       orientation="vertical"
+       position="-1.9327861"
+       id="guide23493" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect1319"
+       width="34.523312"
+       height="42.631897"
+       x="-73.168289"
+       y="40.459969"
+       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
+    <rect
+       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect8613"
+       width="2.4545455"
+       height="0"
+       x="58.545456"
+       y="6" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect9490"
+       width="18.989349"
+       height="30.290173"
+       x="-63.894802"
+       y="44.831184"
+       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1"
+       id="rect10365"
+       width="10"
+       height="7.5454545"
+       x="-43"
+       y="11.454545" />
+    <rect
+       style="fill:#000080;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect16478"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#800000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19107"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#b00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19109"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#b0b000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19111"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.538849"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#0000b0;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19113"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#0000f0;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19115"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19117"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.723278"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#f0f000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19119"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24390"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="26.132593"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#0000f0;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24392"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#b0b000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24394"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#000080;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24396"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#000080;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24398"
+       width="8.6068287"
+       height="8.6778221"
+       x="-11.682427"
+       y="0.20279986"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#800000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24400"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#f00000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24404"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#b0b000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24406"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.519249"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+  </g>
+</svg>
Binary file client/src/main/webapp/img/digilib-notfound.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/img/digilib-notfound.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg1307"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="C:\temp"
+   sodipodi:docname="digilib-notfound.svg">
+  <defs
+     id="defs1309" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.2782051"
+     inkscape:cx="34.898932"
+     inkscape:cy="35.775981"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4">
+    <sodipodi:guide
+       orientation="vertical"
+       position="-1.9327861"
+       id="guide23493" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04922342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect1319"
+       width="34.523312"
+       height="42.631897"
+       x="-73.168289"
+       y="40.459969"
+       transform="matrix(-0.846554,0.532302,-2.654126e-3,0.999996,0,0)" />
+    <rect
+       style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect8613"
+       width="2.4545455"
+       height="0"
+       x="58.545456"
+       y="6" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.0745697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect9490"
+       width="18.989349"
+       height="30.290173"
+       x="-63.894802"
+       y="44.831184"
+       transform="matrix(-0.85293,0.522025,1.174035e-2,0.999931,0,0)" />
+    <rect
+       style="fill:#c5c5c5;fill-opacity:1"
+       id="rect10365"
+       width="10"
+       height="7.5454545"
+       x="-43"
+       y="11.454545" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect16478"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19107"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19109"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19111"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.538849"
+       y="0.25004297"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19113"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19115"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19117"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.723278"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#c2c2c2;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect19119"
+       width="8.6068287"
+       height="8.6778221"
+       x="-28.961241"
+       y="8.9278679"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24390"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.568077"
+       y="26.132593"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24392"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24394"
+       width="8.6068287"
+       height="8.6778221"
+       x="-20.289255"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24396"
+       width="8.6068287"
+       height="8.6778221"
+       x="-29.251465"
+       y="25.880625"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24398"
+       width="8.6068287"
+       height="8.6778221"
+       x="-11.682427"
+       y="0.20279986"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#262626;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24400"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#787878;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24404"
+       width="8.6068287"
+       height="8.6778221"
+       x="-12.021473"
+       y="34.880619"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <rect
+       style="fill:#585858;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+       id="rect24406"
+       width="8.6068287"
+       height="8.6778221"
+       x="-37.519249"
+       y="17.202801"
+       transform="matrix(-0.851875,-0.523744,0,1,0,0)" />
+    <text
+       xml:space="preserve"
+       style="font-size:62.7486763px;font-style:normal;font-weight:normal;fill:#058200;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="27.729532"
+       y="49.141472"
+       id="text3132"
+       transform="scale(1.023781,0.976772)"><tspan
+         sodipodi:role="line"
+         id="tspan3134"
+         x="27.729532"
+         y="49.141472">?</tspan></text>
+  </g>
+</svg>
Binary file client/src/main/webapp/img/down.gif has changed
Binary file client/src/main/webapp/img/left.gif has changed
Binary file client/src/main/webapp/img/mark1.gif has changed
Binary file client/src/main/webapp/img/mark2.gif has changed
Binary file client/src/main/webapp/img/mark3.gif has changed
Binary file client/src/main/webapp/img/mark4.gif has changed
Binary file client/src/main/webapp/img/mark5.gif has changed
Binary file client/src/main/webapp/img/mark6.gif has changed
Binary file client/src/main/webapp/img/mark7.gif has changed
Binary file client/src/main/webapp/img/mark8.gif has changed
Binary file client/src/main/webapp/img/olinks.gif has changed
Binary file client/src/main/webapp/img/orechts.gif has changed
Binary file client/src/main/webapp/img/right.gif has changed
Binary file client/src/main/webapp/img/ulinks.gif has changed
Binary file client/src/main/webapp/img/up.gif has changed
Binary file client/src/main/webapp/img/urechts.gif has changed
Binary file client/src/main/webapp/jquery/combiner-0.0.1.jar has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/digilib.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta name="viewport" content="initial-scale=1.0"/>
+        <title>Digilib jQuery: fullscreen</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+        </style>
+
+        <script type="text/javascript" src="jquery.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
+        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'fullscreen',
+                    showRegionNumbers : true
+                    };
+                var $div = $('div.digilib');
+                $div.digilib(opts);
+            });
+
+        </script>
+    </head>
+
+    <body>
+        <div id="digilib" class="digilib">
+            <p>digilib doesn't work! Please switch on Javascript or notify the server administrator!</p>
+            <img src="http://digilib.berlios.de/images/digilib-logo-big.png" />
+        </div>
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/dlGeometry.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,486 @@
+/* digilib geometry classes
+ * should be integrated into jquery.digilib.js
+ */
+
+var dlGeometry = function() {
+    /*
+     * Size class
+     */
+    var size = function(w, h) {
+        var that;
+        if (typeof w === "object") {
+            // assume its size
+            that = {
+                width : w.width,
+                height : w.height
+            };
+        } else {
+            that = {
+                width : parseFloat(w),
+                height : parseFloat(h)
+            };
+        }
+        that.equals = function(other) {
+            return (this.width === other.width && this.height === other.height);
+        };
+        that.toString = function() {
+            return (this.width + "x" + this.height);
+        };
+        return that;
+    };
+
+    /*
+     * Position class
+     */
+    var position = function(x, y) {
+        var that;
+        if (typeof x === "object") {
+            if (x instanceof jQuery) {
+                // jQuery object
+                var pos = x.offset();
+                that = {
+                    x : pos.left,
+                    y : pos.top
+                };
+            } else {
+                if (x.x != null) {
+                    // position object
+                    that = {
+                        x : x.x,
+                        y : x.y
+                    };
+                }
+                if (x.pageX != null) {
+                    // event object
+                    that = {
+                        x : x.pageX,
+                        y : x.pageY
+                    };
+                }
+            }
+        } else {
+            that = {
+                x : parseFloat(x),
+                y : parseFloat(y)
+            };
+        }
+        that.equals = function(other) {
+            return (this.x === other.x && this.y === other.y);
+        };
+        // add position other to this
+        that.add = function(other) {
+            this.x += other.x;
+            this.y += other.y;
+            return this;
+        };
+        // returns negative position
+        that.neg = function() {
+            return position({
+                x : -this.x,
+                y : -this.y
+            });
+        };
+        // returns new position that is the difference between this and other
+        that.delta = function(other) {
+            return position({
+                x : other.x - this.x,
+                y : other.y - this.y
+            });
+        };
+        // adjusts position $elem to this position
+        that.adjustDiv = function($elem) {
+            $elem.offset({
+                left : this.x,
+                top : this.y
+            });
+        };
+        // returns distance of this position to pos (length if pos == null)
+        that.distance = function(pos) {
+            if (pos == null) {
+                pos = {
+                    x : 0,
+                    y : 0
+                };
+            }
+            var dx = pos.x - this.x;
+            var dy = pos.y - this.y;
+            return Math.sqrt(dx * dx + dy * dy);
+        };
+        that.toString = function() {
+            return (this.x + "," + this.y);
+        };
+        return that;
+    };
+    /*
+     * Rectangle class
+     */
+    var rectangle = function(x, y, w, h) {
+        var that = {};
+        if (typeof x === "object") {
+            if (x instanceof jQuery) {
+                // jQuery object
+                var pos = x.offset();
+                that = {
+                    x : pos.left,
+                    y : pos.top,
+                    width : x.width(),
+                    height : x.height()
+                };
+            } else if (y == null) {
+                // assume x is rectangle
+                that = {
+                    x : x.x,
+                    y : x.y,
+                    width : x.width,
+                    height : x.height
+                };
+            } else {
+                // assume x and y are Position
+                that = {
+                    x : Math.min(x.x, y.x),
+                    y : Math.min(x.y, y.y),
+                    width : Math.abs(y.x - x.x),
+                    height : Math.abs(y.y - x.y)
+                };
+            }
+        } else {
+            that = {
+                x : parseFloat(x),
+                y : parseFloat(y),
+                width : parseFloat(w),
+                height : parseFloat(h)
+            };
+        }
+        // returns a copy of this Rectangle
+        that.copy = function() {
+            return rectangle(this);
+        };
+        // returns the position of this Rectangle
+        that.getPosition = function() {
+            return position(this);
+        };
+        // returns the size of this Rectangle
+        that.getSize = function() {
+            return size(this);
+        };
+        // returns the upper left corner position
+        that.getPt1 = that.getPosition;
+        // returns the lower right corner position of this Rectangle
+        that.getPt2 = function() {
+            return position({
+                x : this.x + this.width,
+                y : this.y + this.height
+            });
+        };
+        // sets the upper left corner position to pos
+        that.setPosition = function(pos) {
+            this.x = pos.x;
+            this.y = pos.y;
+            return this;
+        };
+        that.setPt1 = that.setPosition; // TODO: not really the same
+        // adds pos to the position
+        that.addPosition = function(pos) {
+            this.x += pos.x;
+            this.y += pos.y;
+            return this;
+        };
+        // sets the lower right corner to position pos
+        that.setPt2 = function(pos) {
+            this.width = pos.x - this.x;
+            this.height = pos.y - this.y;
+            return this;
+        };
+        // returns the center position of this Rectangle
+        that.getCenter = function() {
+            return position({
+                x : this.x + this.width / 2,
+                y : this.y + this.height / 2
+            });
+        };
+        // moves this Rectangle's center to position pos
+        that.setCenter = function(pos) {
+            this.x = pos.x - this.width / 2;
+            this.y = pos.y - this.height / 2;
+            return this;
+        };
+        that.equals = function(other) {
+            // equal props
+            var eq = (this.x === other.x && this.y === other.y && this.width === other.width);
+            return eq;
+        };
+        // returns the area of this Rectangle
+        that.getArea = function() {
+            return (this.width * this.height);
+        };
+        // eliminates negative width and height
+        that.normalize = function() {
+            var p = this.getPt2();
+            this.x = Math.min(this.x, p.x);
+            this.y = Math.min(this.y, p.y);
+            this.width = Math.abs(this.width);
+            this.height = Math.abs(this.height);
+            return this;
+        };
+        // returns if Position "pos" lies inside of this rectangle
+        that.containsPosition = function(pos) {
+            var ct = ((pos.x >= this.x) && (pos.y >= this.y)
+                    && (pos.x <= this.x + this.width) && (pos.y <= this.y
+                    + this.height));
+            return ct;
+        };
+        // returns if rectangle "rect" is contained in this rectangle
+        that.containsRect = function(rect) {
+            return (this.containsPosition(rect.getPt1()) && this
+                    .containsPosition(rect.getPt2()));
+        };
+        // changes this rectangle's x/y values so it stays inside of rectangle
+        // rect
+        // keeping the proportions
+        that.stayInside = function(rect) {
+            if (this.x < rect.x) {
+                this.x = rect.x;
+            }
+            if (this.y < rect.y) {
+                this.y = rect.y;
+            }
+            if (this.x + this.width > rect.x + rect.width) {
+                this.x = rect.x + rect.width - this.width;
+            }
+            if (this.y + this.height > rect.y + rect.height) {
+                this.y = rect.y + rect.height - this.height;
+            }
+            return this;
+        };
+        // clips this rectangle so it stays inside of rectangle rect
+        that.clipTo = function(rect) {
+            var p1 = rect.getPt1();
+            var p2 = rect.getPt2();
+            var this2 = this.getPt2();
+            this.setPosition(position(Math.max(this.x, p1.x), Math.max(this.y, p1.y)));
+            this.setPt2(position(Math.min(this2.x, p2.x), Math.min(this2.y, p2.y)));
+            return this;
+        };
+        // returns the intersection of the given Rectangle and this one
+        that.intersect = function(rect) {
+            // FIX ME: not really, it should return null if there is no overlap
+            var sec = rect.copy();
+            if (sec.x < this.x) {
+                sec.width = sec.width - (this.x - sec.x);
+                sec.x = this.x;
+            }
+            if (sec.y < this.y) {
+                sec.height = sec.height - (this.y - sec.y);
+                sec.y = this.y;
+            }
+            if (sec.x + sec.width > this.x + this.width) {
+                sec.width = (this.x + this.width) - sec.x;
+            }
+            if (sec.y + sec.height > this.y + this.height) {
+                sec.height = (this.y + this.height) - sec.y;
+            }
+            return sec;
+        };
+        // returns a Rectangle that fits into this one (by moving first)
+        that.fit = function(rect) {
+            var sec = rect.copy();
+            sec.x = Math.max(sec.x, this.x);
+            sec.y = Math.max(sec.y, this.x);
+            if (sec.x + sec.width > this.x + this.width) {
+                sec.x = this.x + this.width - sec.width;
+            }
+            if (sec.y + sec.height > this.y + this.height) {
+                sec.y = this.y + this.height - sec.height;
+            }
+            return sec.intersect(this);
+        };
+        // adjusts position and size of $elem to this rectangle
+        that.adjustDiv = function($elem) {
+            $elem.offset({
+                left : this.x,
+                top : this.y
+            });
+            $elem.width(this.width).height(this.height);
+        };
+        // returns size and position in css-compatible format
+        that.getAsCss = function() {
+            return {
+                left : this.x,
+                top : this.y,
+                width : this.width,
+                height : this.height
+            };
+        };
+        that.toString = function() {
+            return this.width + "x" + this.height + "@" + this.x + "," + this.y;
+        };
+        return that;
+    };
+
+    /*
+     * Transform class
+     * 
+     * defines a class of affine transformations
+     */
+    var transform = function(spec) {
+        var that = {
+            m00 : 1.0,
+            m01 : 0.0,
+            m02 : 0.0,
+            m10 : 0.0,
+            m11 : 1.0,
+            m12 : 0.0,
+            m20 : 0.0,
+            m21 : 0.0,
+            m22 : 1.0
+        };
+        if (spec) {
+            jQuery.extend(that, spec);
+        }
+        ;
+        that.concat = function(trafA) {
+            // add Transform trafA to this Transform (i.e. this = trafC = trafA
+            // * this)
+            var trafC = {};
+            for ( var i = 0; i < 3; i++) {
+                for ( var j = 0; j < 3; j++) {
+                    var c = 0.0;
+                    for ( var k = 0; k < 3; k++) {
+                        c += trafA["m" + i + k] * this["m" + k + j];
+                    }
+                    trafC["m" + i + j] = c;
+                }
+            }
+            jQuery.extend(this, trafC);
+            return this;
+        };
+        that.transform = function(rect) {
+            // returns transformed Rectangle or Position with this Transform
+            // applied
+            var x = this.m00 * rect.x + this.m01 * rect.y + this.m02;
+            var y = this.m10 * rect.x + this.m11 * rect.y + this.m12;
+            var pt = position(x, y);
+            if (rect.width) {
+                // transform the other corner point
+                var pt2 = this.transform(rect.getPt2());
+                return rectangle(pt, pt2);
+            }
+            return pt;
+        };
+        that.invtransform = function(rect) {
+            // returns transformed Rectangle or Position with the inverse of
+            // this Transform applied
+            var det = this.m00 * this.m11 - this.m01 * this.m10;
+            var x = (this.m11 * rect.x - this.m01 * rect.y - this.m11
+                    * this.m02 + this.m01 * this.m12)
+                    / det;
+            var y = (-this.m10 * rect.x + this.m00 * rect.y + this.m10
+                    * this.m02 - this.m00 * this.m12)
+                    / det;
+            var pt = position(x, y);
+            if (rect.width) {
+                // transform the other corner point
+                var pt2 = this.invtransform(rect.getPt2());
+                return rectangle(pt, pt2);
+            }
+            return pt;
+        };
+        that.toString = function(pretty) {
+            var s = '[';
+            if (pretty)
+                s += '\n';
+            for ( var i = 0; i < 3; ++i) {
+                s += '[';
+                for ( var j = 0; j < 3; ++j) {
+                    if (j)
+                        s += ',';
+                    s += this['m' + i + j];
+                }
+                s += ']';
+                if (pretty)
+                    s += '\n';
+            }
+            s += ']';
+            if (pretty)
+                s += '\n';
+            return s;
+        };
+        // add class methods to instance
+        that.getRotation = transform.getRotation;
+        that.getRotationAround = transform.getRotationAround;
+        that.getTranslation = transform.getTranslation;
+        that.getMirror = transform.getMirror;
+        that.getScale = transform.getScale;
+
+        return that;
+    };
+
+    transform.getRotation = function(angle) {
+        // returns a Transform that is a rotation by angle degrees around [0,0]
+        if (angle !== 0) {
+            var t = Math.PI * parseFloat(angle) / 180.0;
+            var cost = Math.cos(t);
+            var sint = Math.sin(t);
+            var traf = {
+                m00 : cost,
+                m01 : -sint,
+                m10 : sint,
+                m11 : cost
+            };
+            return transform(traf);
+        }
+        return transform();
+    };
+
+    transform.getRotationAround = function(angle, pos) {
+        // returns a Transform that is a rotation by angle degrees around pos
+        var traf = transform.getTranslation(pos.neg());
+        traf.concat(transform.getRotation(angle));
+        traf.concat(transform.getTranslation(pos));
+        return traf;
+    };
+
+    transform.getTranslation = function(pos) {
+        // returns a Transform that is a translation by [pos.x, pos,y]
+        var traf = {
+            m02 : pos.x,
+            m12 : pos.y
+        };
+        return transform(traf);
+    };
+
+    transform.getMirror = function(type) {
+        // returns a Transform that is a mirror about the axis type
+        if (type === 'x') {
+            var traf = {
+                m00 : 1,
+                m11 : -1
+            };
+        } else {
+            var traf = {
+                m00 : -1,
+                m11 : 1
+            };
+        }
+        return transform(traf);
+    };
+
+    transform.getScale = function(size) {
+        // returns a Transform that is a scale by [size.width, size.height]
+        var traf = {
+            m00 : size.width,
+            m11 : size.height
+        };
+        return transform(traf);
+    };
+
+    // export functions
+    var that = {
+        size : size,
+        position : position,
+        rectangle : rectangle,
+        transform : transform
+    };
+
+    return that;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/img/embedded.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1081 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r10012"
+   sodipodi:docname="embedded.svg"
+   style="display:inline">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient788">
+      <stop
+         style="stop-color:#aa0000;stop-opacity:1;"
+         offset="0"
+         id="stop790" />
+      <stop
+         style="stop-color:#560000;stop-opacity:1;"
+         offset="1"
+         id="stop792" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient788"
+       id="linearGradient794"
+       x1="13.169864"
+       y1="12.024234"
+       x2="26.958447"
+       y2="27.138639"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.533016"
+     inkscape:cx="15.816836"
+     inkscape:cy="15.897753"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer27"
+     showgrid="true"
+     inkscape:window-width="1024"
+     inkscape:window-height="719"
+     inkscape:window-x="1020"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       type="xygrid"
+       id="grid891" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="bg"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)"
+     style="display:inline"
+     sodipodi:insensitive="true" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="back"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       id="path913"
+       d="M 27.047707,2.0090135 27.007792,15.939515 26.967877,29.870017 14.913402,22.844893 2.8988431,15.859684 14.993233,8.9543067 27.047707,2.0090135 z m -2.594506,4.4705336 -8.182673,4.7100269 -8.2225882,4.67011 8.1826732,4.789858 8.182673,4.749942 0.03992,-9.459969 0,-9.4599679 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="fwd"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 5.144847,2.0090135 5.184936,16 5.225025,29.990987 17.331838,22.935361 29.398564,15.919823 17.251661,8.9844625 5.144847,2.0090135 z m 2.605771,4.4899442 8.218202,4.7304773 8.25829,4.690388 -8.218202,4.810654 L 7.790707,25.501043 7.750618,16 l 0,-9.5010423 z"
+       id="path139"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="birds-eye"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 8.0195218,9.4025604 c -2.868989,0.09575 -2.729553,1.2399626 -6.1052839,0.3052646 2.9345127,5.081608 10.4072341,-2.483952 13.6496701,7.631605 0.134913,0.420759 0.316439,0.553536 0.479701,0.436092 0.149752,0.07011 0.269484,-0.05233 0.392483,-0.436092 C 19.678526,7.223873 27.151248,14.789433 30.085762,9.707825 25.584788,10.954081 27.330095,8.5262259 19.837607,9.7514298 17.727437,10.0965 16.646344,11.369319 16.043609,12.760462 15.443243,11.361913 14.28161,10.097977 12.162393,9.7514298 10.289271,9.4451425 8.9758507,9.3706455 8.0195218,9.4025604 z"
+       id="rect914"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 4.96875,0.90625 0,6.71875 2,0 0,-4.59375 17.84375,0 0,4.59375 2.09375,0 0,-6.71875 -21.9375,0 z m 0,13.375 0,16.6875 21.9375,0 0,-16.6875 -2.09375,0 0,14.625 -17.84375,0 0,-14.625 -2,0 z"
+       id="rect941"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="brightness"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 16.09375,6.8125 C 11.074025,6.8125 7,10.886525 7,15.90625 7,20.925975 11.074025,25 16.09375,25 c 5.019725,0 9.09375,-4.074025 9.09375,-9.09375 0,-5.019725 -4.074025,-9.09375 -9.09375,-9.09375 z M 16,9 c 3.865993,0 7,3.134007 7,7 0,3.865993 -3.134007,7 -7,7 -3.865993,0 -7,-3.134007 -7,-7 0,-3.865993 3.134007,-7 7,-7 z"
+       id="path876"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 15,1.40625 0,7.6875 C 15.328121,9.0465852 15.658826,9 16,9 c 0.406896,0 0.799622,0.058366 1.1875,0.125 l 0,-7.71875 -2.1875,0 z M 17.1875,22.875 C 16.799622,22.941634 16.406896,23 16,23 15.658826,23 15.328121,22.95341 15,22.90625 l 0,7.84375 2.1875,0 0,-7.875 z"
+       id="rect878"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 1.40625,15 0,2.1875 7.71875,0 C 9.0583662,16.799622 9,16.406896 9,16 9,15.658826 9.0465852,15.328121 9.09375,15 l -7.6875,0 z m 21.5,0 C 22.953415,15.328121 23,15.658826 23,16 c 0,0.406896 -0.05837,0.799622 -0.125,1.1875 l 7.875,0 0,-2.1875 -7.84375,0 z"
+       id="rect880"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 6.5,4.9375 4.9375,6.5 l 5.40625,5.40625 c 0.431996,-0.593548 0.968952,-1.130504 1.5625,-1.5625 L 6.5,4.9375 z M 21.65625,20.125 c -0.429134,0.585228 -0.975687,1.104157 -1.5625,1.53125 L 25.6875,27.25 27.21875,25.6875 21.65625,20.125 z"
+       id="rect919"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 25.6875,4.9375 -5.46875,5.46875 C 20.801807,10.848406 21.330141,11.39966 21.75,12 L 27.25,6.5 25.6875,4.9375 z M 10.40625,20.21875 4.9375,25.6875 6.5,27.25 12,21.75 c -0.60034,-0.419859 -1.151594,-0.948193 -1.59375,-1.53125 z"
+       id="rect921"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="calibration-x"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       transform="matrix(-1.1475732,0,0,-1.1217078,34.475262,33.555864)"
+       style="display:inline"
+       id="g134-1-8">
+      <rect
+         transform="matrix(-0.99998722,0.00505534,0.0025573,0.99999673,0,0)"
+         y="10.020195"
+         x="-28.974745"
+         height="11.116359"
+         width="1.9766066"
+         id="rect895-7-8-7-8"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         transform="matrix(-0.99999354,0.00359556,0.00359556,0.99999354,0,0)"
+         y="13.062714"
+         x="-22.93886"
+         height="3.9713874"
+         width="1.9856937"
+         id="rect897-4-2-4-2"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         transform="matrix(-0.99998713,0.00507297,0.0025484,0.99999675,0,0)"
+         y="9.9487858"
+         x="-16.946508"
+         height="11.12725"
+         width="1.9716681"
+         id="rect899-0-4-0-4"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         transform="matrix(-0.99999354,0.00359556,0.00359556,0.99999354,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="rect905-9-5-9-5"
+         width="1.9857715"
+         height="3.9715431"
+         x="-10.938862"
+         y="13.062556" />
+      <rect
+         transform="matrix(-0.99998745,0.00501028,0.0025803,0.99999667,0,0)"
+         y="10.024814"
+         x="-4.9459147"
+         height="10.990158"
+         width="1.9717447"
+         id="rect907-4-5-4-5"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="calibration-y"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       transform="matrix(0,1.152586,-1.1944557,0,34.956357,-2.4577577)"
+       style="display:inline"
+       id="g134-1">
+      <rect
+         transform="matrix(-0.99998722,0.00505534,0.0025573,0.99999673,0,0)"
+         y="10.020195"
+         x="-28.974745"
+         height="11.116359"
+         width="1.9766066"
+         id="rect895-7-8-7"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         transform="matrix(-0.99999354,0.00359556,0.00359556,0.99999354,0,0)"
+         y="13.062714"
+         x="-22.93886"
+         height="3.9713874"
+         width="1.9856937"
+         id="rect897-4-2-4"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         transform="matrix(-0.99998713,0.00507297,0.0025484,0.99999675,0,0)"
+         y="9.9487858"
+         x="-16.946508"
+         height="11.12725"
+         width="1.9716681"
+         id="rect899-0-4-0"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <rect
+         transform="matrix(-0.99999354,0.00359556,0.00359556,0.99999354,0,0)"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="rect905-9-5-9"
+         width="1.9857715"
+         height="3.9715431"
+         x="-10.938862"
+         y="13.062556" />
+      <rect
+         transform="matrix(-0.99998745,0.00501028,0.0025803,0.99999667,0,0)"
+         y="10.024814"
+         x="-4.9459147"
+         height="10.990158"
+         width="1.9717447"
+         id="rect907-4-5-4"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="cat"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1000"
+       width="8"
+       height="11"
+       x="2"
+       y="4" />
+    <rect
+       y="4"
+       x="12"
+       height="11"
+       width="8"
+       id="rect207"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect209"
+       width="8"
+       height="11"
+       x="22"
+       y="4" />
+    <rect
+       y="17"
+       x="2"
+       height="11"
+       width="8"
+       id="rect213"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect215"
+       width="8"
+       height="11"
+       x="12"
+       y="17" />
+    <rect
+       y="17"
+       x="22"
+       height="11"
+       width="8"
+       id="rect217"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="contrast"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 13.40625,3.28125 C 7.4823693,4.4934515 3,9.7177604 3,16 3,22.28224 7.4823693,27.506548 13.40625,28.71875 l 0,-25.4375 z m 5.1875,0 0,25.4375 C 24.51763,27.506548 29,22.28224 29,16 29,9.7177604 24.51763,4.4934515 18.59375,3.28125 z m -7.125,3.125 0,19.125 c -3.7414989,-1.915747 -6.25,-5.456732 -6.25,-9.5625 0,-4.105769 2.5085011,-7.6467526 6.25,-9.5625 z"
+       id="path1016"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     style="display:none"
+     inkscape:label="mark"
+     id="g1030"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 3.2,2 0,28 25.8875,0 0,-28 L 3.2,2 z m 6.8125,4.2 8.175,0 0,1.4 0,16.8 6.8125,0 0,1.4 -17.7125,0 0,-1.4 6.8125,0 0,-16.8 -4.0875,0 0,-1.4 z"
+       id="rect947"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="g960"
+     inkscape:label="delmark"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 3.1092104,2.0000001 0,28.0000009 25.8907896,0 0,-28.0000009 -25.8907896,0 z m 6.8133655,4.2000002 8.1760391,0 0,1.4 0,2.6250007 3.747352,-3.8500008 2.89568,2.9750003 -6.643032,6.8249995 0,8.225001 6.813366,0 0,1.399999 -17.714751,0 0,-1.399999 6.813366,0 0,-4.025001 -3.747352,3.850002 L 7.3675641,21.25 l 6.6430319,-6.825001 0,-6.8249987 -4.0880201,0 0,-1.4 z"
+       id="path962"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="help"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <text
+       xml:space="preserve"
+       style="font-size:41.39486694px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       x="3.4375441"
+       y="32.943199"
+       id="text935"
+       sodipodi:linespacing="125%"
+       transform="scale(1.1102234,0.90071962)"><tspan
+         sodipodi:role="line"
+         id="tspan937"
+         x="3.4375441"
+         y="32.943199">?</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="options"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect968"
+       width="5"
+       height="5"
+       x="4"
+       y="14.000001" />
+    <rect
+       y="14.000001"
+       x="13.000001"
+       height="5"
+       width="5"
+       id="rect970"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect972"
+       width="5"
+       height="5"
+       x="22.000002"
+       y="14.000001" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="original-size"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <text
+       xml:space="preserve"
+       style="font-size:17.97092056px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="-0.9710269"
+       y="23.421276"
+       id="text975"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0298376,0.97102688)"><tspan
+         sodipodi:role="line"
+         id="tspan977"
+         x="-0.9710269"
+         y="23.421276">1:1</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="page"
+     style="display:none">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 5,1 0,30 22,0 0,-19.03125 -9.53125,0 -1.375,0 L 16.09375,1 5,1 z m 12.46875,0.84375 0,8.75 8.8125,0 -8.8125,-8.75 z M 7,3 l 7,0 0,11 11,0 0,15 -11,0 -1,0 -6,0 0,-26 z"
+       id="rect982"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path918"
+       d="m 5,1 0,30 22,0 0,-19.03125 -9.53125,0 -1.375,0 L 16.09375,1 5,1 z m 12.46875,0.84375 0,8.75 8.8125,0 -8.8125,-8.75 z M 7,3 l 7,0 0,11 11,0 0,15 -11,0 -1,0 -6,0 0,-26 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer16"
+     inkscape:label="pagewidth"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 5,1 5,31 27,31 27,1 5,1 z M 7,3 25,3 25,29 7,29 7,3 z"
+       id="rect956"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect961"
+       width="10.217689"
+       height="2"
+       x="11.088731"
+       y="10" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path967"
+       sodipodi:sides="3"
+       sodipodi:cx="11"
+       sodipodi:cy="11"
+       sodipodi:r1="3"
+       sodipodi:r2="1.4999999"
+       sodipodi:arg1="3.1415927"
+       sodipodi:arg2="4.1887902"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 8,11 10.25,9.700962 12.5,8.4019239 12.5,11 l 0,2.598076 -2.25,-1.299038 z"
+       inkscape:transform-center-x="0.75" />
+    <path
+       inkscape:transform-center-x="-0.74999988"
+       d="M 8,11 10.25,9.700962 12.5,8.4019239 12.5,11 l 0,2.598076 -2.25,-1.299038 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="4.1887902"
+       sodipodi:arg1="3.1415927"
+       sodipodi:r2="1.4999999"
+       sodipodi:r1="3"
+       sodipodi:cy="11"
+       sodipodi:cx="11"
+       sodipodi:sides="3"
+       id="path971"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="star"
+       transform="matrix(-1,0,0,1,31.89515,0)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer17"
+     inkscape:label="pixel-by-pixel"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <text
+       xml:space="preserve"
+       style="font-size:17.12094688px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="0.95822293"
+       y="22.596033"
+       id="text1041"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0435985,0.95822291)"><tspan
+         sodipodi:role="line"
+         id="tspan1043"
+         x="0.95822293"
+         y="22.596033">x:x</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer18"
+     inkscape:label="quality"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <text
+       xml:space="preserve"
+       style="font-size:27.2751503px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="3.8965476"
+       y="25.107218"
+       id="text1046"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0265498,0.97413686)"><tspan
+         sodipodi:role="line"
+         id="tspan1048"
+         x="3.8965476"
+         y="25.107218">Q</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer19"
+     inkscape:label="reference"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <text
+       xml:space="preserve"
+       style="font-size:16.48912811px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="2.6207335e-015"
+       y="23.032148"
+       id="text1051"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0147782,0.98543702)"><tspan
+         sodipodi:role="line"
+         id="tspan1053"
+         x="2.6207335e-015"
+         y="23.032148">url:</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer20"
+     inkscape:label="reset"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect143"
+       width="27.823114"
+       height="4.9597726"
+       x="8.485281"
+       y="-2.8284271"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+    <rect
+       transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
+       y="-24.876724"
+       x="-14.260098"
+       height="4.9597726"
+       width="27.823114"
+       id="rect145"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer21"
+     inkscape:label="rgb"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1084"
+       width="10.999999"
+       height="11"
+       x="11"
+       y="2" />
+    <rect
+       y="16"
+       x="4"
+       height="11"
+       width="10.999999"
+       id="rect1086"
+       style="color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1088"
+       width="11"
+       height="11"
+       x="18"
+       y="16" />
+  </g>
+  <g
+     style="display:none"
+     inkscape:label="rotate"
+     id="g1090"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1092"
+       d="m 15.684921,4.3978351 c -6.3617718,0 -11.5059878,5.1442165 -11.5059878,11.5059889 0,6.36177 5.144216,11.542057 11.5059878,11.542057 0.04802,0 0.0964,5.89e-4 0.144281,0 l 0,-2.380549 c -0.07124,0.0016 -0.144789,0 -0.216413,0 -4.973749,0 -9.0172321,-4.043484 -9.0172321,-9.017234 0,-4.973748 4.0434831,-9.0172311 9.0172321,-9.0172311 2.486875,0 4.75161,1.0004431 6.3842,2.6330311 L 23.872574,7.7883149 C 21.788528,5.6857583 18.884216,4.3978351 15.684927,4.3978351 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       transform="matrix(-1.4945171,0,0,1.4945171,36.11648,-0.39278602)"
+       inkscape:transform-center-y="-0.41195904"
+       inkscape:transform-center-x="-0.41195904"
+       d="M 5.6120683,9.3311528 6.3256024,6.6682079 7.0391363,4.0052628 8.9885471,5.9546739 10.937958,7.9040849 8.2750133,8.6176187 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="3.403392"
+       sodipodi:arg1="2.3561945"
+       sodipodi:r2="1.5916873"
+       sodipodi:r1="3.1833749"
+       sodipodi:cy="7.0801668"
+       sodipodi:cx="7.8630543"
+       sodipodi:sides="3"
+       id="path1094"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="star" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer22"
+     inkscape:label="size"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#f6f6f6;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path1104"
+       sodipodi:sides="3"
+       sodipodi:cx="1.0887306"
+       sodipodi:cy="16.031952"
+       sodipodi:r1="5.9929037"
+       sodipodi:r2="2.9964516"
+       sodipodi:arg1="-3.1415927"
+       sodipodi:arg2="-2.0943951"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m -4.9041731,16.031952 4.49467787,-2.595003 4.49467743,-2.595004 0,5.190007 5e-7,5.190007 -4.49467794,-2.595004 z"
+       inkscape:transform-center-x="1.2023113"
+       transform="matrix(0.80248992,0,0,0.80248992,4.7046891,3.1977231)" />
+    <path
+       transform="matrix(-0.80248992,0,0,0.80248992,27.123251,2.9332441)"
+       inkscape:transform-center-x="-1.2023108"
+       d="m -4.9041731,16.031952 4.49467787,-2.595003 4.49467743,-2.595004 0,5.190007 5e-7,5.190007 -4.49467794,-2.595004 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="-2.0943951"
+       sodipodi:arg1="-3.1415927"
+       sodipodi:r2="2.9964516"
+       sodipodi:r1="5.9929037"
+       sodipodi:cy="16.031952"
+       sodipodi:cx="1.0887306"
+       sodipodi:sides="3"
+       id="path1108"
+       style="color:#000000;fill:#f6f6f6;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="star" />
+    <g
+       id="g1114"
+       transform="matrix(0,1.093159,-1.093159,0,33.329046,-1.465536)">
+      <path
+         inkscape:transform-center-x="1.0998503"
+         sodipodi:type="star"
+         style="color:#000000;fill:#f6f6f6;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="path1110"
+         sodipodi:sides="3"
+         sodipodi:cx="1.0887306"
+         sodipodi:cy="16.031952"
+         sodipodi:r1="5.9929037"
+         sodipodi:r2="2.9964516"
+         sodipodi:arg1="-3.1415927"
+         sodipodi:arg2="-2.0943951"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -4.9041731,16.031952 4.49467787,-2.595003 4.49467743,-2.595004 0,5.190007 5e-7,5.190007 -4.49467794,-2.595004 z"
+         transform="matrix(0.73410176,0,0,0.73410176,5.6599436,4.2828493)" />
+      <path
+         inkscape:transform-center-x="-1.0998503"
+         transform="matrix(-0.73410176,0,0,0.73410176,26.167997,4.0409092)"
+         d="m -4.9041731,16.031952 4.49467787,-2.595003 4.49467743,-2.595004 0,5.190007 5e-7,5.190007 -4.49467794,-2.595004 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="-2.0943951"
+         sodipodi:arg1="-3.1415927"
+         sodipodi:r2="2.9964516"
+         sodipodi:r1="5.9929037"
+         sodipodi:cy="16.031952"
+         sodipodi:cx="1.0887306"
+         sodipodi:sides="3"
+         id="path1112"
+         style="color:#000000;fill:#f6f6f6;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="star" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer23"
+     inkscape:label="zoom-in"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 17.748648,1.3382448 c -7.250407,0 -13.1159091,5.8655027 -13.1159091,13.1159112 0,7.250406 5.8655021,13.115909 13.1159091,13.115909 7.250407,0 13.11591,-5.865503 13.11591,-13.115909 0,-7.2504085 -5.865503,-13.1159112 -13.11591,-13.1159112 z M 17.58521,4.3209906 c 5.590676,0 10.133163,4.5424881 10.133163,10.1331654 0,5.590675 -4.542487,10.133163 -10.133163,10.133163 -5.590675,0 -10.1331634,-4.542488 -10.1331634,-10.133163 0,-5.5906773 4.5424884,-10.1331654 10.1331634,-10.1331654 z"
+       id="path1151"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1156"
+       width="8.2247858"
+       height="4.0333085"
+       x="-18.871775"
+       y="20.726204"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:transform-center-x="2.8470402"
+       inkscape:transform-center-y="1.7398583" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1164"
+       width="13.075049"
+       height="4.9134407"
+       x="11.170264"
+       y="12.038293" />
+    <rect
+       y="-20.164509"
+       x="7.9574871"
+       height="4.9134407"
+       width="13.075049"
+       id="rect1174"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+  <g
+     style="display:none"
+     inkscape:label="zoom-out"
+     id="g1166"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       id="path1168"
+       d="m 17.821044,1.1451167 c -7.298426,0 -13.2027765,5.9043503 -13.2027765,13.2027763 0,7.298427 5.9043505,13.202777 13.2027765,13.202777 7.298426,0 13.202777,-5.90435 13.202777,-13.202777 0,-7.298426 -5.904351,-13.2027763 -13.202777,-13.2027763 z m -0.164521,3.0025006 c 5.627703,0 10.200276,4.5725733 10.200276,10.2002757 0,5.627704 -4.572573,10.200277 -10.200276,10.200277 -5.627703,0 -10.2002753,-4.572573 -10.2002753,-10.200277 0,-5.6277024 4.5725723,-10.2002757 10.2002753,-10.2002757 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+    <rect
+       inkscape:transform-center-y="1.7513804"
+       inkscape:transform-center-x="2.8658974"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       y="20.688717"
+       x="-18.885862"
+       height="4.0600214"
+       width="8.2792606"
+       id="rect1170"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       y="12.105096"
+       x="11.19909"
+       height="4.5678501"
+       width="13.161647"
+       id="rect1172"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer24"
+     inkscape:label="zoom-full"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 17.711691,1.3083981 c -7.224276,0 -13.0686399,5.8443637 -13.0686399,13.0686399 0,7.224277 5.8443639,13.068641 13.0686399,13.068641 7.224277,0 13.068641,-5.844364 13.068641,-13.068641 0,-7.2242762 -5.844364,-13.0686399 -13.068641,-13.0686399 z m -0.162849,2.9719961 c 1.56671,0 3.032191,0.3792196 4.356214,1.0178068 l 2.279887,0 0,1.5063542 c 2.115514,1.8516034 3.460543,4.5444668 3.460543,7.5724828 0,3.028016 -1.345029,5.72088 -3.460543,7.572483 l 0,1.587779 -2.442736,0 c -1.282102,0.590107 -2.691039,0.936382 -4.193365,0.936382 -1.502326,0 -2.911262,-0.346275 -4.193364,-0.936382 l -2.198463,0 0,-1.343505 C 8.8875148,20.341368 7.452198,17.530661 7.452198,14.377038 c 0,-3.153622 1.4353168,-5.9643297 3.704817,-7.8167564 l 0,-1.2620806 2.035614,0 c 1.324023,-0.6385872 2.789502,-1.0178068 4.356213,-1.0178068 z"
+       id="path1168-7"
+       inkscape:connector-curvature="0" />
+    <rect
+       inkscape:transform-center-y="1.7335882"
+       inkscape:transform-center-x="2.8367804"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       y="20.65291"
+       x="-18.76697"
+       height="4.0187726"
+       width="8.1951447"
+       id="rect1170-4"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1198"
+       width="1.3027928"
+       height="15.633513"
+       x="9.8542233"
+       y="6.6009941" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1200"
+       width="1.3027928"
+       height="15.633513"
+       x="24.184944"
+       y="6.6009941" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1202"
+       width="9.1195498"
+       height="1.3027928"
+       x="12.459808"
+       y="23.5373" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1204"
+       width="10.422342"
+       height="1.3027928"
+       x="12.459808"
+       y="3.9954081" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4129"
+       width="1"
+       height="20"
+       x="11"
+       y="5" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4135"
+       width="1.814551"
+       height="19.718121"
+       x="23.347221"
+       y="4.7817354" />
+  </g>
+  <g
+     style="display:none"
+     inkscape:label="zoom-area"
+     id="g1209"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       id="path1211"
+       d="m 17.64448,1.308398 c -7.194559,0 -13.0148807,5.8203218 -13.0148807,13.01488 0,7.194559 5.8203217,13.01488 13.0148807,13.01488 7.194558,0 13.01488,-5.820321 13.01488,-13.01488 0,-7.1945582 -5.820322,-13.01488 -13.01488,-13.01488 z M 17.4823,4.2681683 c 1.560265,0 3.019717,0.3776596 4.338293,1.0136199 l 2.27051,0 0,1.5001575 c 2.106811,1.8439865 3.446307,4.5257733 3.446307,7.5413323 0,3.01556 -1.339496,5.697346 -3.446307,7.541333 l 0,1.581246 -2.432689,0 c -1.276828,0.587679 -2.679968,0.932531 -4.176114,0.932531 -1.496146,0 -2.899286,-0.344852 -4.176114,-0.932531 l -2.189419,0 0,-1.337978 C 8.8566026,20.263073 7.4271903,17.463928 7.4271903,14.323278 c 0,-3.140649 1.4294123,-5.9397946 3.6895767,-7.7846011 l 0,-1.2568887 2.02724,0 C 14.462584,4.6458279 15.922034,4.2681683 17.4823,4.2681683 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect1213"
+       width="8.1614323"
+       height="4.0022411"
+       x="-18.689583"
+       y="20.575754"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+       inkscape:transform-center-x="2.825112"
+       inkscape:transform-center-y="1.7264579" />
+    <rect
+       y="6.5792217"
+       x="9.8193331"
+       height="15.569202"
+       width="1.2974335"
+       id="rect1215"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       y="6.5792217"
+       x="24.091103"
+       height="15.569202"
+       width="1.2974335"
+       id="rect1217"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       y="23.445856"
+       x="12.414202"
+       height="1.2974335"
+       width="9.0820351"
+       id="rect1219"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       y="3.9843547"
+       x="12.414202"
+       height="1.2974335"
+       width="10.379468"
+       id="rect1221"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#15a221;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4109"
+       width="1"
+       height="19"
+       x="11"
+       y="5" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4117"
+       width="1.814551"
+       height="18.810844"
+       x="23.226252"
+       y="5.0841608" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4121"
+       width="10"
+       height="2"
+       x="11"
+       y="9" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4123"
+       width="2"
+       height="8"
+       x="19"
+       y="10" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4125"
+       width="9"
+       height="2"
+       x="11"
+       y="16" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect4127"
+       width="1"
+       height="6"
+       x="12"
+       y="11" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="mirror-horizontal"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       d="M 14,3 1,29 14,29 14,3 z m -2,8 0,16 -8,0 8,-16 z"
+       id="path225-1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4054-7"
+       d="m 17.967761,3 c 0,26.096718 0,26 0,26 l 13,0 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer25"
+     inkscape:label="mirror-vertical"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="M 3,14 29,1 29,14 3,14 z m 8,-2 16,0 0,-8 -16,8 z"
+       id="path225"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4054"
+       d="m 3,18 c 26.096718,0 26,0 26,0 l 0,13 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer26"
+     inkscape:label="regions"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect150"
+       width="13.064767"
+       height="12.520402"
+       x="2.6008563"
+       y="6.8987117" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect212"
+       width="7.0162635"
+       height="11.915551"
+       x="22.742373"
+       y="18.148928" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect214"
+       width="7.5606289"
+       height="6.3509283"
+       x="18.085024"
+       y="2.3018494" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer27"
+     inkscape:label="addregion"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 14.078836,5.3407455 0,12.5312505 13.09375,0 0,-12.5312505 -13.09375,0 z m 1.84375,1.625 9.46875,0 0,9.0625005 -9.46875,0 0,-9.0625005 z"
+       id="rect150-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 5.2704736,1.2134067 0,30.0000003 21.9999994,0 0,-30.0000003 -21.9999994,0 z m 2,2 17.9999994,0 0,26.0000003 -17.9999994,0 0,-26.0000003 z"
+       id="rect956-7"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     style="display:none"
+     inkscape:label="delregion"
+     id="g202"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       inkscape:connector-curvature="0"
+       id="path204"
+       d="m 14.078836,5.3407455 0,12.5312505 13.09375,0 0,-12.5312505 -13.09375,0 z m 1.84375,1.625 9.46875,0 0,9.0625005 -9.46875,0 0,-9.0625005 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path206"
+       d="m 5.2704736,1.2134067 0,30.0000003 21.9999994,0 0,-30.0000003 -21.9999994,0 z m 2,2 17.9999994,0 0,26.0000003 -17.9999994,0 0,-26.0000003 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect210"
+       width="25.884966"
+       height="2.6429093"
+       x="-6.7994733"
+       y="21.40773"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+  </g>
+  <g
+     style="display:none"
+     inkscape:label="regioninfo"
+     id="g230"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       inkscape:connector-curvature="0"
+       id="path232"
+       d="m 14.078836,5.3407455 0,12.5312505 13.09375,0 0,-12.5312505 -13.09375,0 z m 1.84375,1.625 9.46875,0 0,9.0625005 -9.46875,0 0,-9.0625005 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path234"
+       d="m 5.2704736,1.2134067 0,30.0000003 21.9999994,0 0,-30.0000003 -21.9999994,0 z m 2,2 17.9999994,0 0,26.0000003 -17.9999994,0 0,-26.0000003 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <text
+       xml:space="preserve"
+       style="font-size:28.13728714px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Century Gothic;-inkscape-font-specification:Century Gothic"
+       x="13.438262"
+       y="32.891159"
+       id="text236"
+       sodipodi:linespacing="125%"
+       transform="scale(1.2650445,0.79048601)"><tspan
+         sodipodi:role="line"
+         id="tspan238"
+         x="13.438262"
+         y="32.891159">i</tspan></text>
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect240"
+       width="6.0485034"
+       height="1.875036"
+       x="17.601145"
+       y="25.104706" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path242"
+       sodipodi:cx="20.504425"
+       sodipodi:cy="10.527814"
+       sodipodi:rx="1.996006"
+       sodipodi:ry="1.996006"
+       d="m 22.500431,10.527814 a 1.996006,1.996006 0 1 1 -3.992012,0 1.996006,1.996006 0 1 1 3.992012,0 z" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="fonds"
+     style="display:none"
+     sodipodi:insensitive="true" />
+</svg>
Binary file client/src/main/webapp/jquery/img/embedded/16/addregion.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/back.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/birds-eye.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/brightness.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/calibration-x.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/calibration-y.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/cat.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/contrast.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/delmark.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/delregion.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/down.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/fonds.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/fwd.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/help.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/left.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/mark.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/mirror-horizontal.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/mirror-vertical.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/options.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/original-size.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/page.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/pagewidth.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/pixel-by-pixel.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/quality.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/reference.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/regioninfo.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/regions.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/reset.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/rgb.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/right.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/rotate.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/size.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/up.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/zoom-area.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/zoom-full.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/zoom-in.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/16/zoom-out.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/addregion.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/back.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/birds-eye.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/brightness.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/calibration-x.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/calibration-y.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/cat.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/contrast.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/delmark.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/delregion.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/down.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/fonds.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/fwd.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/help.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/left.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/mark.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/mirror-horizontal.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/mirror-vertical.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/options.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/original-size.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/page.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/pagewidth.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/pixel-by-pixel.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/quality.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/reference.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/regioninfo.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/regions.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/reset.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/rgb.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/right.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/rotate.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/size.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/up.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/zoom-area.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/zoom-full.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/zoom-in.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/32/zoom-out.png has changed
Binary file client/src/main/webapp/jquery/img/embedded/Thumbs.db has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/img/embedded_icons.cmd	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,14 @@
+rem @echo off
+setlocal
+
+rem saxon embedded.svg embedded_icons.xsl
+
+set ink=C:\prog_mr\inkscape-0.48.1\inkscape.exe
+
+for %%f in (embedded\svg\*.svg) do (
+    echo %%~nf
+	%ink% %%f --export-png=embedded\16\%%~nf.png -w16 -h16
+	%ink% %%f --export-png=embedded\32\%%~nf.png -w32 -h32
+	)
+
+endlocal
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/img/embedded_icons.xsl	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0"
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+	>
+	
+<!--
+Create icons from a single SVG file.
+In the SVG the icons reside in labelled groups -->
+
+<xsl:output method="xml"/>
+
+<xsl:template match="/">
+    <!-- select all hidden layers -->
+    <xsl:apply-templates select="//svg:g[@style='display:none']" />
+</xsl:template>
+
+<xsl:template match="svg:g">
+    <xsl:variable name="name" select="@inkscape:label"/>
+    <xsl:variable name="file" select="concat('embedded/svg/',$name,'.svg')"/>
+    <xsl:result-document href="{$file}">
+    <svg:svg>
+        <xsl:copy-of select="/svg:svg/@*"/>
+        <xsl:copy-of select="/svg:svg/*[not(@style='display:none')]"/>
+        <svg:g>
+            <xsl:copy-of select="@*"/>
+            <!-- replace the "style" attribute -->
+            <xsl:attribute name="style">display:inline</xsl:attribute>
+            <xsl:copy-of select="*"/>
+        </svg:g>
+    </svg:svg>
+    </xsl:result-document>
+</xsl:template>
+
+
+</xsl:stylesheet>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/img/fullscreen.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1166 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2388"
+   sodipodi:version="0.32"
+   inkscape:version="0.48+devel r10012"
+   sodipodi:docname="fullscreen.svg"
+   inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\back.png"
+   inkscape:export-xdpi="60.000000"
+   inkscape:export-ydpi="60.000000"
+   version="1.1"
+   style="display:inline">
+  <defs
+     id="defs2390">
+    <linearGradient
+       id="linearGradient3124">
+      <stop
+         id="stop7644"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.19587629;" />
+      <stop
+         style="stop-color:#545454;stop-opacity:0.22680412;"
+         offset="0.50000000"
+         id="stop7646" />
+      <stop
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3128" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3124-4">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.19587629;"
+         offset="0.0000000"
+         id="stop7644-0" />
+      <stop
+         id="stop7646-9"
+         offset="0.50000000"
+         style="stop-color:#545454;stop-opacity:0.22680412;" />
+      <stop
+         id="stop3128-4"
+         offset="1.0000000"
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3124-40">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.19587629;"
+         offset="0.0000000"
+         id="stop7644-9" />
+      <stop
+         id="stop7646-4"
+         offset="0.50000000"
+         style="stop-color:#545454;stop-opacity:0.22680412;" />
+      <stop
+         id="stop3128-8"
+         offset="1.0000000"
+         style="stop-color:#5f5f5f;stop-opacity:1.0000000;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.477814"
+     inkscape:cx="36.471552"
+     inkscape:cy="25.345983"
+     inkscape:current-layer="layer6"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1024"
+     inkscape:window-height="719"
+     inkscape:window-x="1020"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-grids="false"
+     inkscape:snap-global="false"
+     inkscape:snap-nodes="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="24,24"
+       id="guide79" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="24,24"
+       id="guide96" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2393">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="bg"
+     style="display:inline;opacity:1"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#924747;fill-opacity:0.59183673000000003;fill-rule:evenodd;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="rect468"
+       width="47.930622"
+       height="47.856426"
+       x="0.14839204"
+       y="0.66294771" />
+  </g>
+  <g
+     id="layer1"
+     inkscape:label="back-bg"
+     inkscape:groupmode="layer"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.265625,4.6583478 C 13.095813,5.0514781 4.9531248,13.574558 4.953125,24.002098 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437502 -19.03125,-19.3437502 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m 8.0625,10.2187502 0,19.5625 -17,-10 17,-9.5625 z"
+       id="path2396"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="back"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 31.712561,14.428571 0,19.571429 -17,-10 17,-9.571429 z"
+       id="path2474"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="birds-eye"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       id="g3261"
+       transform="translate(-0.421875,1.1270978)">
+      <g
+         inkscape:label="Layer 1"
+         id="layer1-2">
+        <path
+           id="path2396-4"
+           d="M 23.6875,3.53125 C 13.517688,3.9243803 5.3749998,12.44746 5.375,22.875 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.34375 -19.03125,-19.34375 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -11.5,5.03125 c 8.054946,0 16.101305,0 24.15625,0 -0.177792,7.640664 -0.145474,19.582098 -0.375,28.875 -7.925408,0 -15.855841,0 -23.78125,0 0,-9.629629 0,-19.245371 0,-28.875 z"
+           style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="display:none"
+         inkscape:label="l2"
+         id="layer2">
+        <path
+           id="path7614"
+           d="M 17,13.428571 17,33 34,23 17,13.428571 z"
+           style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="display:inline"
+         inkscape:label="l3"
+         id="layer3-5">
+        <path
+           sodipodi:nodetypes="cccccccccccccc"
+           id="path2398"
+           d="m 24.5,21.513718 c -0.970522,-2.062516 -4.45045,-4.216194 -6.575189,-4.233117 -3.372855,-0.126345 -4.809255,2.432072 -8.1569103,2.60025 -0.5923567,0.114228 -2.4633921,-0.689608 -1.64777,0.191066 1.232791,1.767212 5.0695153,-0.03597 7.0973333,-0.318185 2.771908,-0.238773 3.830042,0.577482 6.591043,1.46039 1.834483,1.550761 1.367191,4.328133 2.425478,5.038122 M 24.5,21.513718 c 0.970522,-2.062516 4.136456,-4.091194 6.261195,-4.108117 3.372855,-0.126345 4.68363,2.576424 8.031286,2.744602 0.592446,0.113949 2.903534,-0.958549 2.086592,-0.07844 -1.22746,1.744907 -5.120704,-0.107454 -7.130879,-0.360979 -2.878245,-0.225465 -3.954942,0.28254 -6.823783,1.173122 -2.192668,0.619125 -0.865145,4.640924 -2.752927,5.273194"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="brightness"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       id="g60"
+       transform="translate(-0.51107063,1.065898)">
+      <g
+         style="display:inline"
+         inkscape:label="Layer 1"
+         id="layer1-4">
+        <path
+           transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)"
+           d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+           sodipodi:ry="18.214285"
+           sodipodi:rx="17.928572"
+           sodipodi:cy="26.214285"
+           sodipodi:cx="30.214285"
+           id="path2396-5"
+           style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         style="display:none"
+         inkscape:label="l2"
+         id="layer2-5">
+        <path
+           id="path7614-1"
+           d="m 16.866525,15.295096 0,16.088379 13.974577,-8.220339 -13.974577,-7.86804 z"
+           style="fill:none;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1367"
+           d="m 33,13.571429 0,18.857142"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="display:inline"
+         inkscape:label="l3"
+         id="layer3-7">
+        <g
+           style="fill:#919191;fill-opacity:1"
+           id="g3803">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+             id="path2955"
+             sodipodi:cx="34.642857"
+             sodipodi:cy="12.5"
+             sodipodi:rx="10.214286"
+             sodipodi:ry="10.214286"
+             d="m 44.857142,12.5 a 10.214286,10.214286 0 1 1 -20.428571,0 10.214286,10.214286 0 1 1 20.428571,0 z"
+             transform="translate(-10.42857,10.28571)" />
+          <g
+             style="fill:#919191;fill-opacity:1"
+             id="g2968">
+            <rect
+               y="6"
+               x="23"
+               height="33"
+               width="2.4285715"
+               id="rect2959"
+               style="color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible" />
+            <rect
+               transform="matrix(0,-1,1,0,0,0)"
+               y="7.500001"
+               x="-24"
+               height="33"
+               width="2.4285715"
+               id="rect2966"
+               style="color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible" />
+          </g>
+          <g
+             style="fill:#919191;fill-opacity:1;display:inline"
+             id="g2972"
+             transform="matrix(0.707107,0.707107,-0.707107,0.707107,23.26192,-10.5061)">
+            <rect
+               y="6"
+               x="23"
+               height="33"
+               width="2.4285715"
+               id="rect2974"
+               style="color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible" />
+            <rect
+               transform="matrix(0,-1,1,0,0,0)"
+               y="7.500001"
+               x="-24"
+               height="33"
+               width="2.4285715"
+               id="rect2976"
+               style="color:#000000;fill:#919191;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="brightness-on"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       transform="translate(-10.60335,11.571789)"
+       d="m 44.857142,12.5 a 10.214286,10.214286 0 1 1 -20.428571,0 10.214286,10.214286 0 1 1 20.428571,0 z"
+       sodipodi:ry="10.214286"
+       sodipodi:rx="10.214286"
+       sodipodi:cy="12.5"
+       sodipodi:cx="34.642857"
+       id="path152"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="calibration-x"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path155"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.0858183,-3.9813063)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="calibration-y"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path162"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.178838,-3.9263719)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="cat"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 22.617324,4.6441901 C 12.724712,5.3372091 4.9298238,13.762793 4.929824,23.98794 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 -0.07945,0.00307 -0.170799,-0.00406 -0.25,0 -0.07858,0.00403 -0.171671,-0.005 -0.25,0 -0.03886,0.00248 -0.0862,-0.00272 -0.125,0 z m -9.71875,6.9687499 8.8125,0 0,10.40625 -8.8125,0 0,-10.40625 z m 13.34375,0 8.8125,0 0,10.40625 -8.8125,0 0,-10.40625 z m -13.21875,14.15625 8.84375,0 0,10.40625 -8.84375,0 0,-10.40625 z m 13.28125,0 8.8125,0 0,10.40625 -8.8125,0 0,-10.40625 z"
+       id="path169"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="contrast-on"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path174"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.030446,-3.9263719)" />
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 23.00402,14.069994 c -5.246609,0.466434 -9.375,4.882786 -9.375,10.25 0,5.435055 4.221162,9.91039 9.5625,10.28125 l 0,-20.53125 c -0.06538,0.0046 -0.122459,-0.0058 -0.1875,0 z"
+       id="path2882"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#fefefe;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 25.25402,14.040552 c 5.246609,0.466434 9.375,4.882786 9.375,10.25 0,5.435055 -4.221162,9.91039 -9.5625,10.28125 l 0,-20.53125 c 0.06538,0.0046 0.122459,-0.0058 0.1875,0 z"
+       id="path2891"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="contrast"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path183"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.178838,-3.9263719)" />
+    <path
+       style="color:#000000;fill:#7f7f7f;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 22.855628,14.069994 c -5.246609,0.466434 -9.375,4.882786 -9.375,10.25 0,5.435055 4.221162,9.91039 9.5625,10.28125 l 0,-20.53125 c -0.06538,0.0046 -0.122459,-0.0058 -0.1875,0 z"
+       id="path189"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#d2d2d2;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 25.105628,14.040552 c 5.246609,0.466434 9.375,4.882786 9.375,10.25 0,5.435055 -4.221162,9.91039 -9.5625,10.28125 l 0,-20.53125 c 0.06538,0.0046 0.122459,-0.0058 0.1875,0 z"
+       id="path191"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="delmark"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52965355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path197"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.030446,-3.8521759)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="down"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.31652,43.327497 C 13.146708,42.934366 5.0040198,34.411287 5.00402,23.983747 c 0,-10.677802 8.552192,-19.3437493 19.0625,-19.3437503 7.061613,0 13.212731,3.912981 16.5,9.7187503 l -16.4375,0 -16.5,0 8.25,14.28125 8.25,14.28125 8.25,-14.28125 8.21875,-14.21875 c 1.583645,2.821161 2.5,6.084514 2.5,9.5625 0,10.677802 -8.520943,19.34375 -19.03125,19.34375 -0.246335,0 -0.505925,0.0094 -0.75,0 z"
+       id="path204"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer16"
+     inkscape:label="first"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.242324,4.6441901 C 13.072512,5.0373204 4.9298238,13.5604 4.929824,23.98794 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m 9.46875,12.4687499 0,16.09375 -13.96875,-8.21875 13.96875,-7.875 z"
+       id="path207"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       d="m 16.795269,15.695439 0,18.857142"
+       id="path1372"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 33.012495,17.323033 0,16.088379 -13.974578,-8.220339 13.974578,-7.86804 z"
+       id="path2576"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer18"
+     inkscape:label="fwd"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="m 24.859466,4.6441901 c 10.169812,0.3931303 18.3125,8.9162099 18.3125,19.3437499 0,10.677802 -8.552192,19.343749 -19.0625,19.34375 -10.510307,0 -19.031249,-8.665948 -19.03125,-19.34375 0,-10.677802 8.520943,-19.3437499 19.03125,-19.3437499 0.246335,0 0.505925,-0.00944 0.75,0 z m -8.0625,10.2187499 0,19.5625 17,-10 -17,-9.5625 z"
+       id="path226"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 16.85179,14.346335 0,19.571429 17,-10 -17,-9.571429 z"
+       id="path230"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer19"
+     inkscape:label="help"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path233"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.030446,-3.8521759)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer20"
+     inkscape:label="last"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="m 24.78527,4.7183861 c 10.169812,0.3931303 18.3125,8.9162099 18.3125,19.3437499 0,10.677802 -8.552192,19.343749 -19.0625,19.34375 -10.510307,0 -19.031249,-8.665948 -19.03125,-19.34375 0,-10.677802 8.520943,-19.3437499 19.03125,-19.3437499 0.246335,0 0.505925,-0.00944 0.75,0 z m -9.46875,12.4687499 0,16.09375 13.96875,-8.21875 -13.96875,-7.875 z"
+       id="path240"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.085821,16.853212 0,16.088379 13.974577,-8.220339 -13.974577,-7.86804 z"
+       id="path242"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.367688,15.648917 0,18.857142"
+       id="path244"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer21"
+     inkscape:label="left"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 4.5608495,23.325664 C 4.9539805,13.155852 13.477059,5.0131644 23.904599,5.0131646 c 10.677802,0 19.34375,8.5521914 19.343751,19.0624994 0,7.061613 -3.912981,13.212731 -9.718751,16.5 l 0,-16.4375 0,-16.4999994 -14.28125,8.2499994 -14.2812495,8.25 14.2812495,8.25 14.21875,8.21875 c -2.821161,1.583645 -6.084514,2.5 -9.5625,2.5 -10.677802,0 -19.3437495,-8.520943 -19.3437495,-19.03125 0,-0.246335 -0.00944,-0.505925 0,-0.75 z"
+       id="path251"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer24"
+     inkscape:label="mark"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path260"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.178838,-3.8521759)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer25"
+     inkscape:label="mirror-horizontal-on"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.31652,4.6441901 C 13.146708,5.0373204 5.0040198,13.5604 5.00402,23.98794 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -12.25,9.4687499 12,0 0,23 -12,-23 z"
+       id="path267"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 25.057591,14.11294 12,0 -12,23 0,-23 z"
+       id="rect2628"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer26"
+     inkscape:label="mirror-horizontal"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.31652,4.5699941 C 13.146708,4.9631244 5.0040198,13.486204 5.00402,23.913744 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -12.25,9.4687499 12,0 0,23 -12,-23 z"
+       id="path275"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#818181;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 25.057591,14.038744 12,0 -12,23 0,-23 z"
+       id="path281"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer27"
+     inkscape:label="mirror-vertical-on"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       id="path288"
+       d="M 23.390716,4.7183858 C 13.220904,5.1115161 5.0782153,13.634596 5.0782163,24.062136 c 0,10.677802 8.5521917,19.343749 19.0624997,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437502 -19.03125,-19.3437502 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -12.25,9.4687502 12,0 0,23 -12,-23 z"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none;display:inline"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path290"
+       d="m 25.131787,14.187136 12,0 -12,23 0,-23 z"
+       style="color:#000000;fill:#000000;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer28"
+     inkscape:label="mirror-vertical"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       id="path297"
+       d="M 23.464912,4.7183861 C 13.2951,5.1115164 5.1524118,13.634596 5.152412,24.062136 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -12.25,9.4687499 12,0 0,23 -12,-23 z"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none;display:inline"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path299"
+       d="m 25.205983,14.187136 12,0 -12,23 0,-23 z"
+       style="color:#000000;fill:#818181;fill-opacity:0.98214285;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer29"
+     inkscape:label="mirror"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path302"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.659466,-4.965116)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 16.866525,15.295096 0,16.088379 13.974577,-8.220339 -13.974577,-7.86804 z"
+       id="path304"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 33,13.571429 0,18.857142"
+       id="path306"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.23305082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 33.151332,16.009382 0,16.088379 -13.974577,-8.220339 13.974577,-7.86804 z"
+       id="path308"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+       d="m 17.017857,14.285715 0,18.857142"
+       id="path310"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer30"
+     inkscape:label="options"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 22.964912,4.6441901 C 13.017144,5.2790115 5.1524118,13.722694 5.152412,23.98794 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 -0.07945,0.00307 -0.170799,-0.00406 -0.25,0 -0.07858,0.00403 -0.171671,-0.005 -0.25,0 z m -11.1875,19.4687499 5.5625,0 0,5.5625 -5.5625,0 0,-5.5625 z m 9.5,0 5.5625,0 0,5.5625 -5.5625,0 0,-5.5625 z m 9.5,0 5.5625,0 0,5.5625 -5.5625,0 0,-5.5625 z"
+       id="path313"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer31"
+     inkscape:label="original-size"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.464912,4.4957981 C 13.2951,4.8889284 5.1524118,13.412008 5.152412,23.839548 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -11.5,5.03125 c 8.054946,0 16.101305,0 24.15625,0 -0.177792,7.6406639 -0.145474,19.5820979 -0.375,28.8749999 -7.925408,0 -15.855841,0 -23.78125,0 0,-9.629629 0,-19.245371 0,-28.8749999 z"
+       id="path320"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="translate(-1.294017,0.25026109)"
+       d="m 27.285715,18.785715 a 1.9285715,1.9285715 0 1 1 -3.857143,0 1.9285715,1.9285715 0 1 1 3.857143,0 z"
+       sodipodi:ry="1.9285715"
+       sodipodi:rx="1.9285715"
+       sodipodi:cy="18.785715"
+       sodipodi:cx="25.357143"
+       id="path3538"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="translate(-1.294017,9.2502611)"
+       d="m 27.285715,18.785715 a 1.9285715,1.9285715 0 1 1 -3.857143,0 1.9285715,1.9285715 0 1 1 3.857143,0 z"
+       sodipodi:ry="1.9285715"
+       sodipodi:rx="1.9285715"
+       sodipodi:cy="18.785715"
+       sodipodi:cx="25.357143"
+       id="path3542"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer32"
+     inkscape:label="page"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.464912,4.5699941 C 13.2951,4.9631244 5.1524118,13.486204 5.152412,23.913744 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -8.6875,6.4687499 14,0 0.15625,0 5.28125,6.84375 0,19.15625 -19.4375,0 0,-26 z"
+       id="path327"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 28.777412,11.038744 c 0,7 0,7 0,7 l 6,0"
+       id="path2414"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 15.063126,10.788744 13.999999,0 0.142858,0 5.285715,6.857143 0,19.142857 -19.428572,0 0,-26 z"
+       id="path2438"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer33"
+     inkscape:label="pagewidth"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.464912,4.6441901 C 13.2951,5.0373204 5.1524118,13.5604 5.152412,23.98794 c 0,3.561406 0.9701688,6.883089 2.625,9.75 l 0,-19.1875 33,0 0,18.96875 c 1.570104,-2.812214 2.46875,-6.069306 2.46875,-9.53125 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -9.6875,35.5312499 c 2.993555,1.992339 6.594037,3.15625 10.4375,3.15625 3.833988,0 7.385948,-1.172923 10.375,-3.15625 l -20.8125,0 z"
+       id="path334"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path2222"
+       sodipodi:sides="3"
+       sodipodi:cx="15.514512"
+       sodipodi:cy="22.353563"
+       sodipodi:r1="3.2910488"
+       sodipodi:r2="1.6455244"
+       sodipodi:arg1="1.046877"
+       sodipodi:arg2="2.0940745"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 17.16095,25.203168 -2.468743,-1.424275 -2.468744,-1.424275 2.46783,-1.425857 2.46783,-1.425857 9.13e-4,2.850132 z"
+       transform="matrix(1.056109,0,0,1.093566,-3.933877,-0.3103459)" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path3103"
+       sodipodi:sides="3"
+       sodipodi:cx="15.514512"
+       sodipodi:cy="22.353563"
+       sodipodi:r1="3.2910488"
+       sodipodi:r2="1.6455244"
+       sodipodi:arg1="1.046877"
+       sodipodi:arg2="2.0940745"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 17.16095,25.203168 -2.468743,-1.424275 -2.468744,-1.424275 2.46783,-1.425857 2.46783,-1.425857 9.13e-4,2.850132 z"
+       transform="matrix(-1.056109,0,0,1.093566,52.438582,-0.2974859)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer34"
+     inkscape:label="pixel-by-pixel"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.6875,3.53125 C 13.517688,3.9243803 5.3749998,12.44746 5.375,22.875 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.34375 -19.03125,-19.34375 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -11.5,5.03125 c 8.054946,0 16.101305,0 24.15625,0 -0.177792,7.640664 -0.145474,19.582098 -0.375,28.875 -7.925408,0 -15.855841,0 -23.78125,0 0,-9.629629 0,-19.245371 0,-28.875 z"
+       id="path343"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="translate(-1.368213,0.47284911)"
+       d="m 27.285715,18.785715 a 1.9285715,1.9285715 0 1 1 -3.857143,0 1.9285715,1.9285715 0 1 1 3.857143,0 z"
+       sodipodi:ry="1.9285715"
+       sodipodi:rx="1.9285715"
+       sodipodi:cy="18.785715"
+       sodipodi:cx="25.357143"
+       id="path347"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="translate(-1.368213,9.4728491)"
+       d="m 27.285715,18.785715 a 1.9285715,1.9285715 0 1 1 -3.857143,0 1.9285715,1.9285715 0 1 1 3.857143,0 z"
+       sodipodi:ry="1.9285715"
+       sodipodi:rx="1.9285715"
+       sodipodi:cy="18.785715"
+       sodipodi:cx="25.357143"
+       id="path349"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer35"
+     inkscape:label="quality"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path352"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-7.9562501,-3.8521759)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer36"
+     inkscape:label="reference"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="m 23.31652,4.6441901 c -6.248958,0.2415635 -11.702829,3.5677067 -15,8.4999999 l 31.5,0 c -3.425954,-5.1249416 -9.196849,-8.4999999 -15.75,-8.4999999 -0.246335,0 -0.505925,-0.00944 -0.75,0 z M 7.87902,34.14419 c 3.357176,5.507237 9.346957,9.187499 16.1875,9.1875 6.840543,0 12.830324,-3.680263 16.1875,-9.1875 l -32.375,0 z"
+       id="path359"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer37"
+     inkscape:label="reset"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:nodetypes="cssssc"
+       id="path366"
+       d="M 23.242324,4.5699941 C 13.072512,4.9631244 4.9298238,13.486204 4.929824,23.913744 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none;display:inline"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path811"
+       d="m 14.968932,13.288926 c -0.09111,-0.002 -0.188341,0.03681 -0.28125,0.0625 -0.01064,0.0029 -0.02063,-0.0033 -0.03125,0 l 0,0.03125 c -0.350033,0.113463 -0.579179,0.390226 -0.65625,0.6875 -0.07578,0.292276 0.01031,0.638512 0.25,0.90625 l -0.03125,0.03125 0.03125,0.03125 8.4375,8.96875 -8.75,8.25 c -0.0085,0.0071 0.0082,0.0239 0,0.03125 -0.2876,0.256825 -0.415258,0.628364 -0.3125,1 0.0029,0.01064 -0.0033,0.02063 0,0.03125 l 0.03125,0 c 0.113463,0.350033 0.390226,0.579179 0.6875,0.65625 0.292276,0.07578 0.638512,-0.01031 0.90625,-0.25 l 0.03125,0.03125 0.03125,-0.03125 8.75,-8.25 8.15625,8.65625 c 0.790154,0.861986 2.290154,-0.513014 1.5,-1.375 l -8.15625,-8.65625 8.84375,-8.34375 c 0.861986,-0.790154 -0.513014,-2.290154 -1.375,-1.5 l -8.875,8.375 -8.4375,-8.96875 c -0.0071,-0.0085 -0.0239,0.0082 -0.03125,0 -0.192619,-0.2157 -0.445432,-0.368966 -0.71875,-0.375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer38"
+     inkscape:label="rgb-on"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.093932,4.6441901 C 12.92412,5.0373204 4.7814318,13.5604 4.781432,23.98794 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m 0.625,11.1874999 c 0.03501,-4.44e-4 0.08988,0 0.125,0 4.494857,0 8.125,3.661393 8.125,8.15625 0,4.494858 -3.630143,8.15625 -8.125,8.15625 -4.494858,-1e-6 -8.15625,-3.661393 -8.15625,-8.15625 0,-4.459741 3.584807,-8.099865 8.03125,-8.15625 z"
+       id="path374"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer39"
+     inkscape:label="rgb"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path381"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.2530341,-3.8521759)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer40"
+     inkscape:label="right"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="m 43.763529,23.607278 c -0.393131,10.169812 -8.91621,18.3125 -19.34375,18.3125 -10.677802,0 -19.3437497,-8.552192 -19.3437507,-19.0625 0,-7.061613 3.912981,-13.212731 9.7187507,-16.4999997 l 0,16.4374997 0,16.5 14.28125,-8.25 14.28125,-8.25 -14.28125,-8.25 -14.21875,-8.2187497 c 2.821161,-1.583645 6.084514,-2.5 9.5625,-2.5 10.677802,0 19.34375,8.5209427 19.34375,19.0312497 0,0.246335 0.0094,0.505925 0,0.75 z"
+       id="path388"
+       inkscape:export-filename="C:\src\ECHO\digilib\client\digitallibrary\greyskin\right.png"
+       inkscape:export-xdpi="60"
+       inkscape:export-ydpi="60"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer42"
+     inkscape:label="rotate-on"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path397"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.104642,-3.8521759)" />
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 23.173913,13.392912 c -5.256566,0.331025 -9.413313,4.723535 -9.413313,10.06323 0,0.02893 -2.44e-4,0.05499 0,0.08386 l 2.201331,0 c -2.74e-4,-0.02705 0,-0.05675 0,-0.08386 0,-4.23644 3.349847,-7.70218 7.547423,-7.861899 0.100742,-0.0038 0.212801,0 0.314476,0 4.338114,0 7.861898,3.523784 7.861898,7.861899 0,4.209327 -3.324433,7.661202 -7.484527,7.861898 l 0,2.201332 c 5.38247,-0.196267 9.685859,-4.633096 9.685859,-10.06323 0,-5.554903 -4.508327,-10.06323 -10.06323,-10.06323 -0.151892,0 -0.310975,-0.0067 -0.461232,0 -0.06263,0.0028 -0.126354,-0.0039 -0.188685,0 z"
+       id="path3724"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path3738"
+       sodipodi:sides="3"
+       sodipodi:cx="7.7142859"
+       sodipodi:cy="23.142857"
+       sodipodi:r1="5.1448407"
+       sodipodi:r2="2.5724204"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 7.714286,28.287697 -2.2277816,-3.85863 -2.2277814,-3.858631 4.4555629,0 4.4555631,0 -2.2277818,3.858631 z"
+       transform="matrix(0.991317,0,0,0.991317,7.2328959,2.7740831)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer43"
+     inkscape:label="rotate"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:type="arc"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       id="path406"
+       sodipodi:cx="30.214285"
+       sodipodi:cy="26.214285"
+       sodipodi:rx="17.928572"
+       sodipodi:ry="18.214285"
+       d="m 48.142857,26.214285 a 17.928572,18.214285 0 1 1 -35.857144,0 17.928572,18.214285 0 1 1 35.857144,0 z"
+       transform="matrix(1.062015,0,0,1.062015,-8.0880238,-3.8399638)" />
+    <path
+       style="color:#000000;fill:#797979;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 23.090452,13.376007 c -5.256566,0.331025 -9.413313,4.723535 -9.413313,10.06323 0,0.02893 -2.44e-4,0.05499 0,0.08386 l 2.201331,0 c -2.74e-4,-0.02705 0,-0.05675 0,-0.08386 0,-4.23644 3.349847,-7.70218 7.547423,-7.861899 0.100742,-0.0038 0.212801,0 0.314476,0 4.338114,0 7.861898,3.523784 7.861898,7.861899 0,4.209327 -3.324433,7.661202 -7.484527,7.861898 l 0,2.201332 c 5.38247,-0.196267 9.685859,-4.633096 9.685859,-10.06323 0,-5.554903 -4.508327,-10.06323 -10.06323,-10.06323 -0.151892,0 -0.310975,-0.0067 -0.461232,0 -0.06263,0.0028 -0.126354,-0.0039 -0.188685,0 z"
+       id="path412"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:#797979;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5625;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path414"
+       sodipodi:sides="3"
+       sodipodi:cx="7.7142859"
+       sodipodi:cy="23.142857"
+       sodipodi:r1="5.1448407"
+       sodipodi:r2="2.5724204"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 7.714286,28.287697 -2.2277816,-3.85863 -2.2277814,-3.858631 4.4555629,0 4.4555631,0 -2.2277818,3.858631 z"
+       transform="matrix(0.991317,0,0,0.991317,7.1586999,2.7920209)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer44"
+     inkscape:label="size"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 22.543128,4.7183861 C 12.650516,5.4114051 4.8556277,13.836989 4.8556279,24.062136 c 0,10.677802 8.5521921,19.343749 19.0625001,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 -0.07945,0.00307 -0.170799,-0.00406 -0.25,0 -0.07858,0.00403 -0.171671,-0.005 -0.25,0 -0.03886,0.00248 -0.0862,-0.00272 -0.125,0 z m 1.71875,1.09375 2.8125,4.9062499 2.78125,4.875 -5.625,-0.03125 -5.625,0 2.84375,-4.875 2.8125,-4.8749999 z m -8.5625,13.1874999 0.03125,5.625 0,5.625 -4.875,-2.8125 -4.8750001,-2.78125 4.8437501,-2.84375 4.875,-2.8125 z m 16.96875,0 4.875,2.8125 4.875,2.84375 -4.90625,2.78125 -4.875,2.8125 0.03125,-5.625 0,-5.625 z m -8.4375,13.5 5.625,0 -2.78125,4.875 -2.8125,4.875 -2.8125,-4.875 -2.84375,-4.84375 5.625,-0.03125 z"
+       id="path421"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.832068,0.650269,-0.650269,0.832068,8.142727,-5.7134922)"
+       d="m 26.285714,22.285714 -5.275457,0.760073 -5.275458,0.760073 1.979486,-4.948717 1.979487,-4.948717 3.295971,4.188644 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.4277039"
+       sodipodi:arg1="0.38050638"
+       sodipodi:r2="3.0772371"
+       sodipodi:r1="6.1544743"
+       sodipodi:cy="20"
+       sodipodi:cx="20.571428"
+       sodipodi:sides="3"
+       id="path2370"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="star" />
+    <path
+       transform="matrix(-0.832068,0.650269,0.650269,0.832068,39.798676,-5.7134922)"
+       d="m 26.285714,22.285714 -5.275457,0.760073 -5.275458,0.760073 1.979486,-4.948717 1.979487,-4.948717 3.295971,4.188644 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.4277039"
+       sodipodi:arg1="0.38050638"
+       sodipodi:r2="3.0772371"
+       sodipodi:r1="6.1544743"
+       sodipodi:cy="20"
+       sodipodi:cx="20.571428"
+       sodipodi:sides="3"
+       id="path2372"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="star" />
+    <path
+       transform="matrix(0.650269,-0.832068,0.832068,0.650269,-5.990163,39.538968)"
+       d="m 26.285714,22.285714 -5.275457,0.760073 -5.275458,0.760073 1.979486,-4.948717 1.979487,-4.948717 3.295971,4.188644 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.4277039"
+       sodipodi:arg1="0.38050638"
+       sodipodi:r2="3.0772371"
+       sodipodi:r1="6.1544743"
+       sodipodi:cy="20"
+       sodipodi:cx="20.571428"
+       sodipodi:sides="3"
+       id="path2374"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="star" />
+    <path
+       transform="matrix(0.650269,0.832068,0.832068,-0.650269,-5.990163,7.8830228)"
+       d="m 26.285714,22.285714 -5.275457,0.760073 -5.275458,0.760073 1.979486,-4.948717 1.979487,-4.948717 3.295971,4.188644 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="1.4277039"
+       sodipodi:arg1="0.38050638"
+       sodipodi:r2="3.0772371"
+       sodipodi:r1="6.1544743"
+       sodipodi:cy="20"
+       sodipodi:cx="20.571428"
+       sodipodi:sides="3"
+       id="path2376"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.82857955;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="star" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer45"
+     inkscape:label="up"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#ffa060;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.6875,3.53125 C 13.517688,3.9243803 5.3749998,12.44746 5.375,22.875 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 7.061613,0 13.212731,-3.912981 16.5,-9.71875 L 24.5,32.5 8,32.5 16.25,18.21875 24.5,3.9375 32.75,18.21875 40.96875,32.4375 c 1.583645,-2.821161 2.5,-6.084514 2.5,-9.5625 0,-10.677802 -8.520943,-19.34375 -19.03125,-19.34375 -0.246335,0 -0.505925,-0.00944 -0.75,0 z"
+       id="path428"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer46"
+     inkscape:label="zoom-area"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52899998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.242324,4.7183861 C 13.072512,5.1115164 4.9298238,13.634596 4.929824,24.062136 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -11.5,5.03125 c 8.054946,0 16.101305,0 24.15625,0 -0.177792,7.6406639 -0.145474,19.5820979 -0.375,28.8749999 -7.925408,0 -15.855841,0 -23.78125,0 0,-9.629629 0,-19.245371 0,-28.8749999 z"
+       id="path431"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-opacity:1;display:inline"
+       id="path3286"
+       sodipodi:cx="18.857143"
+       sodipodi:cy="16.857143"
+       sodipodi:rx="6"
+       sodipodi:ry="5.5714288"
+       d="m 24.857143,16.857143 a 6,5.5714288 0 1 1 -12,0 6,5.5714288 0 1 1 12,0 z"
+       transform="matrix(1.088683,0,0,1.172638,-8.8022,17.946136)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3.0204308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 7.0446086,42.697351 c -5.781968,5.436776 -5.781968,5.436776 -5.781968,5.436776"
+       id="path3290"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer47"
+     inkscape:label="zoom-full"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.31652,4.6441901 C 13.146708,5.0373204 5.0040198,13.5604 5.00402,23.98794 c 0,10.677802 8.552192,19.343749 19.0625,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437499 -19.03125,-19.3437499 -0.246335,0 -0.505925,-0.00944 -0.75,0 z m -11.5,5.03125 c 8.054946,0 16.101305,0 24.15625,0 -0.177792,7.6406639 -0.145474,19.5820979 -0.375,28.8749999 -7.925408,0 -15.855841,0 -23.78125,0 0,-9.629629 0,-19.245371 0,-28.8749999 z"
+       id="path438"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-opacity:1;display:inline"
+       id="path442"
+       sodipodi:cx="18.857143"
+       sodipodi:cy="16.857143"
+       sodipodi:rx="6"
+       sodipodi:ry="5.5714288"
+       d="m 24.857143,16.857143 a 6,5.5714288 0 1 1 -12,0 6,5.5714288 0 1 1 12,0 z"
+       transform="matrix(1.088683,0,0,1.172638,-8.728004,17.87194)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3.0204308;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 7.1188046,42.623155 c -5.781968,5.436776 -5.781968,5.436776 -5.781968,5.436776"
+       id="path444"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer48"
+     inkscape:label="zoom-in"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none"
+       d="M 23.015625,4.6583475 C 12.957061,5.1740675 4.9531249,13.656023 4.9531251,24.002098 c 0,10.677802 8.5521919,19.343749 19.0624999,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437505 -19.03125,-19.3437505 -0.246335,0 -0.505925,-0.00944 -0.75,0 -0.07945,0.00307 -0.170799,-0.00406 -0.25,0 z m -0.125,7.9062505 c 0.04349,-0.0038 0.08137,0.0033 0.125,0 0.0055,-4.14e-4 0.02595,1.56e-4 0.03125,0 0.02067,1.24e-4 0.0418,-2.57e-4 0.0625,0 0.0053,-1.06e-4 0.02574,3.48e-4 0.03125,0 0.0028,-1.76e-4 0.0248,-6.1e-5 0.03125,0 0.02064,9.1e-5 0.04183,-2.26e-4 0.0625,0 0.0053,-8.4e-5 0.02567,2.83e-4 0.03125,0 0.184218,-0.0093 0.375973,0 0.5625,0 5.96888,0 10.8125,4.842552 10.8125,10.8125 2e-6,5.969949 -4.84362,10.8125 -10.8125,10.8125 -5.968879,-2e-6 -10.8125,-4.842552 -10.8125,-10.8125 0,-5.648895 4.351686,-10.328698 9.875,-10.8125 z"
+       id="path447"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1.3868767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path3217"
+       sodipodi:cx="27.142857"
+       sodipodi:cy="19.714285"
+       sodipodi:rx="10.428572"
+       sodipodi:ry="10.142858"
+       d="m 37.571428,19.714285 a 10.428572,10.142858 0 1 1 -20.857143,0 10.428572,10.142858 0 1 1 20.857143,0 z"
+       transform="matrix(1.0569175,0,0,1.1067914,-4.9474456,1.618147)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 16.351608,30.961781 c -9.571429,9 -9.571429,9 -9.571429,9"
+       id="path454"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer49"
+     inkscape:label="zoom-out"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1269"
+       d="M 23.036721,4.6188415 C 12.978157,5.1345615 4.9742204,13.616517 4.9742206,23.962592 c 0,10.677802 8.5521924,19.343749 19.0625004,19.34375 10.510307,0 19.031249,-8.665948 19.03125,-19.34375 0,-10.677802 -8.520943,-19.3437505 -19.03125,-19.3437505 -0.246335,0 -0.505925,-0.00944 -0.75,0 -0.07945,0.00307 -0.170799,-0.00406 -0.25,0 z m -0.125,7.9062505 c 0.04349,-0.0038 0.08137,0.0033 0.125,0 0.0055,-4.14e-4 0.02595,1.56e-4 0.03125,0 0.02067,1.24e-4 0.0418,-2.57e-4 0.0625,0 0.0053,-1.06e-4 0.02574,3.48e-4 0.03125,0 0.0028,-1.76e-4 0.0248,-6.1e-5 0.03125,0 0.02064,9.1e-5 0.04183,-2.26e-4 0.0625,0 0.0053,-8.4e-5 0.02567,2.83e-4 0.03125,0 0.184218,-0.0093 0.375973,0 0.5625,0 5.96888,0 10.8125,4.842552 10.8125,10.8125 2e-6,5.969949 -4.84362,10.8125 -10.8125,10.8125 -5.968879,-2e-6 -10.8125,-4.842552 -10.8125,-10.8125 0,-5.648895 4.351686,-10.328698 9.875,-10.8125 z"
+       style="fill:#707070;fill-opacity:0.35526315;fill-rule:evenodd;stroke:#000000;stroke-width:0.52918273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.50331128;stroke-dasharray:none;display:inline" />
+    <path
+       transform="matrix(1.0569175,0,0,1.1067914,-4.92635,1.578641)"
+       d="m 37.571428,19.714285 a 10.428572,10.142858 0 1 1 -20.857143,0 10.428572,10.142858 0 1 1 20.857143,0 z"
+       sodipodi:ry="10.142858"
+       sodipodi:rx="10.428572"
+       sodipodi:cy="19.714285"
+       sodipodi:cx="27.142857"
+       id="path1271"
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1.3868767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1273"
+       d="m 16.372704,30.996471 c -9.5714294,9 -9.5714294,9 -9.5714294,9"
+       style="fill:none;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+  </g>
+</svg>
Binary file client/src/main/webapp/jquery/img/fullscreen/addregion.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/back.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/bg.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/birds-eye.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/blue.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/brightness-on.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/brightness.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/calibration-x.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/calibration-y.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/cat.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/contrast-on.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/contrast.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/corona.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/delmark.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/delregion.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/down.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/first.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/fwd.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/help.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/last.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/left.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/mark-bg-16.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/mark-bg.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/mark.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/mirror-horizontal.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/mirror-vertical.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/options.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/original-size.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/page.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/pagewidth.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/pixel-by-pixel.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/quality.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/reference.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/regioninfo.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/regions.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/reset.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/rgb-on.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/rgb.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/right.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/rotate-on.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/rotate.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/size.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/up.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/whitedisc.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/zoom-area.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/zoom-full.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/zoom-in.png has changed
Binary file client/src/main/webapp/jquery/img/fullscreen/zoom-out.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/img/make_icon.cmd	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,11 @@
+@echo off
+setlocal
+
+rem saxon embedded.svg embedded_icons.xsl
+
+set ink=C:\prog_mr\inkscape-0.48.1\inkscape.exe
+
+%ink% embedded\svg\%1.svg --export-png=embedded\16\%1.png -w16 -h16
+%ink% embedded\svg\%1.svg --export-png=embedded\32\%1.png -w32 -h32
+
+endlocal
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-1.4.4.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,7181 @@
+/*!
+ * jQuery JavaScript Library v1.4.4
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Nov 11 19:04:53 2010 -0500
+ */
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,
+
+	// Is it a simple selector
+	isSimple = /^.[^:#\[\.,]*$/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+	rwhite = /\s/,
+
+	// Used for trimming whitespace
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Check for non-word characters
+	rnonword = /\W/,
+
+	// Check for digits
+	rdigit = /\d/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+	
+	// Has the ready events already been bound?
+	readyBound = false,
+	
+	// The functions to execute on DOM ready
+	readyList = [],
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+	
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	init: function( selector, context ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+		
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context && document.body ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = "body";
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			match = quickExpr.exec( selector );
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					doc = (context ? context.ownerDocument || context : document);
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
+					}
+					
+					return jQuery.merge( this, selector );
+					
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $("TAG")
+			} else if ( !context && !rnonword.test( selector ) ) {
+				this.selector = selector;
+				this.context = document;
+				selector = document.getElementsByTagName( selector );
+				return jQuery.merge( this, selector );
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return (context || rootjQuery).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return jQuery( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if (selector.selector !== undefined) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.4.4",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = jQuery();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+		
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+	
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// If the DOM is already ready
+		if ( jQuery.isReady ) {
+			// Execute the function immediately
+			fn.call( document, jQuery );
+
+		// Otherwise, remember the function for later
+		} else if ( readyList ) {
+			// Add the function to the wait list
+			readyList.push( fn );
+		}
+
+		return this;
+	},
+	
+	eq: function( i ) {
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, +i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+	
+	end: function() {
+		return this.prevObject || jQuery(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	 var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		window.$ = _$;
+
+		if ( deep ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+	
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+	
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+		// A third-party is pushing the ready event forwards
+		if ( wait === true ) {
+			jQuery.readyWait--;
+		}
+
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 1 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
+			}
+
+			// If there are functions bound, to execute
+			if ( readyList ) {
+				// Execute all of them
+				var fn,
+					i = 0,
+					ready = readyList;
+
+				// Reset the list of functions
+				readyList = null;
+
+				while ( (fn = ready[ i++ ]) ) {
+					fn.call( document, jQuery );
+				}
+
+				// Trigger any bound ready events
+				if ( jQuery.fn.trigger ) {
+					jQuery( document ).trigger( "ready" ).unbind( "ready" );
+				}
+			}
+		}
+	},
+	
+	bindReady: function() {
+		if ( readyBound ) {
+			return;
+		}
+
+		readyBound = true;
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+			
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent("onreadystatechange", DOMContentLoaded);
+			
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	// A crude way of determining if an object is a window
+	isWindow: function( obj ) {
+		return obj && typeof obj === "object" && "setInterval" in obj;
+	},
+
+	isNaN: function( obj ) {
+		return obj == null || !rdigit.test( obj ) || isNaN( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+		
+		// Not own constructor property must be Object
+		if ( obj.constructor &&
+			!hasOwn.call(obj, "constructor") &&
+			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			return false;
+		}
+		
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+	
+		var key;
+		for ( key in obj ) {}
+		
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+	
+	error: function( msg ) {
+		throw msg;
+	},
+	
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+		
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test(data.replace(rvalidescape, "@")
+			.replace(rvalidtokens, "]")
+			.replace(rvalidbraces, "")) ) {
+
+			// Try to use the native JSON parser first
+			return window.JSON && window.JSON.parse ?
+				window.JSON.parse( data ) :
+				(new Function("return " + data))();
+
+		} else {
+			jQuery.error( "Invalid JSON: " + data );
+		}
+	},
+
+	noop: function() {},
+
+	// Evalulates a script in a global context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test(data) ) {
+			// Inspired by code by Andrea Giammarchi
+			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+			var head = document.getElementsByTagName("head")[0] || document.documentElement,
+				script = document.createElement("script");
+
+			script.type = "text/javascript";
+
+			if ( jQuery.support.scriptEval ) {
+				script.appendChild( document.createTextNode( data ) );
+			} else {
+				script.text = data;
+			}
+
+			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
+			head.removeChild( script );
+		}
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction(object);
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( var value = object[0];
+					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+			}
+		}
+
+		return object;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type(array);
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array ) {
+		if ( array.indexOf ) {
+			return array.indexOf( elem );
+		}
+
+		for ( var i = 0, length = array.length; i < length; i++ ) {
+			if ( array[ i ] === elem ) {
+				return i;
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length,
+			j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+		
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [], retVal;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var ret = [], value;
+
+		// Go through the array, translating each of the items to their
+		// new value (or values).
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			value = callback( elems[ i ], i, arg );
+
+			if ( value != null ) {
+				ret[ ret.length ] = value;
+			}
+		}
+
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	proxy: function( fn, proxy, thisObject ) {
+		if ( arguments.length === 2 ) {
+			if ( typeof proxy === "string" ) {
+				thisObject = fn;
+				fn = thisObject[ proxy ];
+				proxy = undefined;
+
+			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
+				thisObject = proxy;
+				proxy = undefined;
+			}
+		}
+
+		if ( !proxy && fn ) {
+			proxy = function() {
+				return fn.apply( thisObject || this, arguments );
+			};
+		}
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		if ( fn ) {
+			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+		}
+
+		// So proxy can be declared as an argument
+		return proxy;
+	},
+
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can be optionally by executed if its a function
+	access: function( elems, key, value, exec, fn, pass ) {
+		var length = elems.length;
+	
+		// Setting many attributes
+		if ( typeof key === "object" ) {
+			for ( var k in key ) {
+				jQuery.access( elems, k, key[k], exec, fn, value );
+			}
+			return elems;
+		}
+	
+		// Setting one attribute
+		if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = !pass && exec && jQuery.isFunction(value);
+		
+			for ( var i = 0; i < length; i++ ) {
+				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+			}
+		
+			return elems;
+		}
+	
+		// Getting an attribute
+		return length ? fn( elems[0], key ) : undefined;
+	},
+
+	now: function() {
+		return (new Date()).getTime();
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	browser: {}
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+if ( indexOf ) {
+	jQuery.inArray = function( elem, array ) {
+		return indexOf.call( array, elem );
+	};
+}
+
+// Verify that \s matches non-breaking spaces
+// (IE fails on this test)
+if ( !rwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch(e) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+// Expose jQuery to the global object
+return (window.jQuery = window.$ = jQuery);
+
+})();
+
+
+(function() {
+
+	jQuery.support = {};
+
+	var root = document.documentElement,
+		script = document.createElement("script"),
+		div = document.createElement("div"),
+		id = "script" + jQuery.now();
+
+	div.style.display = "none";
+	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	var all = div.getElementsByTagName("*"),
+		a = div.getElementsByTagName("a")[0],
+		select = document.createElement("select"),
+		opt = select.appendChild( document.createElement("option") );
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return;
+	}
+
+	jQuery.support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: div.firstChild.nodeType === 3,
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText insted)
+		style: /red/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: a.getAttribute("href") === "/a",
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55$/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: div.getElementsByTagName("input")[0].value === "on",
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Will be defined later
+		deleteExpando: true,
+		optDisabled: false,
+		checkClone: false,
+		scriptEval: false,
+		noCloneEvent: true,
+		boxModel: null,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableHiddenOffsets: true
+	};
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as diabled)
+	select.disabled = true;
+	jQuery.support.optDisabled = !opt.disabled;
+
+	script.type = "text/javascript";
+	try {
+		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+	} catch(e) {}
+
+	root.insertBefore( script, root.firstChild );
+
+	// Make sure that the execution of code works by injecting a script
+	// tag with appendChild/createTextNode
+	// (IE doesn't support this, fails, and uses .text instead)
+	if ( window[ id ] ) {
+		jQuery.support.scriptEval = true;
+		delete window[ id ];
+	}
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete script.test;
+
+	} catch(e) {
+		jQuery.support.deleteExpando = false;
+	}
+
+	root.removeChild( script );
+
+	if ( div.attachEvent && div.fireEvent ) {
+		div.attachEvent("onclick", function click() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			jQuery.support.noCloneEvent = false;
+			div.detachEvent("onclick", click);
+		});
+		div.cloneNode(true).fireEvent("onclick");
+	}
+
+	div = document.createElement("div");
+	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+
+	var fragment = document.createDocumentFragment();
+	fragment.appendChild( div.firstChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+
+	// Figure out if the W3C box model works as expected
+	// document.body must exist before we can do this
+	jQuery(function() {
+		var div = document.createElement("div");
+		div.style.width = div.style.paddingLeft = "1px";
+
+		document.body.appendChild( div );
+		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+
+		if ( "zoom" in div.style ) {
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			// (IE < 8 does this)
+			div.style.display = "inline";
+			div.style.zoom = 1;
+			jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
+
+			// Check if elements with layout shrink-wrap their children
+			// (IE 6 does this)
+			div.style.display = "";
+			div.innerHTML = "<div style='width:4px;'></div>";
+			jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
+		}
+
+		div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
+		var tds = div.getElementsByTagName("td");
+
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		// (only IE 8 fails this test)
+		jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
+
+		tds[0].style.display = "";
+		tds[1].style.display = "none";
+
+		// Check if empty table cells still have offsetWidth/Height
+		// (IE < 8 fail this test)
+		jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
+		div.innerHTML = "";
+
+		document.body.removeChild( div ).style.display = "none";
+		div = tds = null;
+	});
+
+	// Technique from Juriy Zaytsev
+	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+	var eventSupported = function( eventName ) {
+		var el = document.createElement("div");
+		eventName = "on" + eventName;
+
+		var isSupported = (eventName in el);
+		if ( !isSupported ) {
+			el.setAttribute(eventName, "return;");
+			isSupported = typeof el[eventName] === "function";
+		}
+		el = null;
+
+		return isSupported;
+	};
+
+	jQuery.support.submitBubbles = eventSupported("submit");
+	jQuery.support.changeBubbles = eventSupported("change");
+
+	// release memory in IE
+	root = script = div = all = a = null;
+})();
+
+
+
+var windowData = {},
+	rbrace = /^(?:\{.*\}|\[.*\])$/;
+
+jQuery.extend({
+	cache: {},
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page	
+	expando: "jQuery" + jQuery.now(),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	data: function( elem, name, data ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var isNode = elem.nodeType,
+			id = isNode ? elem[ jQuery.expando ] : null,
+			cache = jQuery.cache, thisCache;
+
+		if ( isNode && !id && typeof name === "string" && data === undefined ) {
+			return;
+		}
+
+		// Get the data from the object directly
+		if ( !isNode ) {
+			cache = elem;
+
+		// Compute a unique ID for the element
+		} else if ( !id ) {
+			elem[ jQuery.expando ] = id = ++jQuery.uuid;
+		}
+
+		// Avoid generating a new cache unless none exists and we
+		// want to manipulate it.
+		if ( typeof name === "object" ) {
+			if ( isNode ) {
+				cache[ id ] = jQuery.extend(cache[ id ], name);
+
+			} else {
+				jQuery.extend( cache, name );
+			}
+
+		} else if ( isNode && !cache[ id ] ) {
+			cache[ id ] = {};
+		}
+
+		thisCache = isNode ? cache[ id ] : cache;
+
+		// Prevent overriding the named cache with undefined values
+		if ( data !== undefined ) {
+			thisCache[ name ] = data;
+		}
+
+		return typeof name === "string" ? thisCache[ name ] : thisCache;
+	},
+
+	removeData: function( elem, name ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var isNode = elem.nodeType,
+			id = isNode ? elem[ jQuery.expando ] : elem,
+			cache = jQuery.cache,
+			thisCache = isNode ? cache[ id ] : id;
+
+		// If we want to remove a specific section of the element's data
+		if ( name ) {
+			if ( thisCache ) {
+				// Remove the section of cache data
+				delete thisCache[ name ];
+
+				// If we've removed all the data, remove the element's cache
+				if ( isNode && jQuery.isEmptyObject(thisCache) ) {
+					jQuery.removeData( elem );
+				}
+			}
+
+		// Otherwise, we want to remove all of the element's data
+		} else {
+			if ( isNode && jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
+
+			// Completely remove the data cache
+			} else if ( isNode ) {
+				delete cache[ id ];
+
+			// Remove all fields from the object
+			} else {
+				for ( var n in elem ) {
+					delete elem[ n ];
+				}
+			}
+		}
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
+		}
+
+		return true;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var data = null;
+
+		if ( typeof key === "undefined" ) {
+			if ( this.length ) {
+				var attr = this[0].attributes, name;
+				data = jQuery.data( this[0] );
+
+				for ( var i = 0, l = attr.length; i < l; i++ ) {
+					name = attr[i].name;
+
+					if ( name.indexOf( "data-" ) === 0 ) {
+						name = name.substr( 5 );
+						dataAttr( this[0], name, data[ name ] );
+					}
+				}
+			}
+
+			return data;
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		var parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			// Try to fetch any internally stored data first
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+				data = dataAttr( this[0], key, data );
+			}
+
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+
+		} else {
+			return this.each(function() {
+				var $this = jQuery( this ),
+					args = [ parts[0], value ];
+
+				$this.triggerHandler( "setData" + parts[1] + "!", args );
+				jQuery.data( this, key, value );
+				$this.triggerHandler( "changeData" + parts[1] + "!", args );
+			});
+		}
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		data = elem.getAttribute( "data-" + key );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				!jQuery.isNaN( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+
+
+
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		if ( !elem ) {
+			return;
+		}
+
+		type = (type || "fx") + "queue";
+		var q = jQuery.data( elem, type );
+
+		// Speed up dequeue by getting out quickly if this is just a lookup
+		if ( !data ) {
+			return q || [];
+		}
+
+		if ( !q || jQuery.isArray(data) ) {
+			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+
+		} else {
+			q.push( data );
+		}
+
+		return q;
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift();
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift("inprogress");
+			}
+
+			fn.call(elem, function() {
+				jQuery.dequeue(elem, type);
+			});
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined ) {
+			return jQuery.queue( this[0], type );
+		}
+		return this.each(function( i ) {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function() {
+			var elem = this;
+			setTimeout(function() {
+				jQuery.dequeue( elem, type );
+			}, time );
+		});
+	},
+
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	}
+});
+
+
+
+
+var rclass = /[\n\t]/g,
+	rspaces = /\s+/,
+	rreturn = /\r/g,
+	rspecialurl = /^(?:href|src|style)$/,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rradiocheck = /^(?:radio|checkbox)$/i;
+
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	colspan: "colSpan",
+	tabindex: "tabIndex",
+	usemap: "useMap",
+	frameborder: "frameBorder"
+};
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name, fn ) {
+		return this.each(function(){
+			jQuery.attr( this, name, "" );
+			if ( this.nodeType === 1 ) {
+				this.removeAttribute( name );
+			}
+		});
+	},
+
+	addClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.addClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className ) {
+						elem.className = value;
+
+					} else {
+						var className = " " + elem.className + " ",
+							setClass = elem.className;
+
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+								setClass += " " + classNames[c];
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.removeClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						var className = (" " + elem.className + " ").replace(rclass, " ");
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[c] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( rspaces );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery.data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ";
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		if ( !arguments.length ) {
+			var elem = this[0];
+
+			if ( elem ) {
+				if ( jQuery.nodeName( elem, "option" ) ) {
+					// attributes.value is undefined in Blackberry 4.7 but
+					// uses .value. See #6932
+					var val = elem.attributes.value;
+					return !val || val.specified ? elem.value : elem.text;
+				}
+
+				// We need to handle select boxes special
+				if ( jQuery.nodeName( elem, "select" ) ) {
+					var index = elem.selectedIndex,
+						values = [],
+						options = elem.options,
+						one = elem.type === "select-one";
+
+					// Nothing was selected
+					if ( index < 0 ) {
+						return null;
+					}
+
+					// Loop through all the selected options
+					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[ i ];
+
+						// Don't return options that are disabled or in a disabled optgroup
+						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && 
+								(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+							// Get the specific value for the option
+							value = jQuery(option).val();
+
+							// We don't need an array for one selects
+							if ( one ) {
+								return value;
+							}
+
+							// Multi-Selects return an array
+							values.push( value );
+						}
+					}
+
+					return values;
+				}
+
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+					return elem.getAttribute("value") === null ? "on" : elem.value;
+				}
+				
+
+				// Everything else, we just grab the value
+				return (elem.value || "").replace(rreturn, "");
+
+			}
+
+			return undefined;
+		}
+
+		var isFunction = jQuery.isFunction(value);
+
+		return this.each(function(i) {
+			var self = jQuery(this), val = value;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call(this, i, self.val());
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray(val) ) {
+				val = jQuery.map(val, function (value) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+				this.checked = jQuery.inArray( self.val(), val ) >= 0;
+
+			} else if ( jQuery.nodeName( this, "select" ) ) {
+				var values = jQuery.makeArray(val);
+
+				jQuery( "option", this ).each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					this.selectedIndex = -1;
+				}
+
+			} else {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+		
+	attr: function( elem, name, value, pass ) {
+		// don't set attributes on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return undefined;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery(elem)[name](value);
+		}
+
+		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+			// Whether we are setting (or getting)
+			set = value !== undefined;
+
+		// Try to normalize/fix the name
+		name = notxml && jQuery.props[ name ] || name;
+
+		// These attributes require special treatment
+		var special = rspecialurl.test( name );
+
+		// Safari mis-reports the default selected property of an option
+		// Accessing the parent's selectedIndex property fixes it
+		if ( name === "selected" && !jQuery.support.optSelected ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+
+		// If applicable, access the attribute via the DOM 0 way
+		// 'in' checks fail in Blackberry 4.7 #6931
+		if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
+			if ( set ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
+				}
+
+				if ( value === null ) {
+					if ( elem.nodeType === 1 ) {
+						elem.removeAttribute( name );
+					}
+
+				} else {
+					elem[ name ] = value;
+				}
+			}
+
+			// browsers index elements by id/name on forms, give priority to attributes.
+			if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
+				return elem.getAttributeNode( name ).nodeValue;
+			}
+
+			// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+			// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+			if ( name === "tabIndex" ) {
+				var attributeNode = elem.getAttributeNode( "tabIndex" );
+
+				return attributeNode && attributeNode.specified ?
+					attributeNode.value :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+
+			return elem[ name ];
+		}
+
+		if ( !jQuery.support.style && notxml && name === "style" ) {
+			if ( set ) {
+				elem.style.cssText = "" + value;
+			}
+
+			return elem.style.cssText;
+		}
+
+		if ( set ) {
+			// convert the value to a string (all browsers do this but IE) see #1070
+			elem.setAttribute( name, "" + value );
+		}
+
+		// Ensure that missing attributes return undefined
+		// Blackberry 4.7 returns "" from getAttribute #6938
+		if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
+			return undefined;
+		}
+
+		var attr = !jQuery.support.hrefNormalized && notxml && special ?
+				// Some attributes require a special call on IE
+				elem.getAttribute( name, 2 ) :
+				elem.getAttribute( name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return attr === null ? undefined : attr;
+	}
+});
+
+
+
+
+var rnamespaces = /\.(.*)$/,
+	rformElems = /^(?:textarea|input|select)$/i,
+	rperiod = /\./g,
+	rspace = / /g,
+	rescape = /[^\w\s.|`]/g,
+	fcleanup = function( nm ) {
+		return nm.replace(rescape, "\\$&");
+	},
+	focusCounts = { focusin: 0, focusout: 0 };
+
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function( elem, types, handler, data ) {
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// For whatever reason, IE has trouble passing the window object
+		// around, causing it to be cloned in the process
+		if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
+			elem = window;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		} else if ( !handler ) {
+			// Fixes bug #7229. Fix recommended by jdalton
+		  return;
+		}
+
+		var handleObjIn, handleObj;
+
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+		}
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure
+		var elemData = jQuery.data( elem );
+
+		// If no elemData is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !elemData ) {
+			return;
+		}
+
+		// Use a key less likely to result in collisions for plain JS objects.
+		// Fixes bug #7150.
+		var eventKey = elem.nodeType ? "events" : "__events__",
+			events = elemData[ eventKey ],
+			eventHandle = elemData.handle;
+			
+		if ( typeof events === "function" ) {
+			// On plain objects events is a fn that holds the the data
+			// which prevents this data from being JSON serialized
+			// the function does not need to be called, it just contains the data
+			eventHandle = events.handle;
+			events = events.events;
+
+		} else if ( !events ) {
+			if ( !elem.nodeType ) {
+				// On plain objects, create a fn that acts as the holder
+				// of the values to avoid JSON serialization of event data
+				elemData[ eventKey ] = elemData = function(){};
+			}
+
+			elemData.events = events = {};
+		}
+
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function() {
+				// Handle the second event of a trigger and when
+				// an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+		}
+
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native events in IE.
+		eventHandle.elem = elem;
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		var type, i = 0, namespaces;
+
+		while ( (type = types[ i++ ]) ) {
+			handleObj = handleObjIn ?
+				jQuery.extend({}, handleObjIn) :
+				{ handler: handler, data: data };
+
+			// Namespaced event handlers
+			if ( type.indexOf(".") > -1 ) {
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				handleObj.namespace = namespaces.slice(0).sort().join(".");
+
+			} else {
+				namespaces = [];
+				handleObj.namespace = "";
+			}
+
+			handleObj.type = type;
+			if ( !handleObj.guid ) {
+				handleObj.guid = handler.guid;
+			}
+
+			// Get the current list of functions bound to this event
+			var handlers = events[ type ],
+				special = jQuery.event.special[ type ] || {};
+
+			// Init the event handler queue
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+			
+			if ( special.add ) { 
+				special.add.call( elem, handleObj ); 
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add the function to the element's handler list
+			handlers.push( handleObj );
+
+			// Keep track of which events have been used, for global triggering
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, pos ) {
+		// don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		}
+
+		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			eventKey = elem.nodeType ? "events" : "__events__",
+			elemData = jQuery.data( elem ),
+			events = elemData && elemData[ eventKey ];
+
+		if ( !elemData || !events ) {
+			return;
+		}
+		
+		if ( typeof events === "function" ) {
+			elemData = events;
+			events = events.events;
+		}
+
+		// types is actually an event object here
+		if ( types && types.type ) {
+			handler = types.handler;
+			types = types.type;
+		}
+
+		// Unbind all events for the element
+		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+			types = types || "";
+
+			for ( type in events ) {
+				jQuery.event.remove( elem, type + types );
+			}
+
+			return;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).unbind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		while ( (type = types[ i++ ]) ) {
+			origType = type;
+			handleObj = null;
+			all = type.indexOf(".") < 0;
+			namespaces = [];
+
+			if ( !all ) {
+				// Namespaced event handlers
+				namespaces = type.split(".");
+				type = namespaces.shift();
+
+				namespace = new RegExp("(^|\\.)" + 
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
+			}
+
+			eventType = events[ type ];
+
+			if ( !eventType ) {
+				continue;
+			}
+
+			if ( !handler ) {
+				for ( j = 0; j < eventType.length; j++ ) {
+					handleObj = eventType[ j ];
+
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						jQuery.event.remove( elem, origType, handleObj.handler, j );
+						eventType.splice( j--, 1 );
+					}
+				}
+
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+
+			for ( j = pos || 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( handler.guid === handleObj.guid ) {
+					// remove the given handler for the given type
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						if ( pos == null ) {
+							eventType.splice( j--, 1 );
+						}
+
+						if ( special.remove ) {
+							special.remove.call( elem, handleObj );
+						}
+					}
+
+					if ( pos != null ) {
+						break;
+					}
+				}
+			}
+
+			// remove generic event handler if no more handlers exist
+			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				ret = null;
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			var handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			delete elemData.events;
+			delete elemData.handle;
+
+			if ( typeof elemData === "function" ) {
+				jQuery.removeData( elem, eventKey );
+
+			} else if ( jQuery.isEmptyObject( elemData ) ) {
+				jQuery.removeData( elem );
+			}
+		}
+	},
+
+	// bubbling is internal
+	trigger: function( event, data, elem /*, bubbling */ ) {
+		// Event object or event type
+		var type = event.type || event,
+			bubbling = arguments[3];
+
+		if ( !bubbling ) {
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[ jQuery.expando ] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
+
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
+
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+
+				// Only trigger if we've ever bound an event for it
+				if ( jQuery.event.global[ type ] ) {
+					jQuery.each( jQuery.cache, function() {
+						if ( this.events && this.events[type] ) {
+							jQuery.event.trigger( event, data, this.handle.elem );
+						}
+					});
+				}
+			}
+
+			// Handle triggering a single element
+
+			// don't do events on text and comment nodes
+			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+				return undefined;
+			}
+
+			// Clean up in case it is reused
+			event.result = undefined;
+			event.target = elem;
+
+			// Clone the incoming data, if any
+			data = jQuery.makeArray( data );
+			data.unshift( event );
+		}
+
+		event.currentTarget = elem;
+
+		// Trigger the event, it is assumed that "handle" is a function
+		var handle = elem.nodeType ?
+			jQuery.data( elem, "handle" ) :
+			(jQuery.data( elem, "__events__" ) || {}).handle;
+
+		if ( handle ) {
+			handle.apply( elem, data );
+		}
+
+		var parent = elem.parentNode || elem.ownerDocument;
+
+		// Trigger an inline bound script
+		try {
+			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
+					event.result = false;
+					event.preventDefault();
+				}
+			}
+
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (inlineError) {}
+
+		if ( !event.isPropagationStopped() && parent ) {
+			jQuery.event.trigger( event, data, parent, true );
+
+		} else if ( !event.isDefaultPrevented() ) {
+			var old,
+				target = event.target,
+				targetType = type.replace( rnamespaces, "" ),
+				isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
+				special = jQuery.event.special[ targetType ] || {};
+
+			if ( (!special._default || special._default.call( elem, event ) === false) && 
+				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+
+				try {
+					if ( target[ targetType ] ) {
+						// Make sure that we don't accidentally re-trigger the onFOO events
+						old = target[ "on" + targetType ];
+
+						if ( old ) {
+							target[ "on" + targetType ] = null;
+						}
+
+						jQuery.event.triggered = true;
+						target[ targetType ]();
+					}
+
+				// prevent IE from throwing an error for some elements with some event types, see #3533
+				} catch (triggerError) {}
+
+				if ( old ) {
+					target[ "on" + targetType ] = old;
+				}
+
+				jQuery.event.triggered = false;
+			}
+		}
+	},
+
+	handle: function( event ) {
+		var all, handlers, namespaces, namespace_re, events,
+			namespace_sort = [],
+			args = jQuery.makeArray( arguments );
+
+		event = args[0] = jQuery.event.fix( event || window.event );
+		event.currentTarget = this;
+
+		// Namespaced event handlers
+		all = event.type.indexOf(".") < 0 && !event.exclusive;
+
+		if ( !all ) {
+			namespaces = event.type.split(".");
+			event.type = namespaces.shift();
+			namespace_sort = namespaces.slice(0).sort();
+			namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");
+		}
+
+		event.namespace = event.namespace || namespace_sort.join(".");
+
+		events = jQuery.data(this, this.nodeType ? "events" : "__events__");
+
+		if ( typeof events === "function" ) {
+			events = events.events;
+		}
+
+		handlers = (events || {})[ event.type ];
+
+		if ( events && handlers ) {
+			// Clone the handlers to prevent manipulation
+			handlers = handlers.slice(0);
+
+			for ( var j = 0, l = handlers.length; j < l; j++ ) {
+				var handleObj = handlers[ j ];
+
+				// Filter the functions by class
+				if ( all || namespace_re.test( handleObj.namespace ) ) {
+					// Pass in a reference to the handler function itself
+					// So that we can later remove it
+					event.handler = handleObj.handler;
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+	
+					var ret = handleObj.handler.apply( this, args );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+
+					if ( event.isImmediatePropagationStopped() ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
+		var originalEvent = event;
+		event = jQuery.Event( originalEvent );
+
+		for ( var i = this.props.length, prop; i; ) {
+			prop = this.props[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary
+		if ( !event.target ) {
+			// Fixes #1925 where srcElement might not be defined either
+			event.target = event.srcElement || document;
+		}
+
+		// check if target is a textnode (safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement ) {
+			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+		}
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var doc = document.documentElement,
+				body = document.body;
+
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+		}
+
+		// Add which for key events
+		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
+			event.which = event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button !== undefined ) {
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+		}
+
+		return event;
+	},
+
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
+	proxy: jQuery.proxy,
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady,
+			teardown: jQuery.noop
+		},
+
+		live: {
+			add: function( handleObj ) {
+				jQuery.event.add( this,
+					liveConvert( handleObj.origType, handleObj.selector ),
+					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); 
+			},
+
+			remove: function( handleObj ) {
+				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
+			}
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} : 
+	function( elem, type, handle ) {
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
+	};
+
+jQuery.Event = function( src ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !this.preventDefault ) {
+		return new jQuery.Event( src );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+	// Check if mouse(over|out) are still within the same parent element
+	var parent = event.relatedTarget;
+
+	// Firefox sometimes assigns relatedTarget a XUL element
+	// which we cannot access the parentNode property of
+	try {
+		// Traverse up the tree
+		while ( parent && parent !== this ) {
+			parent = parent.parentNode;
+		}
+
+		if ( parent !== this ) {
+			// set the correct event type
+			event.type = event.data;
+
+			// handle event if we actually just moused on to a non sub-element
+			jQuery.event.handle.apply( this, arguments );
+		}
+
+	// assuming we've left the element since we most likely mousedover a xul element
+	} catch(e) { }
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+	event.type = event.data;
+	jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		setup: function( data ) {
+			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+		},
+		teardown: function( data ) {
+			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		}
+	};
+});
+
+// submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function( data, namespaces ) {
+			if ( this.nodeName.toLowerCase() !== "form" ) {
+				jQuery.event.add(this, "click.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+						e.liveFired = undefined;
+						return trigger( "submit", this, arguments );
+					}
+				});
+	 
+				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+						e.liveFired = undefined;
+						return trigger( "submit", this, arguments );
+					}
+				});
+
+			} else {
+				return false;
+			}
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialSubmit" );
+		}
+	};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+	var changeFilters,
+
+	getVal = function( elem ) {
+		var type = elem.type, val = elem.value;
+
+		if ( type === "radio" || type === "checkbox" ) {
+			val = elem.checked;
+
+		} else if ( type === "select-multiple" ) {
+			val = elem.selectedIndex > -1 ?
+				jQuery.map( elem.options, function( elem ) {
+					return elem.selected;
+				}).join("-") :
+				"";
+
+		} else if ( elem.nodeName.toLowerCase() === "select" ) {
+			val = elem.selectedIndex;
+		}
+
+		return val;
+	},
+
+	testChange = function testChange( e ) {
+		var elem = e.target, data, val;
+
+		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
+			return;
+		}
+
+		data = jQuery.data( elem, "_change_data" );
+		val = getVal(elem);
+
+		// the current data will be also retrieved by beforeactivate
+		if ( e.type !== "focusout" || elem.type !== "radio" ) {
+			jQuery.data( elem, "_change_data", val );
+		}
+		
+		if ( data === undefined || val === data ) {
+			return;
+		}
+
+		if ( data != null || val ) {
+			e.type = "change";
+			e.liveFired = undefined;
+			return jQuery.event.trigger( e, arguments[1], elem );
+		}
+	};
+
+	jQuery.event.special.change = {
+		filters: {
+			focusout: testChange, 
+
+			beforedeactivate: testChange,
+
+			click: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Change has to be called before submit
+			// Keydown will be called before keypress, which is used in submit-event delegation
+			keydown: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+					type === "select-multiple" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Beforeactivate happens also before the previous element is blurred
+			// with this event you can't trigger a change event, but you can store
+			// information
+			beforeactivate: function( e ) {
+				var elem = e.target;
+				jQuery.data( elem, "_change_data", getVal(elem) );
+			}
+		},
+
+		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
+				return false;
+			}
+
+			for ( var type in changeFilters ) {
+				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			}
+
+			return rformElems.test( this.nodeName );
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialChange" );
+
+			return rformElems.test( this.nodeName );
+		}
+	};
+
+	changeFilters = jQuery.event.special.change.filters;
+
+	// Handle when the input is .focus()'d
+	changeFilters.focus = changeFilters.beforeactivate;
+}
+
+function trigger( type, elem, args ) {
+	args[0].type = type;
+	return jQuery.event.handle.apply( elem, args );
+}
+
+// Create "bubbling" focus and blur events
+if ( document.addEventListener ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( focusCounts[fix]++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			}, 
+			teardown: function() { 
+				if ( --focusCounts[fix] === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+
+		function handler( e ) { 
+			e = jQuery.event.fix( e );
+			e.type = fix;
+			return jQuery.event.trigger( e, null, e.target );
+		}
+	});
+}
+
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this[ name ](key, data, type[key], fn);
+			}
+			return this;
+		}
+		
+		if ( jQuery.isFunction( data ) || data === false ) {
+			fn = data;
+			data = undefined;
+		}
+
+		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
+			jQuery( this ).unbind( event, handler );
+			return fn.apply( this, arguments );
+		}) : fn;
+
+		if ( type === "unload" && name !== "one" ) {
+			this.one( type, data, fn );
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.add( this[i], type, handler, data );
+			}
+		}
+
+		return this;
+	};
+});
+
+jQuery.fn.extend({
+	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.remove( this[i], type, fn );
+			}
+		}
+
+		return this;
+	},
+	
+	delegate: function( selector, types, data, fn ) {
+		return this.live( types, data, fn, selector );
+	},
+	
+	undelegate: function( selector, types, fn ) {
+		if ( arguments.length === 0 ) {
+				return this.unbind( "live" );
+		
+		} else {
+			return this.die( types, null, fn, selector );
+		}
+	},
+	
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			var event = jQuery.Event( type );
+			event.preventDefault();
+			event.stopPropagation();
+			jQuery.event.trigger( event, data, this[0] );
+			return event.result;
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			i = 1;
+
+		// link all the functions, so any of them can unbind this click handler
+		while ( i < args.length ) {
+			jQuery.proxy( fn, args[ i++ ] );
+		}
+
+		return this.click( jQuery.proxy( fn, function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		}));
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+var liveMap = {
+	focus: "focusin",
+	blur: "focusout",
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+};
+
+jQuery.each(["live", "die"], function( i, name ) {
+	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+		var type, i = 0, match, namespaces, preType,
+			selector = origSelector || this.selector,
+			context = origSelector ? this : jQuery( this.context );
+		
+		if ( typeof types === "object" && !types.preventDefault ) {
+			for ( var key in types ) {
+				context[ name ]( key, data, types[key], selector );
+			}
+			
+			return this;
+		}
+
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		types = (types || "").split(" ");
+
+		while ( (type = types[ i++ ]) != null ) {
+			match = rnamespaces.exec( type );
+			namespaces = "";
+
+			if ( match )  {
+				namespaces = match[0];
+				type = type.replace( rnamespaces, "" );
+			}
+
+			if ( type === "hover" ) {
+				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+				continue;
+			}
+
+			preType = type;
+
+			if ( type === "focus" || type === "blur" ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
+
+			if ( name === "live" ) {
+				// bind live handler
+				for ( var j = 0, l = context.length; j < l; j++ ) {
+					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
+						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+				}
+
+			} else {
+				// unbind live handler
+				context.unbind( "live." + liveConvert( type, selector ), fn );
+			}
+		}
+		
+		return this;
+	};
+});
+
+function liveHandler( event ) {
+	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+		elems = [],
+		selectors = [],
+		events = jQuery.data( this, this.nodeType ? "events" : "__events__" );
+
+	if ( typeof events === "function" ) {
+		events = events.events;
+	}
+
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
+	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
+		return;
+	}
+	
+	if ( event.namespace ) {
+		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
+	}
+
+	event.liveFired = this;
+
+	var live = events.live.slice(0);
+
+	for ( j = 0; j < live.length; j++ ) {
+		handleObj = live[j];
+
+		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+			selectors.push( handleObj.selector );
+
+		} else {
+			live.splice( j--, 1 );
+		}
+	}
+
+	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+	for ( i = 0, l = match.length; i < l; i++ ) {
+		close = match[i];
+
+		for ( j = 0; j < live.length; j++ ) {
+			handleObj = live[j];
+
+			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) {
+				elem = close.elem;
+				related = null;
+
+				// Those two events require additional checking
+				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					event.type = handleObj.preType;
+					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+				}
+
+				if ( !related || related !== elem ) {
+					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
+				}
+			}
+		}
+	}
+
+	for ( i = 0, l = elems.length; i < l; i++ ) {
+		match = elems[i];
+
+		if ( maxLevel && match.level > maxLevel ) {
+			break;
+		}
+
+		event.currentTarget = match.elem;
+		event.data = match.handleObj.data;
+		event.handleObj = match.handleObj;
+
+		ret = match.handleObj.origHandler.apply( match.elem, arguments );
+
+		if ( ret === false || event.isPropagationStopped() ) {
+			maxLevel = match.level;
+
+			if ( ret === false ) {
+				stop = false;
+			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
+		}
+	}
+
+	return stop;
+}
+
+function liveConvert( type, selector ) {
+	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&");
+}
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.bind( name, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+});
+
+// Prevent memory leaks in IE
+// Window isn't included so as not to unbind existing unload events
+// More info:
+//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
+if ( window.attachEvent && !window.addEventListener ) {
+	jQuery(window).bind("unload", function() {
+		for ( var id in jQuery.cache ) {
+			if ( jQuery.cache[ id ].handle ) {
+				// Try/Catch is to handle iframes being unloaded, see #4280
+				try {
+					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+				} catch(e) {}
+			}
+		}
+	});
+}
+
+
+/*!
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function() {
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
+		soFar = selector;
+	
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
+		
+			parts.push( m[1] );
+		
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray( set );
+
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function( results ) {
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort( sortOrder );
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
+};
+
+Sizzle.find = function( expr, context, isXML ) {
+	var set;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var match,
+			type = Expr.order[i];
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice( 1, 1 );
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context, isXML );
+
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName( "*" );
+	}
+
+	return { set: set, expr: expr };
+};
+
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var found, item,
+					filter = Expr.filter[ type ],
+					left = match[1];
+
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+
+								} else {
+									curLoop[i] = false;
+								}
+
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+
+	leftMatch: {},
+
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+
+	attrHandle: {
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		}
+	},
+
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test( part ),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !/\W/.test( part ) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+
+		"": function(checkSet, part, isXML){
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
+		},
+
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
+		}
+	},
+
+	find: {
+		ID: function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		},
+
+		NAME: function( match, context ) {
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [],
+					results = context.getElementsByName( match[1] );
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+
+		TAG: function( match, context ) {
+			return context.getElementsByTagName( match[1] );
+		}
+	},
+	preFilter: {
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+
+		ID: function( match ) {
+			return match[1].replace(/\\/g, "");
+		},
+
+		TAG: function( match, curLoop ) {
+			return match[1].toLowerCase();
+		},
+
+		CHILD: function( match ) {
+			if ( match[1] === "nth" ) {
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1].replace(/\\/g, "");
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+
+					return false;
+				}
+
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+
+		POS: function( match ) {
+			match.unshift( true );
+
+			return match;
+		}
+	},
+	
+	filters: {
+		enabled: function( elem ) {
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+
+		disabled: function( elem ) {
+			return elem.disabled === true;
+		},
+
+		checked: function( elem ) {
+			return elem.checked === true;
+		},
+		
+		selected: function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			elem.parentNode.selectedIndex;
+			
+			return elem.selected === true;
+		},
+
+		parent: function( elem ) {
+			return !!elem.firstChild;
+		},
+
+		empty: function( elem ) {
+			return !elem.firstChild;
+		},
+
+		has: function( elem, i, match ) {
+			return !!Sizzle( match[3], elem ).length;
+		},
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
+		},
+
+		text: function( elem ) {
+			return "text" === elem.type;
+		},
+		radio: function( elem ) {
+			return "radio" === elem.type;
+		},
+
+		checkbox: function( elem ) {
+			return "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return "file" === elem.type;
+		},
+		password: function( elem ) {
+			return "password" === elem.type;
+		},
+
+		submit: function( elem ) {
+			return "submit" === elem.type;
+		},
+
+		image: function( elem ) {
+			return "image" === elem.type;
+		},
+
+		reset: function( elem ) {
+			return "reset" === elem.type;
+		},
+
+		button: function( elem ) {
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
+		}
+	},
+	setFilters: {
+		first: function( elem, i ) {
+			return i === 0;
+		},
+
+		last: function( elem, i, match, array ) {
+			return i === array.length - 1;
+		},
+
+		even: function( elem, i ) {
+			return i % 2 === 0;
+		},
+
+		odd: function( elem, i ) {
+			return i % 2 === 1;
+		},
+
+		lt: function( elem, i, match ) {
+			return i < match[3] - 0;
+		},
+
+		gt: function( elem, i, match ) {
+			return i > match[3] - 0;
+		},
+
+		nth: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		},
+
+		eq: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+
+			} else {
+				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+			}
+		},
+
+		CHILD: function( elem, match ) {
+			var type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					if ( type === "first" ) { 
+						return true; 
+					}
+
+					node = elem;
+
+				case "last":
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					return true;
+
+				case "nth":
+					var first = match[2],
+						last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+
+					if ( first === 0 ) {
+						return diff === 0;
+
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+
+		ID: function( elem, match ) {
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		
+		CLASS: function( elem, match ) {
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+
+		ATTR: function( elem, match ) {
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function( array, results ) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder, siblingCheck;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+	};
+
+} else {
+	sortOrder = function( a, b ) {
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+		}
+
+		var cur = a.nextSibling;
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+Sizzle.getText = function( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += Sizzle.getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+
+		Expr.filter.ID = function( elem, match ) {
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+
+	// release memory in IE
+	root = form = null;
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
+		};
+	}
+
+	// release memory in IE
+	div = null;
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+	
+		Sizzle = function( query, context, extra, seed ) {
+			context = context || document;
+
+			// Make sure that attribute selectors are quoted
+			query = query.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && !Sizzle.isXML(context) ) {
+				if ( context.nodeType === 9 ) {
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var old = context.getAttribute( "id" ),
+						nid = old || id;
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					}
+
+					try {
+						return makeArray( context.querySelectorAll( "#" + nid + " " + query ), extra );
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							context.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		// release memory in IE
+		div = null;
+	})();
+}
+
+(function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
+		pseudoWorks = false;
+
+	try {
+		// This should fail with an exception
+		// Gecko does not error, returns false instead
+		matches.call( document.documentElement, "[test!='']:sizzle" );
+	
+	} catch( pseudoError ) {
+		pseudoWorks = true;
+	}
+
+	if ( matches ) {
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try { 
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						return matches.call( node, expr );
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function( match, context, isXML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	// release memory in IE
+	div = null;
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+			
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
+
+Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function( selector, context ) {
+	var match,
+		tmpSet = [],
+		later = "",
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})();
+
+
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.POS;
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var ret = this.pushStack( "", "find", selector ),
+			length = 0;
+
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( var n = length; n < ret.length; n++ ) {
+					for ( var r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+	
+	is: function( selector ) {
+		return !!selector && jQuery.filter( selector, this ).length > 0;
+	},
+
+	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+
+		if ( jQuery.isArray( selectors ) ) {
+			var match, selector,
+				matches = {},
+				level = 1;
+
+			if ( cur && selectors.length ) {
+				for ( i = 0, l = selectors.length; i < l; i++ ) {
+					selector = selectors[i];
+
+					if ( !matches[selector] ) {
+						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+							jQuery( selector, context || this.context ) :
+							selector;
+					}
+				}
+
+				while ( cur && cur.ownerDocument && cur !== context ) {
+					for ( selector in matches ) {
+						match = matches[selector];
+
+						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+							ret.push({ selector: selector, elem: cur, level: level });
+						}
+					}
+
+					cur = cur.parentNode;
+					level++;
+				}
+			}
+
+			return ret;
+		}
+
+		var pos = POS.test( selectors ) ? 
+			jQuery( selectors, context || this.context ) : null;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context ) {
+						break;
+					}
+				}
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+		
+		return this.pushStack( ret, "closest", selectors );
+	},
+	
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context || this.context ) :
+				jQuery.makeArray( selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+		
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, slice.call(arguments).join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+	
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+}
+
+
+
+
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	// checked="checked" or checked (html5)
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	raction = /\=([^="'>\s]+\/)>/g,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery( this );
+
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append(this);
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		return this.each(function() {
+			jQuery( this ).wrapAll( html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
+	},
+	
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					 elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+		
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+		
+		return this;
+	},
+
+	clone: function( events ) {
+		// Do the clone
+		var ret = this.map(function() {
+			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+				// IE copies events bound via attachEvent when
+				// using cloneNode. Calling detachEvent on the
+				// clone will also remove the events from the orignal
+				// In order to get around this, we use innerHTML.
+				// Unfortunately, this means some modifications to
+				// attributes in IE that are actually only stored
+				// as properties will not be copied (such as the
+				// the name attribute on an input).
+				var html = this.outerHTML,
+					ownerDocument = this.ownerDocument;
+
+				if ( !html ) {
+					var div = ownerDocument.createElement("div");
+					div.appendChild( this.cloneNode(true) );
+					html = div.innerHTML;
+				}
+
+				return jQuery.clean([html.replace(rinlinejQuery, "")
+					// Handle the case in IE 8 where action=/test/> self-closes a tag
+					.replace(raction, '="$1">')
+					.replace(rleadingWhitespace, "")], ownerDocument)[0];
+			} else {
+				return this.cloneNode(true);
+			}
+		});
+
+		// Copy the events from the original to the clone
+		if ( events === true ) {
+			cloneCopyEvent( this, ret );
+			cloneCopyEvent( this.find("*"), ret.find("*") );
+		}
+
+		// Return the cloned set
+		return ret;
+	},
+
+	html: function( value ) {
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnocache.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, "<$1></$2>");
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery( this );
+
+				self.html( value.call(this, i, self.html()) );
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = jQuery.buildFragment( args, this, scripts );
+			}
+			
+			fragment = results.fragment;
+			
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						i > 0 || results.cacheable || this.length > 1  ?
+							fragment.cloneNode(true) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, evalScript );
+			}
+		}
+
+		return this;
+	}
+});
+
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
+
+function cloneCopyEvent(orig, ret) {
+	var i = 0;
+
+	ret.each(function() {
+		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+			return;
+		}
+
+		var oldData = jQuery.data( orig[i++] ),
+			curData = jQuery.data( this, oldData ),
+			events = oldData && oldData.events;
+
+		if ( events ) {
+			delete curData.handle;
+			curData.events = {};
+
+			for ( var type in events ) {
+				for ( var handler in events[ type ] ) {
+					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+				}
+			}
+		}
+	});
+}
+
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults,
+		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+
+	// Only cache "small" (1/2 KB) strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+
+		cacheable = true;
+		cacheresults = jQuery.fragments[ args[0] ];
+		if ( cacheresults ) {
+			if ( cacheresults !== 1 ) {
+				fragment = cacheresults;
+			}
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [],
+			insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+		
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+			
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = (i > 0 ? this.clone(true) : this).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+		
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+jQuery.extend({
+	clean: function( elems, context, fragment, scripts ) {
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [];
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
+				// Fix "XHTML"-style tags in all browsers
+				elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+				// Trim whitespace, otherwise indexOf won't work as expected
+				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+					wrap = wrapMap[ tag ] || wrapMap._default,
+					depth = wrap[0],
+					div = context.createElement("div");
+
+				// Go to html and back, then peel off extra wrappers
+				div.innerHTML = wrap[1] + elem + wrap[2];
+
+				// Move to the right depth
+				while ( depth-- ) {
+					div = div.lastChild;
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !jQuery.support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					var hasBody = rtbody.test(elem),
+						tbody = tag === "table" && !hasBody ?
+							div.firstChild && div.firstChild.childNodes :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !hasBody ?
+								div.childNodes :
+								[];
+
+					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+							tbody[ j ].parentNode.removeChild( tbody[ j ] );
+						}
+					}
+
+				}
+
+				// IE completely kills leading whitespace when innerHTML is used
+				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+				}
+
+				elem = div.childNodes;
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			for ( i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+				
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+					}
+					fragment.appendChild( ret[i] );
+				}
+			}
+		}
+
+		return ret;
+	},
+	
+	cleanData: function( elems ) {
+		var data, id, cache = jQuery.cache,
+			special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+		
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
+			id = elem[ jQuery.expando ];
+			
+			if ( id ) {
+				data = cache[ id ];
+				
+				if ( data && data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						} else {
+							jQuery.removeEvent( elem, type, data.handle );
+						}
+					}
+				}
+				
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+				
+				delete cache[ id ];
+			}
+		}
+	}
+});
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	rdashAlpha = /-([a-z])/ig,
+	rupper = /([A-Z])/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+	curCSS,
+
+	getComputedStyle,
+	currentStyle,
+
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn.css = function( name, value ) {
+	// Setting 'undefined' is a no-op
+	if ( arguments.length === 2 && value === undefined ) {
+		return this;
+	}
+
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
+	});
+};
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity", "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"zIndex": true,
+		"fontWeight": true,
+		"opacity": true,
+		"zoom": true,
+		"lineHeight": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( typeof value === "number" && isNaN( value ) || value == null ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra ) {
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
+
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name, origName );
+		}
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	},
+
+	camelCase: function( string ) {
+		return string.replace( rdashAlpha, fcamelCase );
+	}
+});
+
+// DEPRECATED, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
+
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			var val;
+
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					val = getWH( elem, name, extra );
+
+				} else {
+					jQuery.swap( elem, cssShow, function() {
+						val = getWH( elem, name, extra );
+					});
+				}
+
+				if ( val <= 0 ) {
+					val = curCSS( elem, name, name );
+
+					if ( val === "0px" && currentStyle ) {
+						val = currentStyle( elem, name, name );
+					}
+
+					if ( val != null ) {
+						// Should return "auto" instead of 0, use 0 for
+						// temporary backwards-compat
+						return val === "" || val === "auto" ? "0px" : val;
+					}
+				}
+
+				if ( val < 0 || val == null ) {
+					val = elem.style[ name ];
+
+					// Should return "auto" instead of 0, use 0 for
+					// temporary backwards-compat
+					return val === "" || val === "auto" ? "0px" : val;
+				}
+
+				return typeof val === "string" ? val : val + "px";
+			}
+		},
+
+		set: function( elem, value ) {
+			if ( rnumpx.test( value ) ) {
+				// ignore negative width and height values #1599
+				value = parseFloat(value);
+
+				if ( value >= 0 ) {
+					return value + "px";
+				}
+
+			} else {
+				return value;
+			}
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
+				(parseFloat(RegExp.$1) / 100) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style;
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// Set the alpha filter to set the opacity
+			var opacity = jQuery.isNaN(value) ?
+				"" :
+				"alpha(opacity=" + value * 100 + ")",
+				filter = style.filter || "";
+
+			style.filter = ralpha.test(filter) ?
+				filter.replace(ralpha, opacity) :
+				style.filter + ' ' + opacity;
+		}
+	};
+}
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, newName, name ) {
+		var ret, defaultView, computedStyle;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
+
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+		}
+
+		return ret;
+	};
+}
+
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left, rsLeft,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			style = elem.style;
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			// Remember the original values
+			left = style.left;
+			rsLeft = elem.runtimeStyle.left;
+
+			// Put in the new values to get a computed value out
+			elem.runtimeStyle.left = elem.currentStyle.left;
+			style.left = name === "fontSize" ? "1em" : (ret || 0);
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			elem.runtimeStyle.left = rsLeft;
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWH( elem, name, extra ) {
+	var which = name === "width" ? cssWidth : cssHeight,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+	if ( extra === "border" ) {
+		return val;
+	}
+
+	jQuery.each( which, function() {
+		if ( !extra ) {
+			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
+		}
+
+		if ( extra === "margin" ) {
+			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
+
+		} else {
+			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
+		}
+	});
+
+	return val;
+}
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+
+
+
+var jsc = jQuery.now(),
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rbracket = /\[\]$/,
+	jsre = /\=\?(&|$)/,
+	rquery = /\?/,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+	r20 = /%20/g,
+	rhash = /#.*$/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load;
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf(" ");
+		if ( off >= 0 ) {
+			var selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = null;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			complete: function( res, status ) {
+				// If successful, inject the HTML into all the matched elements
+				if ( status === "success" || status === "notmodified" ) {
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(res.responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						res.responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [res.responseText, status, res] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param(this.serializeArray());
+	},
+
+	serializeArray: function() {
+		return this.map(function() {
+			return this.elements ? jQuery.makeArray(this.elements) : this;
+		})
+		.filter(function() {
+			return this.name && !this.disabled &&
+				(this.checked || rselectTextarea.test(this.nodeName) ||
+					rinput.test(this.type));
+		})
+		.map(function( i, elem ) {
+			var val = jQuery(this).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray(val) ?
+					jQuery.map( val, function( val, i ) {
+						return { name: elem.name, value: val };
+					}) :
+					{ name: elem.name, value: val };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
+	jQuery.fn[o] = function( f ) {
+		return this.bind(o, f);
+	};
+});
+
+jQuery.extend({
+	get: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = null;
+		}
+
+		return jQuery.ajax({
+			type: "GET",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get(url, null, callback, "script");
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get(url, data, callback, "json");
+	},
+
+	post: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = {};
+		}
+
+		return jQuery.ajax({
+			type: "POST",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	ajaxSetup: function( settings ) {
+		jQuery.extend( jQuery.ajaxSettings, settings );
+	},
+
+	ajaxSettings: {
+		url: location.href,
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		username: null,
+		password: null,
+		traditional: false,
+		*/
+		// This function can be overriden by calling jQuery.ajaxSetup
+		xhr: function() {
+			return new window.XMLHttpRequest();
+		},
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			script: "text/javascript, application/javascript",
+			json: "application/json, text/javascript",
+			text: "text/plain",
+			_default: "*/*"
+		}
+	},
+
+	ajax: function( origSettings ) {
+		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
+			jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
+
+		s.url = s.url.replace( rhash, "" );
+
+		// Use original (not extended) context object if it was provided
+		s.context = origSettings && origSettings.context != null ? origSettings.context : s;
+
+		// convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Handle JSONP Parameter Callbacks
+		if ( s.dataType === "jsonp" ) {
+			if ( type === "GET" ) {
+				if ( !jsre.test( s.url ) ) {
+					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+				}
+			} else if ( !s.data || !jsre.test(s.data) ) {
+				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+			}
+			s.dataType = "json";
+		}
+
+		// Build temporary JSONP function
+		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
+			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
+
+			// Replace the =? sequence both in the query string and the data
+			if ( s.data ) {
+				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+			}
+
+			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+
+			// We need to make sure
+			// that a JSONP style response is executed properly
+			s.dataType = "script";
+
+			// Handle JSONP-style loading
+			var customJsonp = window[ jsonp ];
+
+			window[ jsonp ] = function( tmp ) {
+				if ( jQuery.isFunction( customJsonp ) ) {
+					customJsonp( tmp );
+
+				} else {
+					// Garbage collect
+					window[ jsonp ] = undefined;
+
+					try {
+						delete window[ jsonp ];
+					} catch( jsonpError ) {}
+				}
+
+				data = tmp;
+				jQuery.handleSuccess( s, xhr, status, data );
+				jQuery.handleComplete( s, xhr, status, data );
+				
+				if ( head ) {
+					head.removeChild( script );
+				}
+			};
+		}
+
+		if ( s.dataType === "script" && s.cache === null ) {
+			s.cache = false;
+		}
+
+		if ( s.cache === false && noContent ) {
+			var ts = jQuery.now();
+
+			// try replacing _= if it is there
+			var ret = s.url.replace(rts, "$1_=" + ts);
+
+			// if nothing was replaced, add timestamp to the end
+			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
+		}
+
+		// If data is available, append data to url for GET/HEAD requests
+		if ( s.data && noContent ) {
+			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
+		}
+
+		// Watch for a new set of requests
+		if ( s.global && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// Matches an absolute URL, and saves the domain
+		var parts = rurl.exec( s.url ),
+			remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host);
+
+		// If we're requesting a remote document
+		// and trying to load JSON or Script with a GET
+		if ( s.dataType === "script" && type === "GET" && remote ) {
+			var head = document.getElementsByTagName("head")[0] || document.documentElement;
+			var script = document.createElement("script");
+			if ( s.scriptCharset ) {
+				script.charset = s.scriptCharset;
+			}
+			script.src = s.url;
+
+			// Handle Script loading
+			if ( !jsonp ) {
+				var done = false;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function() {
+					if ( !done && (!this.readyState ||
+							this.readyState === "loaded" || this.readyState === "complete") ) {
+						done = true;
+						jQuery.handleSuccess( s, xhr, status, data );
+						jQuery.handleComplete( s, xhr, status, data );
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+					}
+				};
+			}
+
+			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709 and #4378).
+			head.insertBefore( script, head.firstChild );
+
+			// We handle everything using the script element injection
+			return undefined;
+		}
+
+		var requestDone = false;
+
+		// Create the request object
+		var xhr = s.xhr();
+
+		if ( !xhr ) {
+			return;
+		}
+
+		// Open the socket
+		// Passing null username, generates a login popup on Opera (#2865)
+		if ( s.username ) {
+			xhr.open(type, s.url, s.async, s.username, s.password);
+		} else {
+			xhr.open(type, s.url, s.async);
+		}
+
+		// Need an extra try/catch for cross domain requests in Firefox 3
+		try {
+			// Set content-type if data specified and content-body is valid for this type
+			if ( (s.data != null && !noContent) || (origSettings && origSettings.contentType) ) {
+				xhr.setRequestHeader("Content-Type", s.contentType);
+			}
+
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if ( s.ifModified ) {
+				if ( jQuery.lastModified[s.url] ) {
+					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+				}
+
+				if ( jQuery.etag[s.url] ) {
+					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
+				}
+			}
+
+			// Set header so the called script knows that it's an XMLHttpRequest
+			// Only send the header if it's not a remote XHR
+			if ( !remote ) {
+				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+			}
+
+			// Set the Accepts header for the server, depending on the dataType
+			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+				s.accepts[ s.dataType ] + ", */*; q=0.01" :
+				s.accepts._default );
+		} catch( headerError ) {}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) {
+			// Handle the global AJAX counter
+			if ( s.global && jQuery.active-- === 1 ) {
+				jQuery.event.trigger( "ajaxStop" );
+			}
+
+			// close opended socket
+			xhr.abort();
+			return false;
+		}
+
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxSend", [xhr, s] );
+		}
+
+		// Wait for a response to come back
+		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
+			// The request was aborted
+			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
+				// Opera doesn't call onreadystatechange before this point
+				// so we simulate the call
+				if ( !requestDone ) {
+					jQuery.handleComplete( s, xhr, status, data );
+				}
+
+				requestDone = true;
+				if ( xhr ) {
+					xhr.onreadystatechange = jQuery.noop;
+				}
+
+			// The transfer is complete and the data is available, or the request timed out
+			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
+				requestDone = true;
+				xhr.onreadystatechange = jQuery.noop;
+
+				status = isTimeout === "timeout" ?
+					"timeout" :
+					!jQuery.httpSuccess( xhr ) ?
+						"error" :
+						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
+							"notmodified" :
+							"success";
+
+				var errMsg;
+
+				if ( status === "success" ) {
+					// Watch for, and catch, XML document parse errors
+					try {
+						// process the data (runs the xml through httpData regardless of callback)
+						data = jQuery.httpData( xhr, s.dataType, s );
+					} catch( parserError ) {
+						status = "parsererror";
+						errMsg = parserError;
+					}
+				}
+
+				// Make sure that the request was successful or notmodified
+				if ( status === "success" || status === "notmodified" ) {
+					// JSONP handles its own success callback
+					if ( !jsonp ) {
+						jQuery.handleSuccess( s, xhr, status, data );
+					}
+				} else {
+					jQuery.handleError( s, xhr, status, errMsg );
+				}
+
+				// Fire the complete handlers
+				if ( !jsonp ) {
+					jQuery.handleComplete( s, xhr, status, data );
+				}
+
+				if ( isTimeout === "timeout" ) {
+					xhr.abort();
+				}
+
+				// Stop memory leaks
+				if ( s.async ) {
+					xhr = null;
+				}
+			}
+		};
+
+		// Override the abort handler, if we can (IE 6 doesn't allow it, but that's OK)
+		// Opera doesn't fire onreadystatechange at all on abort
+		try {
+			var oldAbort = xhr.abort;
+			xhr.abort = function() {
+				if ( xhr ) {
+					// oldAbort has no call property in IE7 so
+					// just do it this way, which works in all
+					// browsers
+					Function.prototype.call.call( oldAbort, xhr );
+				}
+
+				onreadystatechange( "abort" );
+			};
+		} catch( abortError ) {}
+
+		// Timeout checker
+		if ( s.async && s.timeout > 0 ) {
+			setTimeout(function() {
+				// Check to see if the request is still happening
+				if ( xhr && !requestDone ) {
+					onreadystatechange( "timeout" );
+				}
+			}, s.timeout);
+		}
+
+		// Send the data
+		try {
+			xhr.send( noContent || s.data == null ? null : s.data );
+
+		} catch( sendError ) {
+			jQuery.handleError( s, xhr, null, sendError );
+
+			// Fire the complete handlers
+			jQuery.handleComplete( s, xhr, status, data );
+		}
+
+		// firefox 1.5 doesn't fire statechange for sync requests
+		if ( !s.async ) {
+			onreadystatechange();
+		}
+
+		// return XMLHttpRequest to allow aborting the request etc.
+		return xhr;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction(value) ? value() : value;
+				s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+			};
+		
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+		
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray(a) || a.jquery ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			});
+			
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[prefix], traditional, add );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join("&").replace(r20, "+");
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray(obj) && obj.length ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+			
+	} else if ( !traditional && obj != null && typeof obj === "object" ) {
+		if ( jQuery.isEmptyObject( obj ) ) {
+			add( prefix, "" );
+
+		// Serialize object item.
+		} else {
+			jQuery.each( obj, function( k, v ) {
+				buildParams( prefix + "[" + k + "]", v, traditional, add );
+			});
+		}
+					
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	handleError: function( s, xhr, status, e ) {
+		// If a local callback was specified, fire it
+		if ( s.error ) {
+			s.error.call( s.context, xhr, status, e );
+		}
+
+		// Fire the global callback
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxError", [xhr, s, e] );
+		}
+	},
+
+	handleSuccess: function( s, xhr, status, data ) {
+		// If a local callback was specified, fire it and pass it the data
+		if ( s.success ) {
+			s.success.call( s.context, data, status, xhr );
+		}
+
+		// Fire the global callback
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxSuccess", [xhr, s] );
+		}
+	},
+
+	handleComplete: function( s, xhr, status ) {
+		// Process result
+		if ( s.complete ) {
+			s.complete.call( s.context, xhr, status );
+		}
+
+		// The request was completed
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxComplete", [xhr, s] );
+		}
+
+		// Handle the global AJAX counter
+		if ( s.global && jQuery.active-- === 1 ) {
+			jQuery.event.trigger( "ajaxStop" );
+		}
+	},
+		
+	triggerGlobal: function( s, type, args ) {
+		(s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args);
+	},
+
+	// Determines if an XMLHttpRequest was successful or not
+	httpSuccess: function( xhr ) {
+		try {
+			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+			return !xhr.status && location.protocol === "file:" ||
+				xhr.status >= 200 && xhr.status < 300 ||
+				xhr.status === 304 || xhr.status === 1223;
+		} catch(e) {}
+
+		return false;
+	},
+
+	// Determines if an XMLHttpRequest returns NotModified
+	httpNotModified: function( xhr, url ) {
+		var lastModified = xhr.getResponseHeader("Last-Modified"),
+			etag = xhr.getResponseHeader("Etag");
+
+		if ( lastModified ) {
+			jQuery.lastModified[url] = lastModified;
+		}
+
+		if ( etag ) {
+			jQuery.etag[url] = etag;
+		}
+
+		return xhr.status === 304;
+	},
+
+	httpData: function( xhr, type, s ) {
+		var ct = xhr.getResponseHeader("content-type") || "",
+			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
+			data = xml ? xhr.responseXML : xhr.responseText;
+
+		if ( xml && data.documentElement.nodeName === "parsererror" ) {
+			jQuery.error( "parsererror" );
+		}
+
+		// Allow a pre-filtering function to sanitize the response
+		// s is checked to keep backwards compatibility
+		if ( s && s.dataFilter ) {
+			data = s.dataFilter( data, type );
+		}
+
+		// The filter can actually parse the response
+		if ( typeof data === "string" ) {
+			// Get the JavaScript object, if JSON is used.
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+				data = jQuery.parseJSON( data );
+
+			// If the type is "script", eval it in global context
+			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+				jQuery.globalEval( data );
+			}
+		}
+
+		return data;
+	}
+
+});
+
+/*
+ * Create the request object; Microsoft failed to properly
+ * implement the XMLHttpRequest in IE7 (can't request local files),
+ * so we use the ActiveXObject when it is available
+ * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+ * we need a fallback.
+ */
+if ( window.ActiveXObject ) {
+	jQuery.ajaxSettings.xhr = function() {
+		if ( window.location.protocol !== "file:" ) {
+			try {
+				return new window.XMLHttpRequest();
+			} catch(xhrError) {}
+		}
+
+		try {
+			return new window.ActiveXObject("Microsoft.XMLHTTP");
+		} catch(activeError) {}
+	};
+}
+
+// Does this browser support XHR requests?
+jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
+
+
+
+
+var elemdisplay = {},
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	];
+
+jQuery.fn.extend({
+	show: function( speed, easing, callback ) {
+		var elem, display;
+
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				// Reset the inline display of this element to learn if it is
+				// being hidden by cascaded rules or not
+				if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
+					display = elem.style.display = "";
+				}
+
+				// Set elements which have been overridden with display: none
+				// in a stylesheet to whatever the default browser style is
+				// for such an element
+				if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+					jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+				}
+			}
+
+			// Set the display of most of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				if ( display === "" || display === "none" ) {
+					elem.style.display = jQuery.data(elem, "olddisplay") || "";
+				}
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, easing, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				var display = jQuery.css( this[i], "display" );
+
+				if ( display !== "none" ) {
+					jQuery.data( this[i], "olddisplay", display );
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				this[i].style.display = "none";
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2, callback ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, easing, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, easing, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed(speed, easing, callback);
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete );
+		}
+
+		return this[ optall.queue === false ? "each" : "queue" ](function() {
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			var opt = jQuery.extend({}, optall), p,
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				self = this;
+
+			for ( p in prop ) {
+				var name = jQuery.camelCase( p );
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
+				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
+					return opt.complete.call(this);
+				}
+
+				if ( isElement && ( p === "height" || p === "width" ) ) {
+					// Make sure that nothing sneaks out
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height
+					// animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+						if ( !jQuery.support.inlineBlockNeedsLayout ) {
+							this.style.display = "inline-block";
+
+						} else {
+							var display = defaultDisplay(this.nodeName);
+
+							// inline-level elements accept inline-block;
+							// block-level elements need to be inline with layout
+							if ( display === "inline" ) {
+								this.style.display = "inline-block";
+
+							} else {
+								this.style.display = "inline";
+								this.style.zoom = 1;
+							}
+						}
+					}
+				}
+
+				if ( jQuery.isArray( prop[p] ) ) {
+					// Create (if needed) and add to specialEasing
+					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+					prop[p] = prop[p][0];
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			opt.curAnim = jQuery.extend({}, prop);
+
+			jQuery.each( prop, function( name, val ) {
+				var e = new jQuery.fx( self, opt, name );
+
+				if ( rfxtypes.test(val) ) {
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
+				} else {
+					var parts = rfxnum.exec(val),
+						start = e.cur() || 0;
+
+					if ( parts ) {
+						var end = parseFloat( parts[2] ),
+							unit = parts[3] || "px";
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							jQuery.style( self, name, (end || 1) + unit);
+							start = ((end || 1) / e.cur()) * start;
+							jQuery.style( self, name, start + unit);
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			});
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+
+	stop: function( clearQueue, gotoEnd ) {
+		var timers = jQuery.timers;
+
+		if ( clearQueue ) {
+			this.queue([]);
+		}
+
+		this.each(function() {
+			// go in reverse order so anything added to the queue during the loop is ignored
+			for ( var i = timers.length - 1; i >= 0; i-- ) {
+				if ( timers[i].elem === this ) {
+					if (gotoEnd) {
+						// force the next step to be the last
+						timers[i](true);
+					}
+
+					timers.splice(i, 1);
+				}
+			}
+		});
+
+		// start the next in the queue if the last step wasn't forced
+		if ( !gotoEnd ) {
+			this.dequeue();
+		}
+
+		return this;
+	}
+
+});
+
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
+
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function() {
+			if ( opt.queue !== false ) {
+				jQuery(this).dequeue();
+			}
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		if ( !options.orig ) {
+			options.orig = {};
+		}
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+	},
+
+	// Get the current size
+	cur: function() {
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var r = parseFloat( jQuery.css( this.elem, this.prop ) );
+		return r && r > -10000 ? r : 0;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx;
+
+		this.startTime = jQuery.now();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || "px";
+		this.now = this.start;
+		this.pos = this.state = 0;
+
+		function t( gotoEnd ) {
+			return self.step(gotoEnd);
+		}
+
+		t.elem = this.elem;
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval(fx.tick, fx.interval);
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var t = jQuery.now(), done = true;
+
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			this.options.curAnim[ this.prop ] = true;
+
+			for ( var i in this.options.curAnim ) {
+				if ( this.options.curAnim[i] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				// Reset the overflow
+				if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+					var elem = this.elem,
+						options = this.options;
+
+					jQuery.each( [ "", "X", "Y" ], function (index, value) {
+						elem.style[ "overflow" + value ] = options.overflow[index];
+					} );
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( this.options.hide ) {
+					jQuery(this.elem).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( this.options.hide || this.options.show ) {
+					for ( var p in this.options.curAnim ) {
+						jQuery.style( this.elem, p, this.options.orig[p] );
+					}
+				}
+
+				// Execute the complete function
+				this.options.complete.call( this.elem );
+			}
+
+			return false;
+
+		} else {
+			var n = t - this.startTime;
+			this.state = n / this.options.duration;
+
+			// Perform the easing function, defaults to swing
+			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
+			this.now = this.start + ((this.end - this.start) * this.pos);
+
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timers = jQuery.timers;
+
+		for ( var i = 0; i < timers.length; i++ ) {
+			if ( !timers[i]() ) {
+				timers.splice(i--, 1);
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+
+	interval: 13,
+
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+
+	speeds: {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style( fx.elem, "opacity", fx.now );
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+function defaultDisplay( nodeName ) {
+	if ( !elemdisplay[ nodeName ] ) {
+		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
+			display = elem.css("display");
+
+		elem.remove();
+
+		if ( display === "none" || display === "" ) {
+			display = "block";
+		}
+
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
+
+
+
+var rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0], box;
+
+		if ( options ) { 
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		var doc = elem.ownerDocument,
+			docElem = doc.documentElement;
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box || { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow(doc),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ),
+			scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft),
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) { 
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		jQuery.offset.initialize();
+
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.offset = {
+	initialize: function() {
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
+			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+
+		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+		container.innerHTML = html;
+		body.insertBefore( container, body.firstChild );
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		checkDiv.style.position = "fixed";
+		checkDiv.style.top = "20px";
+
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = "";
+
+		innerDiv.style.overflow = "hidden";
+		innerDiv.style.position = "relative";
+
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+		body.removeChild( container );
+		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = jQuery.noop;
+	},
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+	
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is absolute
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+		}
+
+		// curTop  = calculatePosition ? curPosition.top  : parseInt( curCSSTop,  10 ) || 0;
+		// curLeft = calculatePosition ? curPosition.left : parseInt( curCSSLeft, 10 ) || 0;
+		curTop  = calculatePosition ? curPosition.top  : parseFloat( curCSSTop ) || 0;
+		curLeft = calculatePosition ? curPosition.left : parseFloat( curCSSLeft ) || 0;
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if (options.top != null) {
+			props.top = (options.top - curOffset.top) + curTop;
+		}
+		if (options.left != null) {
+			props.left = (options.left - curOffset.left) + curLeft;
+		}
+		
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function(val) {
+		var elem = this[0], win;
+		
+		if ( !elem ) {
+			return null;
+		}
+
+		if ( val !== undefined ) {
+			// Set the scroll offset
+			return this.each(function() {
+				win = getWindow( this );
+
+				if ( win ) {
+					win.scrollTo(
+						!i ? val : jQuery(win).scrollLeft(),
+						 i ? val : jQuery(win).scrollTop()
+					);
+
+				} else {
+					this[ method ] = val;
+				}
+			});
+		} else {
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+
+
+
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function() {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, "padding" ) ) :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function( margin ) {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+		
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		if ( jQuery.isWindow( elem ) ) {
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
+				elem.document.body[ "client" + name ];
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNaN( ret ) ? orig : ret;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
+	};
+
+});
+
+
+})(window);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-1.5.1.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,8316 @@
+/*!
+ * jQuery JavaScript Library v1.5.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Feb 23 13:55:29 2011 -0500
+ */
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Check for digits
+	rdigit = /\d/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+
+	// Has the ready events already been bound?
+	readyBound = false,
+
+	// The deferred used on DOM ready
+	readyList,
+
+	// Promise methods
+	promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context && document.body ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = "body";
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			match = quickExpr.exec( selector );
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+					doc = (context ? context.ownerDocument || context : document);
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
+					}
+
+					return jQuery.merge( this, selector );
+
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return (context || rootjQuery).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if (selector.selector !== undefined) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.5.1",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = this.constructor();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// Add the callback
+		readyList.done( fn );
+
+		return this;
+	},
+
+	eq: function( i ) {
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, +i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		window.$ = _$;
+
+		if ( deep ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+		// A third-party is pushing the ready event forwards
+		if ( wait === true ) {
+			jQuery.readyWait--;
+		}
+
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 1 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
+			}
+
+			// If there are functions bound, to execute
+			readyList.resolveWith( document, [ jQuery ] );
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).unbind( "ready" );
+			}
+		}
+	},
+
+	bindReady: function() {
+		if ( readyBound ) {
+			return;
+		}
+
+		readyBound = true;
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent("onreadystatechange", DOMContentLoaded);
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	// A crude way of determining if an object is a window
+	isWindow: function( obj ) {
+		return obj && typeof obj === "object" && "setInterval" in obj;
+	},
+
+	isNaN: function( obj ) {
+		return obj == null || !rdigit.test( obj ) || isNaN( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		// Not own constructor property must be Object
+		if ( obj.constructor &&
+			!hasOwn.call(obj, "constructor") &&
+			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			return false;
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+
+		var key;
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw msg;
+	},
+
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test(data.replace(rvalidescape, "@")
+			.replace(rvalidtokens, "]")
+			.replace(rvalidbraces, "")) ) {
+
+			// Try to use the native JSON parser first
+			return window.JSON && window.JSON.parse ?
+				window.JSON.parse( data ) :
+				(new Function("return " + data))();
+
+		} else {
+			jQuery.error( "Invalid JSON: " + data );
+		}
+	},
+
+	// Cross-browser xml parsing
+	// (xml & tmp used internally)
+	parseXML: function( data , xml , tmp ) {
+
+		if ( window.DOMParser ) { // Standard
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data , "text/xml" );
+		} else { // IE
+			xml = new ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+
+		tmp = xml.documentElement;
+
+		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evalulates a script in a global context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test(data) ) {
+			// Inspired by code by Andrea Giammarchi
+			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+			var head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement,
+				script = document.createElement( "script" );
+
+			if ( jQuery.support.scriptEval() ) {
+				script.appendChild( document.createTextNode( data ) );
+			} else {
+				script.text = data;
+			}
+
+			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
+			head.removeChild( script );
+		}
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction(object);
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( var value = object[0];
+					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+			}
+		}
+
+		return object;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type(array);
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array ) {
+		if ( array.indexOf ) {
+			return array.indexOf( elem );
+		}
+
+		for ( var i = 0, length = array.length; i < length; i++ ) {
+			if ( array[ i ] === elem ) {
+				return i;
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length,
+			j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [], retVal;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var ret = [], value;
+
+		// Go through the array, translating each of the items to their
+		// new value (or values).
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			value = callback( elems[ i ], i, arg );
+
+			if ( value != null ) {
+				ret[ ret.length ] = value;
+			}
+		}
+
+		// Flatten any nested arrays
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	proxy: function( fn, proxy, thisObject ) {
+		if ( arguments.length === 2 ) {
+			if ( typeof proxy === "string" ) {
+				thisObject = fn;
+				fn = thisObject[ proxy ];
+				proxy = undefined;
+
+			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
+				thisObject = proxy;
+				proxy = undefined;
+			}
+		}
+
+		if ( !proxy && fn ) {
+			proxy = function() {
+				return fn.apply( thisObject || this, arguments );
+			};
+		}
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		if ( fn ) {
+			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+		}
+
+		// So proxy can be declared as an argument
+		return proxy;
+	},
+
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can be optionally by executed if its a function
+	access: function( elems, key, value, exec, fn, pass ) {
+		var length = elems.length;
+
+		// Setting many attributes
+		if ( typeof key === "object" ) {
+			for ( var k in key ) {
+				jQuery.access( elems, k, key[k], exec, fn, value );
+			}
+			return elems;
+		}
+
+		// Setting one attribute
+		if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = !pass && exec && jQuery.isFunction(value);
+
+			for ( var i = 0; i < length; i++ ) {
+				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+			}
+
+			return elems;
+		}
+
+		// Getting an attribute
+		return length ? fn( elems[0], key ) : undefined;
+	},
+
+	now: function() {
+		return (new Date()).getTime();
+	},
+
+	// Create a simple deferred (one callbacks list)
+	_Deferred: function() {
+		var // callbacks list
+			callbacks = [],
+			// stored [ context , args ]
+			fired,
+			// to avoid firing when already doing so
+			firing,
+			// flag to know if the deferred has been cancelled
+			cancelled,
+			// the deferred itself
+			deferred  = {
+
+				// done( f1, f2, ...)
+				done: function() {
+					if ( !cancelled ) {
+						var args = arguments,
+							i,
+							length,
+							elem,
+							type,
+							_fired;
+						if ( fired ) {
+							_fired = fired;
+							fired = 0;
+						}
+						for ( i = 0, length = args.length; i < length; i++ ) {
+							elem = args[ i ];
+							type = jQuery.type( elem );
+							if ( type === "array" ) {
+								deferred.done.apply( deferred, elem );
+							} else if ( type === "function" ) {
+								callbacks.push( elem );
+							}
+						}
+						if ( _fired ) {
+							deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] );
+						}
+					}
+					return this;
+				},
+
+				// resolve with given context and args
+				resolveWith: function( context, args ) {
+					if ( !cancelled && !fired && !firing ) {
+						firing = 1;
+						try {
+							while( callbacks[ 0 ] ) {
+								callbacks.shift().apply( context, args );
+							}
+						}
+						// We have to add a catch block for
+						// IE prior to 8 or else the finally
+						// block will never get executed
+						catch (e) {
+							throw e;
+						}
+						finally {
+							fired = [ context, args ];
+							firing = 0;
+						}
+					}
+					return this;
+				},
+
+				// resolve with this as context and given arguments
+				resolve: function() {
+					deferred.resolveWith( jQuery.isFunction( this.promise ) ? this.promise() : this, arguments );
+					return this;
+				},
+
+				// Has this deferred been resolved?
+				isResolved: function() {
+					return !!( firing || fired );
+				},
+
+				// Cancel
+				cancel: function() {
+					cancelled = 1;
+					callbacks = [];
+					return this;
+				}
+			};
+
+		return deferred;
+	},
+
+	// Full fledged deferred (two callbacks list)
+	Deferred: function( func ) {
+		var deferred = jQuery._Deferred(),
+			failDeferred = jQuery._Deferred(),
+			promise;
+		// Add errorDeferred methods, then and promise
+		jQuery.extend( deferred, {
+			then: function( doneCallbacks, failCallbacks ) {
+				deferred.done( doneCallbacks ).fail( failCallbacks );
+				return this;
+			},
+			fail: failDeferred.done,
+			rejectWith: failDeferred.resolveWith,
+			reject: failDeferred.resolve,
+			isRejected: failDeferred.isResolved,
+			// Get a promise for this deferred
+			// If obj is provided, the promise aspect is added to the object
+			promise: function( obj ) {
+				if ( obj == null ) {
+					if ( promise ) {
+						return promise;
+					}
+					promise = obj = {};
+				}
+				var i = promiseMethods.length;
+				while( i-- ) {
+					obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ];
+				}
+				return obj;
+			}
+		} );
+		// Make sure only one callback list will be used
+		deferred.done( failDeferred.cancel ).fail( deferred.cancel );
+		// Unexpose cancel
+		delete deferred.cancel;
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( object ) {
+		var lastIndex = arguments.length,
+			deferred = lastIndex <= 1 && object && jQuery.isFunction( object.promise ) ?
+				object :
+				jQuery.Deferred(),
+			promise = deferred.promise();
+
+		if ( lastIndex > 1 ) {
+			var array = slice.call( arguments, 0 ),
+				count = lastIndex,
+				iCallback = function( index ) {
+					return function( value ) {
+						array[ index ] = arguments.length > 1 ? slice.call( arguments, 0 ) : value;
+						if ( !( --count ) ) {
+							deferred.resolveWith( promise, array );
+						}
+					};
+				};
+			while( ( lastIndex-- ) ) {
+				object = array[ lastIndex ];
+				if ( object && jQuery.isFunction( object.promise ) ) {
+					object.promise().then( iCallback(lastIndex), deferred.reject );
+				} else {
+					--count;
+				}
+			}
+			if ( !count ) {
+				deferred.resolveWith( promise, array );
+			}
+		} else if ( deferred !== object ) {
+			deferred.resolve( object );
+		}
+		return promise;
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	sub: function() {
+		function jQuerySubclass( selector, context ) {
+			return new jQuerySubclass.fn.init( selector, context );
+		}
+		jQuery.extend( true, jQuerySubclass, this );
+		jQuerySubclass.superclass = this;
+		jQuerySubclass.fn = jQuerySubclass.prototype = this();
+		jQuerySubclass.fn.constructor = jQuerySubclass;
+		jQuerySubclass.subclass = this.subclass;
+		jQuerySubclass.fn.init = function init( selector, context ) {
+			if ( context && context instanceof jQuery && !(context instanceof jQuerySubclass) ) {
+				context = jQuerySubclass(context);
+			}
+
+			return jQuery.fn.init.call( this, selector, context, rootjQuerySubclass );
+		};
+		jQuerySubclass.fn.init.prototype = jQuerySubclass.fn;
+		var rootjQuerySubclass = jQuerySubclass(document);
+		return jQuerySubclass;
+	},
+
+	browser: {}
+});
+
+// Create readyList deferred
+readyList = jQuery._Deferred();
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+if ( indexOf ) {
+	jQuery.inArray = function( elem, array ) {
+		return indexOf.call( array, elem );
+	};
+}
+
+// IE doesn't match non-breaking spaces with \s
+if ( rnotwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch(e) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+// Expose jQuery to the global object
+return jQuery;
+
+})();
+
+
+(function() {
+
+	jQuery.support = {};
+
+	var div = document.createElement("div");
+
+	div.style.display = "none";
+	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	var all = div.getElementsByTagName("*"),
+		a = div.getElementsByTagName("a")[0],
+		select = document.createElement("select"),
+		opt = select.appendChild( document.createElement("option") ),
+		input = div.getElementsByTagName("input")[0];
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return;
+	}
+
+	jQuery.support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: div.firstChild.nodeType === 3,
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText insted)
+		style: /red/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: a.getAttribute("href") === "/a",
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55$/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: input.value === "on",
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Will be defined later
+		deleteExpando: true,
+		optDisabled: false,
+		checkClone: false,
+		noCloneEvent: true,
+		noCloneChecked: true,
+		boxModel: null,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableHiddenOffsets: true
+	};
+
+	input.checked = true;
+	jQuery.support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as diabled)
+	select.disabled = true;
+	jQuery.support.optDisabled = !opt.disabled;
+
+	var _scriptEval = null;
+	jQuery.support.scriptEval = function() {
+		if ( _scriptEval === null ) {
+			var root = document.documentElement,
+				script = document.createElement("script"),
+				id = "script" + jQuery.now();
+
+			try {
+				script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+			} catch(e) {}
+
+			root.insertBefore( script, root.firstChild );
+
+			// Make sure that the execution of code works by injecting a script
+			// tag with appendChild/createTextNode
+			// (IE doesn't support this, fails, and uses .text instead)
+			if ( window[ id ] ) {
+				_scriptEval = true;
+				delete window[ id ];
+			} else {
+				_scriptEval = false;
+			}
+
+			root.removeChild( script );
+			// release memory in IE
+			root = script = id  = null;
+		}
+
+		return _scriptEval;
+	};
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete div.test;
+
+	} catch(e) {
+		jQuery.support.deleteExpando = false;
+	}
+
+	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+		div.attachEvent("onclick", function click() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			jQuery.support.noCloneEvent = false;
+			div.detachEvent("onclick", click);
+		});
+		div.cloneNode(true).fireEvent("onclick");
+	}
+
+	div = document.createElement("div");
+	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+
+	var fragment = document.createDocumentFragment();
+	fragment.appendChild( div.firstChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+
+	// Figure out if the W3C box model works as expected
+	// document.body must exist before we can do this
+	jQuery(function() {
+		var div = document.createElement("div"),
+			body = document.getElementsByTagName("body")[0];
+
+		// Frameset documents with no body should not run this code
+		if ( !body ) {
+			return;
+		}
+
+		div.style.width = div.style.paddingLeft = "1px";
+		body.appendChild( div );
+		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+
+		if ( "zoom" in div.style ) {
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			// (IE < 8 does this)
+			div.style.display = "inline";
+			div.style.zoom = 1;
+			jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
+
+			// Check if elements with layout shrink-wrap their children
+			// (IE 6 does this)
+			div.style.display = "";
+			div.innerHTML = "<div style='width:4px;'></div>";
+			jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
+		}
+
+		div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
+		var tds = div.getElementsByTagName("td");
+
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		// (only IE 8 fails this test)
+		jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
+
+		tds[0].style.display = "";
+		tds[1].style.display = "none";
+
+		// Check if empty table cells still have offsetWidth/Height
+		// (IE < 8 fail this test)
+		jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
+		div.innerHTML = "";
+
+		body.removeChild( div ).style.display = "none";
+		div = tds = null;
+	});
+
+	// Technique from Juriy Zaytsev
+	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+	var eventSupported = function( eventName ) {
+		var el = document.createElement("div");
+		eventName = "on" + eventName;
+
+		// We only care about the case where non-standard event systems
+		// are used, namely in IE. Short-circuiting here helps us to
+		// avoid an eval call (in setAttribute) which can cause CSP
+		// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+		if ( !el.attachEvent ) {
+			return true;
+		}
+
+		var isSupported = (eventName in el);
+		if ( !isSupported ) {
+			el.setAttribute(eventName, "return;");
+			isSupported = typeof el[eventName] === "function";
+		}
+		el = null;
+
+		return isSupported;
+	};
+
+	jQuery.support.submitBubbles = eventSupported("submit");
+	jQuery.support.changeBubbles = eventSupported("change");
+
+	// release memory in IE
+	div = all = a = null;
+})();
+
+
+
+var rbrace = /^(?:\{.*\}|\[.*\])$/;
+
+jQuery.extend({
+	cache: {},
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache,
+
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
+
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
+
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando;
+
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) {
+			return;
+		}
+
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ jQuery.expando ] = id = ++jQuery.uuid;
+			} else {
+				id = jQuery.expando;
+			}
+		}
+
+		if ( !cache[ id ] ) {
+			cache[ id ] = {};
+
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+		}
+
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if ( typeof name === "object" || typeof name === "function" ) {
+			if ( pvt ) {
+				cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
+			} else {
+				cache[ id ] = jQuery.extend(cache[ id ], name);
+			}
+		}
+
+		thisCache = cache[ id ];
+
+		// Internal jQuery data is stored in a separate object inside the object's data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data
+		if ( pvt ) {
+			if ( !thisCache[ internalKey ] ) {
+				thisCache[ internalKey ] = {};
+			}
+
+			thisCache = thisCache[ internalKey ];
+		}
+
+		if ( data !== undefined ) {
+			thisCache[ name ] = data;
+		}
+
+		// TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
+		// not attempt to inspect the internal events object using jQuery.data, as this
+		// internal data object is undocumented and subject to change.
+		if ( name === "events" && !thisCache[name] ) {
+			return thisCache[ internalKey ] && thisCache[ internalKey ].events;
+		}
+
+		return getByName ? thisCache[ name ] : thisCache;
+	},
+
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var internalKey = jQuery.expando, isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+
+			// See jQuery.data for more information
+			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
+
+		if ( name ) {
+			var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ];
+
+			if ( thisCache ) {
+				delete thisCache[ name ];
+
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !isEmptyDataObject(thisCache) ) {
+					return;
+				}
+			}
+		}
+
+		// See jQuery.data for more information
+		if ( pvt ) {
+			delete cache[ id ][ internalKey ];
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !isEmptyDataObject(cache[ id ]) ) {
+				return;
+			}
+		}
+
+		var internalCache = cache[ id ][ internalKey ];
+
+		// Browsers that fail expando deletion also refuse to delete expandos on
+		// the window, but it will allow it on all other JS objects; other browsers
+		// don't care
+		if ( jQuery.support.deleteExpando || cache != window ) {
+			delete cache[ id ];
+		} else {
+			cache[ id ] = null;
+		}
+
+		// We destroyed the entire user cache at once because it's faster than
+		// iterating through each key, but we need to continue to persist internal
+		// data if it existed
+		if ( internalCache ) {
+			cache[ id ] = {};
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+
+			cache[ id ][ internalKey ] = internalCache;
+
+		// Otherwise, we need to eliminate the expando on the node to avoid
+		// false lookups in the cache for entries that no longer exist
+		} else if ( isNode ) {
+			// IE does not allow us to delete expando properties from nodes,
+			// nor does it have a removeAttribute function on Document nodes;
+			// we must handle all of these cases
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
+			} else {
+				elem[ jQuery.expando ] = null;
+			}
+		}
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
+		}
+
+		return true;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var data = null;
+
+		if ( typeof key === "undefined" ) {
+			if ( this.length ) {
+				data = jQuery.data( this[0] );
+
+				if ( this[0].nodeType === 1 ) {
+					var attr = this[0].attributes, name;
+					for ( var i = 0, l = attr.length; i < l; i++ ) {
+						name = attr[i].name;
+
+						if ( name.indexOf( "data-" ) === 0 ) {
+							name = name.substr( 5 );
+							dataAttr( this[0], name, data[ name ] );
+						}
+					}
+				}
+			}
+
+			return data;
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		var parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			// Try to fetch any internally stored data first
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+				data = dataAttr( this[0], key, data );
+			}
+
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+
+		} else {
+			return this.each(function() {
+				var $this = jQuery( this ),
+					args = [ parts[0], value ];
+
+				$this.triggerHandler( "setData" + parts[1] + "!", args );
+				jQuery.data( this, key, value );
+				$this.triggerHandler( "changeData" + parts[1] + "!", args );
+			});
+		}
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		data = elem.getAttribute( "data-" + key );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				!jQuery.isNaN( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON
+// property to be considered empty objects; this property always exists in
+// order to make sure JSON.stringify does not expose internal metadata
+function isEmptyDataObject( obj ) {
+	for ( var name in obj ) {
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+
+
+
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		if ( !elem ) {
+			return;
+		}
+
+		type = (type || "fx") + "queue";
+		var q = jQuery._data( elem, type );
+
+		// Speed up dequeue by getting out quickly if this is just a lookup
+		if ( !data ) {
+			return q || [];
+		}
+
+		if ( !q || jQuery.isArray(data) ) {
+			q = jQuery._data( elem, type, jQuery.makeArray(data) );
+
+		} else {
+			q.push( data );
+		}
+
+		return q;
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift();
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift("inprogress");
+			}
+
+			fn.call(elem, function() {
+				jQuery.dequeue(elem, type);
+			});
+		}
+
+		if ( !queue.length ) {
+			jQuery.removeData( elem, type + "queue", true );
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined ) {
+			return jQuery.queue( this[0], type );
+		}
+		return this.each(function( i ) {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function() {
+			var elem = this;
+			setTimeout(function() {
+				jQuery.dequeue( elem, type );
+			}, time );
+		});
+	},
+
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	}
+});
+
+
+
+
+var rclass = /[\n\t\r]/g,
+	rspaces = /\s+/,
+	rreturn = /\r/g,
+	rspecialurl = /^(?:href|src|style)$/,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rradiocheck = /^(?:radio|checkbox)$/i;
+
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	colspan: "colSpan",
+	tabindex: "tabIndex",
+	usemap: "useMap",
+	frameborder: "frameBorder"
+};
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name, fn ) {
+		return this.each(function(){
+			jQuery.attr( this, name, "" );
+			if ( this.nodeType === 1 ) {
+				this.removeAttribute( name );
+			}
+		});
+	},
+
+	addClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.addClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className ) {
+						elem.className = value;
+
+					} else {
+						var className = " " + elem.className + " ",
+							setClass = elem.className;
+
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+								setClass += " " + classNames[c];
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.removeClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						var className = (" " + elem.className + " ").replace(rclass, " ");
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[c] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( rspaces );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ";
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		if ( !arguments.length ) {
+			var elem = this[0];
+
+			if ( elem ) {
+				if ( jQuery.nodeName( elem, "option" ) ) {
+					// attributes.value is undefined in Blackberry 4.7 but
+					// uses .value. See #6932
+					var val = elem.attributes.value;
+					return !val || val.specified ? elem.value : elem.text;
+				}
+
+				// We need to handle select boxes special
+				if ( jQuery.nodeName( elem, "select" ) ) {
+					var index = elem.selectedIndex,
+						values = [],
+						options = elem.options,
+						one = elem.type === "select-one";
+
+					// Nothing was selected
+					if ( index < 0 ) {
+						return null;
+					}
+
+					// Loop through all the selected options
+					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[ i ];
+
+						// Don't return options that are disabled or in a disabled optgroup
+						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+								(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+							// Get the specific value for the option
+							value = jQuery(option).val();
+
+							// We don't need an array for one selects
+							if ( one ) {
+								return value;
+							}
+
+							// Multi-Selects return an array
+							values.push( value );
+						}
+					}
+
+					// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
+					if ( one && !values.length && options.length ) {
+						return jQuery( options[ index ] ).val();
+					}
+
+					return values;
+				}
+
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+					return elem.getAttribute("value") === null ? "on" : elem.value;
+				}
+
+				// Everything else, we just grab the value
+				return (elem.value || "").replace(rreturn, "");
+
+			}
+
+			return undefined;
+		}
+
+		var isFunction = jQuery.isFunction(value);
+
+		return this.each(function(i) {
+			var self = jQuery(this), val = value;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call(this, i, self.val());
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray(val) ) {
+				val = jQuery.map(val, function (value) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+				this.checked = jQuery.inArray( self.val(), val ) >= 0;
+
+			} else if ( jQuery.nodeName( this, "select" ) ) {
+				var values = jQuery.makeArray(val);
+
+				jQuery( "option", this ).each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					this.selectedIndex = -1;
+				}
+
+			} else {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+
+	attr: function( elem, name, value, pass ) {
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
+			return undefined;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery(elem)[name](value);
+		}
+
+		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+			// Whether we are setting (or getting)
+			set = value !== undefined;
+
+		// Try to normalize/fix the name
+		name = notxml && jQuery.props[ name ] || name;
+
+		// Only do all the following if this is a node (faster for style)
+		if ( elem.nodeType === 1 ) {
+			// These attributes require special treatment
+			var special = rspecialurl.test( name );
+
+			// Safari mis-reports the default selected property of an option
+			// Accessing the parent's selectedIndex property fixes it
+			if ( name === "selected" && !jQuery.support.optSelected ) {
+				var parent = elem.parentNode;
+				if ( parent ) {
+					parent.selectedIndex;
+
+					// Make sure that it also works with optgroups, see #5701
+					if ( parent.parentNode ) {
+						parent.parentNode.selectedIndex;
+					}
+				}
+			}
+
+			// If applicable, access the attribute via the DOM 0 way
+			// 'in' checks fail in Blackberry 4.7 #6931
+			if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
+				if ( set ) {
+					// We can't allow the type property to be changed (since it causes problems in IE)
+					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+						jQuery.error( "type property can't be changed" );
+					}
+
+					if ( value === null ) {
+						if ( elem.nodeType === 1 ) {
+							elem.removeAttribute( name );
+						}
+
+					} else {
+						elem[ name ] = value;
+					}
+				}
+
+				// browsers index elements by id/name on forms, give priority to attributes.
+				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
+					return elem.getAttributeNode( name ).nodeValue;
+				}
+
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				if ( name === "tabIndex" ) {
+					var attributeNode = elem.getAttributeNode( "tabIndex" );
+
+					return attributeNode && attributeNode.specified ?
+						attributeNode.value :
+						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+							0 :
+							undefined;
+				}
+
+				return elem[ name ];
+			}
+
+			if ( !jQuery.support.style && notxml && name === "style" ) {
+				if ( set ) {
+					elem.style.cssText = "" + value;
+				}
+
+				return elem.style.cssText;
+			}
+
+			if ( set ) {
+				// convert the value to a string (all browsers do this but IE) see #1070
+				elem.setAttribute( name, "" + value );
+			}
+
+			// Ensure that missing attributes return undefined
+			// Blackberry 4.7 returns "" from getAttribute #6938
+			if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
+				return undefined;
+			}
+
+			var attr = !jQuery.support.hrefNormalized && notxml && special ?
+					// Some attributes require a special call on IE
+					elem.getAttribute( name, 2 ) :
+					elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return attr === null ? undefined : attr;
+		}
+		// Handle everything which isn't a DOM element node
+		if ( set ) {
+			elem[ name ] = value;
+		}
+		return elem[ name ];
+	}
+});
+
+
+
+
+var rnamespaces = /\.(.*)$/,
+	rformElems = /^(?:textarea|input|select)$/i,
+	rperiod = /\./g,
+	rspace = / /g,
+	rescape = /[^\w\s.|`]/g,
+	fcleanup = function( nm ) {
+		return nm.replace(rescape, "\\$&");
+	};
+
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function( elem, types, handler, data ) {
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// TODO :: Use a try/catch until it's safe to pull this out (likely 1.6)
+		// Minor release fix for bug #8018
+		try {
+			// For whatever reason, IE has trouble passing the window object
+			// around, causing it to be cloned in the process
+			if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
+				elem = window;
+			}
+		}
+		catch ( e ) {}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		} else if ( !handler ) {
+			// Fixes bug #7229. Fix recommended by jdalton
+			return;
+		}
+
+		var handleObjIn, handleObj;
+
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+		}
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure
+		var elemData = jQuery._data( elem );
+
+		// If no elemData is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !elemData ) {
+			return;
+		}
+
+		var events = elemData.events,
+			eventHandle = elemData.handle;
+
+		if ( !events ) {
+			elemData.events = events = {};
+		}
+
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function() {
+				// Handle the second event of a trigger and when
+				// an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+		}
+
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native events in IE.
+		eventHandle.elem = elem;
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		var type, i = 0, namespaces;
+
+		while ( (type = types[ i++ ]) ) {
+			handleObj = handleObjIn ?
+				jQuery.extend({}, handleObjIn) :
+				{ handler: handler, data: data };
+
+			// Namespaced event handlers
+			if ( type.indexOf(".") > -1 ) {
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				handleObj.namespace = namespaces.slice(0).sort().join(".");
+
+			} else {
+				namespaces = [];
+				handleObj.namespace = "";
+			}
+
+			handleObj.type = type;
+			if ( !handleObj.guid ) {
+				handleObj.guid = handler.guid;
+			}
+
+			// Get the current list of functions bound to this event
+			var handlers = events[ type ],
+				special = jQuery.event.special[ type ] || {};
+
+			// Init the event handler queue
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add the function to the element's handler list
+			handlers.push( handleObj );
+
+			// Keep track of which events have been used, for global triggering
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, pos ) {
+		// don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		}
+
+		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
+			events = elemData && elemData.events;
+
+		if ( !elemData || !events ) {
+			return;
+		}
+
+		// types is actually an event object here
+		if ( types && types.type ) {
+			handler = types.handler;
+			types = types.type;
+		}
+
+		// Unbind all events for the element
+		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+			types = types || "";
+
+			for ( type in events ) {
+				jQuery.event.remove( elem, type + types );
+			}
+
+			return;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).unbind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		while ( (type = types[ i++ ]) ) {
+			origType = type;
+			handleObj = null;
+			all = type.indexOf(".") < 0;
+			namespaces = [];
+
+			if ( !all ) {
+				// Namespaced event handlers
+				namespaces = type.split(".");
+				type = namespaces.shift();
+
+				namespace = new RegExp("(^|\\.)" +
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
+			}
+
+			eventType = events[ type ];
+
+			if ( !eventType ) {
+				continue;
+			}
+
+			if ( !handler ) {
+				for ( j = 0; j < eventType.length; j++ ) {
+					handleObj = eventType[ j ];
+
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						jQuery.event.remove( elem, origType, handleObj.handler, j );
+						eventType.splice( j--, 1 );
+					}
+				}
+
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+
+			for ( j = pos || 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( handler.guid === handleObj.guid ) {
+					// remove the given handler for the given type
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						if ( pos == null ) {
+							eventType.splice( j--, 1 );
+						}
+
+						if ( special.remove ) {
+							special.remove.call( elem, handleObj );
+						}
+					}
+
+					if ( pos != null ) {
+						break;
+					}
+				}
+			}
+
+			// remove generic event handler if no more handlers exist
+			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				ret = null;
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			var handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			delete elemData.events;
+			delete elemData.handle;
+
+			if ( jQuery.isEmptyObject( elemData ) ) {
+				jQuery.removeData( elem, undefined, true );
+			}
+		}
+	},
+
+	// bubbling is internal
+	trigger: function( event, data, elem /*, bubbling */ ) {
+		// Event object or event type
+		var type = event.type || event,
+			bubbling = arguments[3];
+
+		if ( !bubbling ) {
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[ jQuery.expando ] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
+
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
+
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+
+				// Only trigger if we've ever bound an event for it
+				if ( jQuery.event.global[ type ] ) {
+					// XXX This code smells terrible. event.js should not be directly
+					// inspecting the data cache
+					jQuery.each( jQuery.cache, function() {
+						// internalKey variable is just used to make it easier to find
+						// and potentially change this stuff later; currently it just
+						// points to jQuery.expando
+						var internalKey = jQuery.expando,
+							internalCache = this[ internalKey ];
+						if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
+							jQuery.event.trigger( event, data, internalCache.handle.elem );
+						}
+					});
+				}
+			}
+
+			// Handle triggering a single element
+
+			// don't do events on text and comment nodes
+			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+				return undefined;
+			}
+
+			// Clean up in case it is reused
+			event.result = undefined;
+			event.target = elem;
+
+			// Clone the incoming data, if any
+			data = jQuery.makeArray( data );
+			data.unshift( event );
+		}
+
+		event.currentTarget = elem;
+
+		// Trigger the event, it is assumed that "handle" is a function
+		var handle = jQuery._data( elem, "handle" );
+
+		if ( handle ) {
+			handle.apply( elem, data );
+		}
+
+		var parent = elem.parentNode || elem.ownerDocument;
+
+		// Trigger an inline bound script
+		try {
+			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
+					event.result = false;
+					event.preventDefault();
+				}
+			}
+
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (inlineError) {}
+
+		if ( !event.isPropagationStopped() && parent ) {
+			jQuery.event.trigger( event, data, parent, true );
+
+		} else if ( !event.isDefaultPrevented() ) {
+			var old,
+				target = event.target,
+				targetType = type.replace( rnamespaces, "" ),
+				isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
+				special = jQuery.event.special[ targetType ] || {};
+
+			if ( (!special._default || special._default.call( elem, event ) === false) &&
+				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+
+				try {
+					if ( target[ targetType ] ) {
+						// Make sure that we don't accidentally re-trigger the onFOO events
+						old = target[ "on" + targetType ];
+
+						if ( old ) {
+							target[ "on" + targetType ] = null;
+						}
+
+						jQuery.event.triggered = true;
+						target[ targetType ]();
+					}
+
+				// prevent IE from throwing an error for some elements with some event types, see #3533
+				} catch (triggerError) {}
+
+				if ( old ) {
+					target[ "on" + targetType ] = old;
+				}
+
+				jQuery.event.triggered = false;
+			}
+		}
+	},
+
+	handle: function( event ) {
+		var all, handlers, namespaces, namespace_re, events,
+			namespace_sort = [],
+			args = jQuery.makeArray( arguments );
+
+		event = args[0] = jQuery.event.fix( event || window.event );
+		event.currentTarget = this;
+
+		// Namespaced event handlers
+		all = event.type.indexOf(".") < 0 && !event.exclusive;
+
+		if ( !all ) {
+			namespaces = event.type.split(".");
+			event.type = namespaces.shift();
+			namespace_sort = namespaces.slice(0).sort();
+			namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");
+		}
+
+		event.namespace = event.namespace || namespace_sort.join(".");
+
+		events = jQuery._data(this, "events");
+
+		handlers = (events || {})[ event.type ];
+
+		if ( events && handlers ) {
+			// Clone the handlers to prevent manipulation
+			handlers = handlers.slice(0);
+
+			for ( var j = 0, l = handlers.length; j < l; j++ ) {
+				var handleObj = handlers[ j ];
+
+				// Filter the functions by class
+				if ( all || namespace_re.test( handleObj.namespace ) ) {
+					// Pass in a reference to the handler function itself
+					// So that we can later remove it
+					event.handler = handleObj.handler;
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+
+					var ret = handleObj.handler.apply( this, args );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+
+					if ( event.isImmediatePropagationStopped() ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
+		var originalEvent = event;
+		event = jQuery.Event( originalEvent );
+
+		for ( var i = this.props.length, prop; i; ) {
+			prop = this.props[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary
+		if ( !event.target ) {
+			// Fixes #1925 where srcElement might not be defined either
+			event.target = event.srcElement || document;
+		}
+
+		// check if target is a textnode (safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement ) {
+			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+		}
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var doc = document.documentElement,
+				body = document.body;
+
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+		}
+
+		// Add which for key events
+		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
+			event.which = event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button !== undefined ) {
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+		}
+
+		return event;
+	},
+
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
+	proxy: jQuery.proxy,
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady,
+			teardown: jQuery.noop
+		},
+
+		live: {
+			add: function( handleObj ) {
+				jQuery.event.add( this,
+					liveConvert( handleObj.origType, handleObj.selector ),
+					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
+			},
+
+			remove: function( handleObj ) {
+				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
+			}
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
+	};
+
+jQuery.Event = function( src ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !this.preventDefault ) {
+		return new jQuery.Event( src );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+	// Check if mouse(over|out) are still within the same parent element
+	var parent = event.relatedTarget;
+
+	// Firefox sometimes assigns relatedTarget a XUL element
+	// which we cannot access the parentNode property of
+	try {
+
+		// Chrome does something similar, the parentNode property
+		// can be accessed but is null.
+		if ( parent !== document && !parent.parentNode ) {
+			return;
+		}
+		// Traverse up the tree
+		while ( parent && parent !== this ) {
+			parent = parent.parentNode;
+		}
+
+		if ( parent !== this ) {
+			// set the correct event type
+			event.type = event.data;
+
+			// handle event if we actually just moused on to a non sub-element
+			jQuery.event.handle.apply( this, arguments );
+		}
+
+	// assuming we've left the element since we most likely mousedover a xul element
+	} catch(e) { }
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+	event.type = event.data;
+	jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		setup: function( data ) {
+			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+		},
+		teardown: function( data ) {
+			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		}
+	};
+});
+
+// submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function( data, namespaces ) {
+			if ( this.nodeName && this.nodeName.toLowerCase() !== "form" ) {
+				jQuery.event.add(this, "click.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+						trigger( "submit", this, arguments );
+					}
+				});
+
+				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+						trigger( "submit", this, arguments );
+					}
+				});
+
+			} else {
+				return false;
+			}
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialSubmit" );
+		}
+	};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+	var changeFilters,
+
+	getVal = function( elem ) {
+		var type = elem.type, val = elem.value;
+
+		if ( type === "radio" || type === "checkbox" ) {
+			val = elem.checked;
+
+		} else if ( type === "select-multiple" ) {
+			val = elem.selectedIndex > -1 ?
+				jQuery.map( elem.options, function( elem ) {
+					return elem.selected;
+				}).join("-") :
+				"";
+
+		} else if ( elem.nodeName.toLowerCase() === "select" ) {
+			val = elem.selectedIndex;
+		}
+
+		return val;
+	},
+
+	testChange = function testChange( e ) {
+		var elem = e.target, data, val;
+
+		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
+			return;
+		}
+
+		data = jQuery._data( elem, "_change_data" );
+		val = getVal(elem);
+
+		// the current data will be also retrieved by beforeactivate
+		if ( e.type !== "focusout" || elem.type !== "radio" ) {
+			jQuery._data( elem, "_change_data", val );
+		}
+
+		if ( data === undefined || val === data ) {
+			return;
+		}
+
+		if ( data != null || val ) {
+			e.type = "change";
+			e.liveFired = undefined;
+			jQuery.event.trigger( e, arguments[1], elem );
+		}
+	};
+
+	jQuery.event.special.change = {
+		filters: {
+			focusout: testChange,
+
+			beforedeactivate: testChange,
+
+			click: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+					testChange.call( this, e );
+				}
+			},
+
+			// Change has to be called before submit
+			// Keydown will be called before keypress, which is used in submit-event delegation
+			keydown: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+					type === "select-multiple" ) {
+					testChange.call( this, e );
+				}
+			},
+
+			// Beforeactivate happens also before the previous element is blurred
+			// with this event you can't trigger a change event, but you can store
+			// information
+			beforeactivate: function( e ) {
+				var elem = e.target;
+				jQuery._data( elem, "_change_data", getVal(elem) );
+			}
+		},
+
+		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
+				return false;
+			}
+
+			for ( var type in changeFilters ) {
+				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			}
+
+			return rformElems.test( this.nodeName );
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialChange" );
+
+			return rformElems.test( this.nodeName );
+		}
+	};
+
+	changeFilters = jQuery.event.special.change.filters;
+
+	// Handle when the input is .focus()'d
+	changeFilters.focus = changeFilters.beforeactivate;
+}
+
+function trigger( type, elem, args ) {
+	// Piggyback on a donor event to simulate a different one.
+	// Fake originalEvent to avoid donor's stopPropagation, but if the
+	// simulated event prevents default then we do the same on the donor.
+	// Don't pass args or remember liveFired; they apply to the donor event.
+	var event = jQuery.extend( {}, args[ 0 ] );
+	event.type = type;
+	event.originalEvent = {};
+	event.liveFired = undefined;
+	jQuery.event.handle.call( elem, event );
+	if ( event.isDefaultPrevented() ) {
+		args[ 0 ].preventDefault();
+	}
+}
+
+// Create "bubbling" focus and blur events
+if ( document.addEventListener ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				this.addEventListener( orig, handler, true );
+			},
+			teardown: function() {
+				this.removeEventListener( orig, handler, true );
+			}
+		};
+
+		function handler( e ) {
+			e = jQuery.event.fix( e );
+			e.type = fix;
+			return jQuery.event.handle.call( this, e );
+		}
+	});
+}
+
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this[ name ](key, data, type[key], fn);
+			}
+			return this;
+		}
+
+		if ( jQuery.isFunction( data ) || data === false ) {
+			fn = data;
+			data = undefined;
+		}
+
+		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
+			jQuery( this ).unbind( event, handler );
+			return fn.apply( this, arguments );
+		}) : fn;
+
+		if ( type === "unload" && name !== "one" ) {
+			this.one( type, data, fn );
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.add( this[i], type, handler, data );
+			}
+		}
+
+		return this;
+	};
+});
+
+jQuery.fn.extend({
+	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.remove( this[i], type, fn );
+			}
+		}
+
+		return this;
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.live( types, data, fn, selector );
+	},
+
+	undelegate: function( selector, types, fn ) {
+		if ( arguments.length === 0 ) {
+				return this.unbind( "live" );
+
+		} else {
+			return this.die( types, null, fn, selector );
+		}
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			var event = jQuery.Event( type );
+			event.preventDefault();
+			event.stopPropagation();
+			jQuery.event.trigger( event, data, this[0] );
+			return event.result;
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			i = 1;
+
+		// link all the functions, so any of them can unbind this click handler
+		while ( i < args.length ) {
+			jQuery.proxy( fn, args[ i++ ] );
+		}
+
+		return this.click( jQuery.proxy( fn, function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		}));
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+var liveMap = {
+	focus: "focusin",
+	blur: "focusout",
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+};
+
+jQuery.each(["live", "die"], function( i, name ) {
+	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+		var type, i = 0, match, namespaces, preType,
+			selector = origSelector || this.selector,
+			context = origSelector ? this : jQuery( this.context );
+
+		if ( typeof types === "object" && !types.preventDefault ) {
+			for ( var key in types ) {
+				context[ name ]( key, data, types[key], selector );
+			}
+
+			return this;
+		}
+
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		types = (types || "").split(" ");
+
+		while ( (type = types[ i++ ]) != null ) {
+			match = rnamespaces.exec( type );
+			namespaces = "";
+
+			if ( match )  {
+				namespaces = match[0];
+				type = type.replace( rnamespaces, "" );
+			}
+
+			if ( type === "hover" ) {
+				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+				continue;
+			}
+
+			preType = type;
+
+			if ( type === "focus" || type === "blur" ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
+
+			if ( name === "live" ) {
+				// bind live handler
+				for ( var j = 0, l = context.length; j < l; j++ ) {
+					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
+						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+				}
+
+			} else {
+				// unbind live handler
+				context.unbind( "live." + liveConvert( type, selector ), fn );
+			}
+		}
+
+		return this;
+	};
+});
+
+function liveHandler( event ) {
+	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+		elems = [],
+		selectors = [],
+		events = jQuery._data( this, "events" );
+
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911)
+	if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) {
+		return;
+	}
+
+	if ( event.namespace ) {
+		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
+	}
+
+	event.liveFired = this;
+
+	var live = events.live.slice(0);
+
+	for ( j = 0; j < live.length; j++ ) {
+		handleObj = live[j];
+
+		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+			selectors.push( handleObj.selector );
+
+		} else {
+			live.splice( j--, 1 );
+		}
+	}
+
+	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+	for ( i = 0, l = match.length; i < l; i++ ) {
+		close = match[i];
+
+		for ( j = 0; j < live.length; j++ ) {
+			handleObj = live[j];
+
+			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) {
+				elem = close.elem;
+				related = null;
+
+				// Those two events require additional checking
+				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					event.type = handleObj.preType;
+					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+				}
+
+				if ( !related || related !== elem ) {
+					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
+				}
+			}
+		}
+	}
+
+	for ( i = 0, l = elems.length; i < l; i++ ) {
+		match = elems[i];
+
+		if ( maxLevel && match.level > maxLevel ) {
+			break;
+		}
+
+		event.currentTarget = match.elem;
+		event.data = match.handleObj.data;
+		event.handleObj = match.handleObj;
+
+		ret = match.handleObj.origHandler.apply( match.elem, arguments );
+
+		if ( ret === false || event.isPropagationStopped() ) {
+			maxLevel = match.level;
+
+			if ( ret === false ) {
+				stop = false;
+			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
+		}
+	}
+
+	return stop;
+}
+
+function liveConvert( type, selector ) {
+	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&");
+}
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.bind( name, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+});
+
+
+/*!
+ * Sizzle CSS Selector Engine
+ *  Copyright 2011, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true,
+	rBackslash = /\\/g,
+	rNonWord = /\W/;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function() {
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
+		soFar = selector;
+	
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
+		
+			parts.push( m[1] );
+		
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray( set );
+
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function( results ) {
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort( sortOrder );
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
+};
+
+Sizzle.find = function( expr, context, isXML ) {
+	var set;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var match,
+			type = Expr.order[i];
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice( 1, 1 );
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace( rBackslash, "" );
+				set = Expr.find[ type ]( match, context, isXML );
+
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( "*" ) :
+			[];
+	}
+
+	return { set: set, expr: expr };
+};
+
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var found, item,
+					filter = Expr.filter[ type ],
+					left = match[1];
+
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+
+								} else {
+									curLoop[i] = false;
+								}
+
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+
+	leftMatch: {},
+
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+
+	attrHandle: {
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		},
+		type: function( elem ) {
+			return elem.getAttribute( "type" );
+		}
+	},
+
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !rNonWord.test( part ),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+
+		"": function(checkSet, part, isXML){
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
+		},
+
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
+		}
+	},
+
+	find: {
+		ID: function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		},
+
+		NAME: function( match, context ) {
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [],
+					results = context.getElementsByName( match[1] );
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+
+		TAG: function( match, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( match[1] );
+			}
+		}
+	},
+	preFilter: {
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace( rBackslash, "" ) + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+
+		ID: function( match ) {
+			return match[1].replace( rBackslash, "" );
+		},
+
+		TAG: function( match, curLoop ) {
+			return match[1].replace( rBackslash, "" ).toLowerCase();
+		},
+
+		CHILD: function( match ) {
+			if ( match[1] === "nth" ) {
+				if ( !match[2] ) {
+					Sizzle.error( match[0] );
+				}
+
+				match[2] = match[2].replace(/^\+|\s*/g, '');
+
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+			else if ( match[2] ) {
+				Sizzle.error( match[0] );
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1] = match[1].replace( rBackslash, "" );
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			// Handle if an un-quoted value was used
+			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+
+					return false;
+				}
+
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+
+		POS: function( match ) {
+			match.unshift( true );
+
+			return match;
+		}
+	},
+	
+	filters: {
+		enabled: function( elem ) {
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+
+		disabled: function( elem ) {
+			return elem.disabled === true;
+		},
+
+		checked: function( elem ) {
+			return elem.checked === true;
+		},
+		
+		selected: function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+			
+			return elem.selected === true;
+		},
+
+		parent: function( elem ) {
+			return !!elem.firstChild;
+		},
+
+		empty: function( elem ) {
+			return !elem.firstChild;
+		},
+
+		has: function( elem, i, match ) {
+			return !!Sizzle( match[3], elem ).length;
+		},
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
+		},
+
+		text: function( elem ) {
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) 
+			// use getAttribute instead to test this case
+			return "text" === elem.getAttribute( 'type' );
+		},
+		radio: function( elem ) {
+			return "radio" === elem.type;
+		},
+
+		checkbox: function( elem ) {
+			return "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return "file" === elem.type;
+		},
+		password: function( elem ) {
+			return "password" === elem.type;
+		},
+
+		submit: function( elem ) {
+			return "submit" === elem.type;
+		},
+
+		image: function( elem ) {
+			return "image" === elem.type;
+		},
+
+		reset: function( elem ) {
+			return "reset" === elem.type;
+		},
+
+		button: function( elem ) {
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
+		}
+	},
+	setFilters: {
+		first: function( elem, i ) {
+			return i === 0;
+		},
+
+		last: function( elem, i, match, array ) {
+			return i === array.length - 1;
+		},
+
+		even: function( elem, i ) {
+			return i % 2 === 0;
+		},
+
+		odd: function( elem, i ) {
+			return i % 2 === 1;
+		},
+
+		lt: function( elem, i, match ) {
+			return i < match[3] - 0;
+		},
+
+		gt: function( elem, i, match ) {
+			return i > match[3] - 0;
+		},
+
+		nth: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		},
+
+		eq: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+
+			} else {
+				Sizzle.error( name );
+			}
+		},
+
+		CHILD: function( elem, match ) {
+			var type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					if ( type === "first" ) { 
+						return true; 
+					}
+
+					node = elem;
+
+				case "last":
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					return true;
+
+				case "nth":
+					var first = match[2],
+						last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+
+					if ( first === 0 ) {
+						return diff === 0;
+
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+
+		ID: function( elem, match ) {
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		
+		CLASS: function( elem, match ) {
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+
+		ATTR: function( elem, match ) {
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function( array, results ) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder, siblingCheck;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+	};
+
+} else {
+	sortOrder = function( a, b ) {
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+		}
+
+		var cur = a.nextSibling;
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+Sizzle.getText = function( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += Sizzle.getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+
+		Expr.filter.ID = function( elem, match ) {
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+
+	// release memory in IE
+	root = form = null;
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
+		};
+	}
+
+	// release memory in IE
+	div = null;
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+	
+		Sizzle = function( query, context, extra, seed ) {
+			context = context || document;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && !Sizzle.isXML(context) ) {
+				// See if we find a selector to speed up
+				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
+				
+				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
+					// Speed-up: Sizzle("TAG")
+					if ( match[1] ) {
+						return makeArray( context.getElementsByTagName( query ), extra );
+					
+					// Speed-up: Sizzle(".CLASS")
+					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
+						return makeArray( context.getElementsByClassName( match[2] ), extra );
+					}
+				}
+				
+				if ( context.nodeType === 9 ) {
+					// Speed-up: Sizzle("body")
+					// The body element only exists once, optimize finding it
+					if ( query === "body" && context.body ) {
+						return makeArray( [ context.body ], extra );
+						
+					// Speed-up: Sizzle("#ID")
+					} else if ( match && match[3] ) {
+						var elem = context.getElementById( match[3] );
+
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						if ( elem && elem.parentNode ) {
+							// Handle the case where IE and Opera return items
+							// by name instead of ID
+							if ( elem.id === match[3] ) {
+								return makeArray( [ elem ], extra );
+							}
+							
+						} else {
+							return makeArray( [], extra );
+						}
+					}
+					
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var oldContext = context,
+						old = context.getAttribute( "id" ),
+						nid = old || id,
+						hasParent = context.parentNode,
+						relativeHierarchySelector = /^\s*[+~]/.test( query );
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					} else {
+						nid = nid.replace( /'/g, "\\$&" );
+					}
+					if ( relativeHierarchySelector && hasParent ) {
+						context = context.parentNode;
+					}
+
+					try {
+						if ( !relativeHierarchySelector || hasParent ) {
+							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
+						}
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							oldContext.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		// release memory in IE
+		div = null;
+	})();
+}
+
+(function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
+		pseudoWorks = false;
+
+	try {
+		// This should fail with an exception
+		// Gecko does not error, returns false instead
+		matches.call( document.documentElement, "[test!='']:sizzle" );
+	
+	} catch( pseudoError ) {
+		pseudoWorks = true;
+	}
+
+	if ( matches ) {
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try { 
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						return matches.call( node, expr );
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function( match, context, isXML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	// release memory in IE
+	div = null;
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+			
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
+
+Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function( selector, context ) {
+	var match,
+		tmpSet = [],
+		later = "",
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})();
+
+
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.POS,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var ret = this.pushStack( "", "find", selector ),
+			length = 0;
+
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( var n = length; n < ret.length; n++ ) {
+					for ( var r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+
+	is: function( selector ) {
+		return !!selector && jQuery.filter( selector, this ).length > 0;
+	},
+
+	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+
+		if ( jQuery.isArray( selectors ) ) {
+			var match, selector,
+				matches = {},
+				level = 1;
+
+			if ( cur && selectors.length ) {
+				for ( i = 0, l = selectors.length; i < l; i++ ) {
+					selector = selectors[i];
+
+					if ( !matches[selector] ) {
+						matches[selector] = jQuery.expr.match.POS.test( selector ) ?
+							jQuery( selector, context || this.context ) :
+							selector;
+					}
+				}
+
+				while ( cur && cur.ownerDocument && cur !== context ) {
+					for ( selector in matches ) {
+						match = matches[selector];
+
+						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+							ret.push({ selector: selector, elem: cur, level: level });
+						}
+					}
+
+					cur = cur.parentNode;
+					level++;
+				}
+			}
+
+			return ret;
+		}
+
+		var pos = POS.test( selectors ) ?
+			jQuery( selectors, context || this.context ) : null;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context ) {
+						break;
+					}
+				}
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+
+		return this.pushStack( ret, "closest", selectors );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until ),
+			// The variable 'args' was introduced in
+			// https://github.com/jquery/jquery/commit/52a0238
+			// to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed.
+			// http://code.google.com/p/v8/issues/detail?id=1050
+			args = slice.call(arguments);
+
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, args.join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+}
+
+
+
+
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery( this );
+
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append(this);
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		return this.each(function() {
+			jQuery( this ).wrapAll( html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnocache.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, "<$1></$2>");
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery( this );
+
+				self.html( value.call(this, i, self.html()) );
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = jQuery.buildFragment( args, this, scripts );
+			}
+
+			fragment = results.fragment;
+
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						// Make sure that we do not leak memory by inadvertently discarding
+						// the original fragment (which might have attached data) instead of
+						// using it; in addition, use the original fragment object for the last
+						// item instead of first because it can end up being emptied incorrectly
+						// in certain situations (Bug #8070).
+						// Fragments from the fragment cache must always be cloned and never used
+						// in place.
+						results.cacheable || (l > 1 && i < lastIndex) ?
+							jQuery.clone( fragment, true, true ) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, evalScript );
+			}
+		}
+
+		return this;
+	}
+});
+
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var internalKey = jQuery.expando,
+		oldData = jQuery.data( src ),
+		curData = jQuery.data( dest, oldData );
+
+	// Switch to use the internal data object, if it exists, for the next
+	// stage of data copying
+	if ( (oldData = oldData[ internalKey ]) ) {
+		var events = oldData.events;
+				curData = curData[ internalKey ] = jQuery.extend({}, oldData);
+
+		if ( events ) {
+			delete curData.handle;
+			curData.events = {};
+
+			for ( var type in events ) {
+				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
+				}
+			}
+		}
+	}
+}
+
+function cloneFixAttributes(src, dest) {
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	var nodeName = dest.nodeName.toLowerCase();
+
+	// clearAttributes removes the attributes, which we don't want,
+	// but also removes the attachEvent events, which we *do* want
+	dest.clearAttributes();
+
+	// mergeAttributes, in contrast, only merges back on the
+	// original attributes, not the events
+	dest.mergeAttributes(src);
+
+	// IE6-8 fail to clone children inside object elements that use
+	// the proprietary classid attribute value (rather than the type
+	// attribute) to identify the type of content to display
+	if ( nodeName === "object" ) {
+		dest.outerHTML = src.outerHTML;
+
+	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+		if ( src.checked ) {
+			dest.defaultChecked = dest.checked = src.checked;
+		}
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+
+	// Event data gets referenced instead of copied if the expando
+	// gets copied too
+	dest.removeAttribute( jQuery.expando );
+}
+
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults,
+		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+		args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+
+		cacheable = true;
+		cacheresults = jQuery.fragments[ args[0] ];
+		if ( cacheresults ) {
+			if ( cacheresults !== 1 ) {
+				fragment = cacheresults;
+			}
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [],
+			insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = (i > 0 ? this.clone(true) : this).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+function getAll( elem ) {
+	if ( "getElementsByTagName" in elem ) {
+		return elem.getElementsByTagName( "*" );
+	
+	} else if ( "querySelectorAll" in elem ) {
+		return elem.querySelectorAll( "*" );
+
+	} else {
+		return [];
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var clone = elem.cloneNode(true),
+				srcElements,
+				destElements,
+				i;
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			// IE copies events bound via attachEvent when using cloneNode.
+			// Calling detachEvent on the clone will also remove the events
+			// from the original. In order to get around this, we use some
+			// proprietary methods to clear the events. Thanks to MooTools
+			// guys for this hotness.
+
+			cloneFixAttributes( elem, clone );
+
+			// Using Sizzle here is crazy slow, so we use getElementsByTagName
+			// instead
+			srcElements = getAll( elem );
+			destElements = getAll( clone );
+
+			// Weird iteration because IE will replace the length property
+			// with an element if you are cloning the body and one of the
+			// elements on the page has a name or id of "length"
+			for ( i = 0; srcElements[i]; ++i ) {
+				cloneFixAttributes( srcElements[i], destElements[i] );
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			cloneCopyEvent( elem, clone );
+
+			if ( deepDataAndEvents ) {
+				srcElements = getAll( elem );
+				destElements = getAll( clone );
+
+				for ( i = 0; srcElements[i]; ++i ) {
+					cloneCopyEvent( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		// Return the cloned set
+		return clone;
+},
+	clean: function( elems, context, fragment, scripts ) {
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [];
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
+				// Fix "XHTML"-style tags in all browsers
+				elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+				// Trim whitespace, otherwise indexOf won't work as expected
+				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+					wrap = wrapMap[ tag ] || wrapMap._default,
+					depth = wrap[0],
+					div = context.createElement("div");
+
+				// Go to html and back, then peel off extra wrappers
+				div.innerHTML = wrap[1] + elem + wrap[2];
+
+				// Move to the right depth
+				while ( depth-- ) {
+					div = div.lastChild;
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !jQuery.support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					var hasBody = rtbody.test(elem),
+						tbody = tag === "table" && !hasBody ?
+							div.firstChild && div.firstChild.childNodes :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !hasBody ?
+								div.childNodes :
+								[];
+
+					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+							tbody[ j ].parentNode.removeChild( tbody[ j ] );
+						}
+					}
+
+				}
+
+				// IE completely kills leading whitespace when innerHTML is used
+				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+				}
+
+				elem = div.childNodes;
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			for ( i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+					}
+					fragment.appendChild( ret[i] );
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	cleanData: function( elems ) {
+		var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
+			id = elem[ jQuery.expando ];
+
+			if ( id ) {
+				data = cache[ id ] && cache[ id ][ internalKey ];
+
+				if ( data && data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						// This is a shortcut to avoid jQuery.event.remove's overhead
+						} else {
+							jQuery.removeEvent( elem, type, data.handle );
+						}
+					}
+
+					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+					if ( data.handle ) {
+						data.handle.elem = null;
+					}
+				}
+
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+
+				delete cache[ id ];
+			}
+		}
+	}
+});
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	rdashAlpha = /-([a-z])/ig,
+	rupper = /([A-Z])/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+	curCSS,
+
+	getComputedStyle,
+	currentStyle,
+
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn.css = function( name, value ) {
+	// Setting 'undefined' is a no-op
+	if ( arguments.length === 2 && value === undefined ) {
+		return this;
+	}
+
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
+	});
+};
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity", "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"zIndex": true,
+		"fontWeight": true,
+		"opacity": true,
+		"zoom": true,
+		"lineHeight": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( typeof value === "number" && isNaN( value ) || value == null ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra ) {
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
+
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name, origName );
+		}
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	},
+
+	camelCase: function( string ) {
+		return string.replace( rdashAlpha, fcamelCase );
+	}
+});
+
+// DEPRECATED, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
+
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			var val;
+
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					val = getWH( elem, name, extra );
+
+				} else {
+					jQuery.swap( elem, cssShow, function() {
+						val = getWH( elem, name, extra );
+					});
+				}
+
+				if ( val <= 0 ) {
+					val = curCSS( elem, name, name );
+
+					if ( val === "0px" && currentStyle ) {
+						val = currentStyle( elem, name, name );
+					}
+
+					if ( val != null ) {
+						// Should return "auto" instead of 0, use 0 for
+						// temporary backwards-compat
+						return val === "" || val === "auto" ? "0px" : val;
+					}
+				}
+
+				if ( val < 0 || val == null ) {
+					val = elem.style[ name ];
+
+					// Should return "auto" instead of 0, use 0 for
+					// temporary backwards-compat
+					return val === "" || val === "auto" ? "0px" : val;
+				}
+
+				return typeof val === "string" ? val : val + "px";
+			}
+		},
+
+		set: function( elem, value ) {
+			if ( rnumpx.test( value ) ) {
+				// ignore negative width and height values #1599
+				value = parseFloat(value);
+
+				if ( value >= 0 ) {
+					return value + "px";
+				}
+
+			} else {
+				return value;
+			}
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
+				(parseFloat(RegExp.$1) / 100) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style;
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// Set the alpha filter to set the opacity
+			var opacity = jQuery.isNaN(value) ?
+				"" :
+				"alpha(opacity=" + value * 100 + ")",
+				filter = style.filter || "";
+
+			style.filter = ralpha.test(filter) ?
+				filter.replace(ralpha, opacity) :
+				style.filter + ' ' + opacity;
+		}
+	};
+}
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, newName, name ) {
+		var ret, defaultView, computedStyle;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
+
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+		}
+
+		return ret;
+	};
+}
+
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
+			style = elem.style;
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			// Remember the original values
+			left = style.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : (ret || 0);
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWH( elem, name, extra ) {
+	var which = name === "width" ? cssWidth : cssHeight,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+	if ( extra === "border" ) {
+		return val;
+	}
+
+	jQuery.each( which, function() {
+		if ( !extra ) {
+			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
+		}
+
+		if ( extra === "margin" ) {
+			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
+
+		} else {
+			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
+		}
+	});
+
+	return val;
+}
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /(?:^file|^widget|\-extension):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rquery = /\?/,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rspacesAjax = /\s+/,
+	rts = /([?&])_=[^&]*/,
+	rucHeaders = /(^|\-)([a-z])/g,
+	rucHeadersFunc = function( _, $1, $2 ) {
+		return $1 + $2.toUpperCase();
+	},
+	rurl = /^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Document location
+	ajaxLocation,
+
+	// Document location segments
+	ajaxLocParts;
+
+// #8138, IE may throw an exception when accessing
+// a field from document.location if document.domain has been set
+try {
+	ajaxLocation = document.location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() );
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		if ( jQuery.isFunction( func ) ) {
+			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
+				i = 0,
+				length = dataTypes.length,
+				dataType,
+				list,
+				placeBefore;
+
+			// For each dataType in the dataTypeExpression
+			for(; i < length; i++ ) {
+				dataType = dataTypes[ i ];
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 ) || "*";
+				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( func );
+			}
+		}
+	};
+}
+
+//Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+		dataType /* internal */, inspected /* internal */ ) {
+
+	dataType = dataType || options.dataTypes[ 0 ];
+	inspected = inspected || {};
+
+	inspected[ dataType ] = true;
+
+	var list = structure[ dataType ],
+		i = 0,
+		length = list ? list.length : 0,
+		executeOnly = ( structure === prefilters ),
+		selection;
+
+	for(; i < length && ( executeOnly || !selection ); i++ ) {
+		selection = list[ i ]( options, originalOptions, jqXHR );
+		// If we got redirected to another dataType
+		// we try there if executing only and not done already
+		if ( typeof selection === "string" ) {
+			if ( !executeOnly || inspected[ selection ] ) {
+				selection = undefined;
+			} else {
+				options.dataTypes.unshift( selection );
+				selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected );
+			}
+		}
+	}
+	// If we're only executing or nothing was selected
+	// we try the catchall dataType if not done already
+	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+		selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected );
+	}
+	// unnecessary when only executing (prefilters)
+	// but it'll be ignored by the caller in that case
+	return selection;
+}
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf( " " );
+		if ( off >= 0 ) {
+			var selector = url.slice( off, url.length );
+			url = url.slice( 0, off );
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = undefined;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			// Complete callback (responseText is used internally)
+			complete: function( jqXHR, status, responseText ) {
+				// Store the response as specified by the jqXHR object
+				responseText = jqXHR.responseText;
+				// If successful, inject the HTML into all the matched elements
+				if ( jqXHR.isResolved() ) {
+					// #4825: Get the actual response in case
+					// a dataFilter is present in ajaxSettings
+					jqXHR.done(function( r ) {
+						responseText = r;
+					});
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [ responseText, status, jqXHR ] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+
+	serializeArray: function() {
+		return this.map(function(){
+			return this.elements ? jQuery.makeArray( this.elements ) : this;
+		})
+		.filter(function(){
+			return this.name && !this.disabled &&
+				( this.checked || rselectTextarea.test( this.nodeName ) ||
+					rinput.test( this.type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val, i ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+	jQuery.fn[ o ] = function( f ){
+		return this.bind( o, f );
+	};
+} );
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			type: method,
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	};
+} );
+
+jQuery.extend({
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function ( target, settings ) {
+		if ( !settings ) {
+			// Only one parameter, we extend ajaxSettings
+			settings = target;
+			target = jQuery.extend( true, jQuery.ajaxSettings, settings );
+		} else {
+			// target was provided, we extend into it
+			jQuery.extend( true, target, jQuery.ajaxSettings, settings );
+		}
+		// Flatten fields we don't want deep extended
+		for( var field in { context: 1, url: 1 } ) {
+			if ( field in settings ) {
+				target[ field ] = settings[ field ];
+			} else if( field in jQuery.ajaxSettings ) {
+				target[ field ] = jQuery.ajaxSettings[ field ];
+			}
+		}
+		return target;
+	},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		traditional: false,
+		headers: {},
+		crossDomain: null,
+		*/
+
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			text: "text/plain",
+			json: "application/json, text/javascript",
+			"*": "*/*"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// List of data converters
+		// 1) key format is "source_type destination_type" (a single space in-between)
+		// 2) the catchall symbol "*" can be used for source_type
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		}
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events
+			// It's the callbackContext if one was provided in the options
+			// and if it's a DOM node or a jQuery collection
+			globalEventContext = callbackContext !== s &&
+				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+						jQuery( callbackContext ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery._Deferred(),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// ifModified key
+			ifModifiedKey,
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// The jqXHR state
+			state = 0,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Fake xhr
+			jqXHR = {
+
+				readyState: 0,
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( !state ) {
+						requestHeaders[ name.toLowerCase().replace( rucHeaders, rucHeadersFunc ) ] = value;
+					}
+					return this;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match === undefined ? null : match;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					statusText = statusText || "abort";
+					if ( transport ) {
+						transport.abort( statusText );
+					}
+					done( 0, statusText );
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status, statusText, responses, headers ) {
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status ? 4 : 0;
+
+			var isSuccess,
+				success,
+				error,
+				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
+				lastModified,
+				etag;
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+
+					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
+						jQuery.lastModified[ ifModifiedKey ] = lastModified;
+					}
+					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
+						jQuery.etag[ ifModifiedKey ] = etag;
+					}
+				}
+
+				// If not modified
+				if ( status === 304 ) {
+
+					statusText = "notmodified";
+					isSuccess = true;
+
+				// If we have data
+				} else {
+
+					try {
+						success = ajaxConvert( s, response );
+						statusText = "success";
+						isSuccess = true;
+					} catch(e) {
+						// We have a parsererror
+						statusText = "parsererror";
+						error = e;
+					}
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if( !statusText || status ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = statusText;
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+						[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		// Attach deferreds
+		deferred.promise( jqXHR );
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+		jqXHR.complete = completeDeferred.done;
+
+		// Status-dependent callbacks
+		jqXHR.statusCode = function( map ) {
+			if ( map ) {
+				var tmp;
+				if ( state < 2 ) {
+					for( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+					}
+				} else {
+					tmp = map[ jqXHR.status ];
+					jqXHR.then( tmp, tmp );
+				}
+			}
+			return this;
+		};
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
+
+		// Determine if a cross-domain request is in order
+		if ( !s.crossDomain ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefiler, stop there
+		if ( state === 2 ) {
+			return false;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+			}
+
+			// Get ifModifiedKey before adding the anti-cache parameter
+			ifModifiedKey = s.url;
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts, "$1_=" + ts );
+
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			requestHeaders[ "Content-Type" ] = s.contentType;
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			ifModifiedKey = ifModifiedKey || s.url;
+			if ( jQuery.lastModified[ ifModifiedKey ] ) {
+				requestHeaders[ "If-Modified-Since" ] = jQuery.lastModified[ ifModifiedKey ];
+			}
+			if ( jQuery.etag[ ifModifiedKey ] ) {
+				requestHeaders[ "If-None-Match" ] = jQuery.etag[ ifModifiedKey ];
+			}
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		requestHeaders.Accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+			s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
+			s.accepts[ "*" ];
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+				// Abort if not done already
+				jqXHR.abort();
+				return false;
+
+		}
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout( function(){
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch (e) {
+				// Propagate exception as error if not done
+				if ( status < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					jQuery.error( e );
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction( value ) ? value() : value;
+				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+			};
+
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			} );
+
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[ prefix ], traditional, add );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join( "&" ).replace( r20, "+" );
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray( obj ) && obj.length ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && obj != null && typeof obj === "object" ) {
+		// If we see an array here, it is empty and should be treated as an empty
+		// object
+		if ( jQuery.isArray( obj ) || jQuery.isEmptyObject( obj ) ) {
+			add( prefix, "" );
+
+		// Serialize object item.
+		} else {
+			for ( var name in obj ) {
+				buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+			}
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields,
+		ct,
+		type,
+		finalDataType,
+		firstDataType;
+
+	// Fill responseXXX fields
+	for( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	var dataTypes = s.dataTypes,
+		converters = {},
+		i,
+		key,
+		length = dataTypes.length,
+		tmp,
+		// Current and previous dataTypes
+		current = dataTypes[ 0 ],
+		prev,
+		// Conversion expression
+		conversion,
+		// Conversion function
+		conv,
+		// Conversion functions (transitive conversion)
+		conv1,
+		conv2;
+
+	// For each dataType in the chain
+	for( i = 1; i < length; i++ ) {
+
+		// Create converters map
+		// with lowercased keys
+		if ( i === 1 ) {
+			for( key in s.converters ) {
+				if( typeof key === "string" ) {
+					converters[ key.toLowerCase() ] = s.converters[ key ];
+				}
+			}
+		}
+
+		// Get the dataTypes
+		prev = current;
+		current = dataTypes[ i ];
+
+		// If current is auto dataType, update it to prev
+		if( current === "*" ) {
+			current = prev;
+		// If no auto and dataTypes are actually different
+		} else if ( prev !== "*" && prev !== current ) {
+
+			// Get the converter
+			conversion = prev + " " + current;
+			conv = converters[ conversion ] || converters[ "* " + current ];
+
+			// If there is no direct converter, search transitively
+			if ( !conv ) {
+				conv2 = undefined;
+				for( conv1 in converters ) {
+					tmp = conv1.split( " " );
+					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
+						conv2 = converters[ tmp[1] + " " + current ];
+						if ( conv2 ) {
+							conv1 = converters[ conv1 ];
+							if ( conv1 === true ) {
+								conv = conv2;
+							} else if ( conv2 === true ) {
+								conv = conv1;
+							}
+							break;
+						}
+					}
+				}
+			}
+			// If we found no converter, dispatch an error
+			if ( !( conv || conv2 ) ) {
+				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
+			}
+			// If found converter is not an equivalence
+			if ( conv !== true ) {
+				// Convert with 1 or 2 converters accordingly
+				response = conv ? conv( response ) : conv2( conv1(response) );
+			}
+		}
+	}
+	return response;
+}
+
+
+
+
+var jsc = jQuery.now(),
+	jsre = /(\=)\?(&|$)|()\?\?()/i;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		return jQuery.expando + "_" + ( jsc++ );
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var dataIsString = ( typeof s.data === "string" );
+
+	if ( s.dataTypes[ 0 ] === "jsonp" ||
+		originalSettings.jsonpCallback ||
+		originalSettings.jsonp != null ||
+		s.jsonp !== false && ( jsre.test( s.url ) ||
+				dataIsString && jsre.test( s.data ) ) ) {
+
+		var responseContainer,
+			jsonpCallback = s.jsonpCallback =
+				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
+			previous = window[ jsonpCallback ],
+			url = s.url,
+			data = s.data,
+			replace = "$1" + jsonpCallback + "$2",
+			cleanUp = function() {
+				// Set callback back to previous value
+				window[ jsonpCallback ] = previous;
+				// Call if it was a function and we have a response
+				if ( responseContainer && jQuery.isFunction( previous ) ) {
+					window[ jsonpCallback ]( responseContainer[ 0 ] );
+				}
+			};
+
+		if ( s.jsonp !== false ) {
+			url = url.replace( jsre, replace );
+			if ( s.url === url ) {
+				if ( dataIsString ) {
+					data = data.replace( jsre, replace );
+				}
+				if ( s.data === data ) {
+					// Add callback manually
+					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+				}
+			}
+		}
+
+		s.url = url;
+		s.data = data;
+
+		// Install callback
+		window[ jsonpCallback ] = function( response ) {
+			responseContainer = [ response ];
+		};
+
+		// Install cleanUp function
+		jqXHR.then( cleanUp, cleanUp );
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( jsonpCallback + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Delegate to script
+		return "script";
+	}
+} );
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /javascript|ecmascript/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+} );
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = "async";
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+
+						// Dereference the script
+						script = undefined;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// This arises when a base node is used (#2709 and #4378).
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( 0, 1 );
+				}
+			}
+		};
+	}
+} );
+
+
+
+
+var // #5280: next active xhr id and list of active xhrs' callbacks
+	xhrId = jQuery.now(),
+	xhrCallbacks,
+
+	// XHR used to determine supports properties
+	testXHR;
+
+// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+function xhrOnUnloadAbort() {
+	jQuery( window ).unload(function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	});
+}
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Test if we can create an xhr object
+testXHR = jQuery.ajaxSettings.xhr();
+jQuery.support.ajax = !!testXHR;
+
+// Does this browser support crossDomain XHR requests
+jQuery.support.cors = testXHR && ( "withCredentials" in testXHR );
+
+// No need for the temporary xhr anymore
+testXHR = undefined;
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var xhr = s.xhr(),
+						handle,
+						i;
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// Requested-With header
+					// Not set for crossDomain requests with no content
+					// (see why at http://trac.dojotoolkit.org/ticket/9486)
+					// Won't change header if already provided
+					if ( !( s.crossDomain && !s.hasContent ) && !headers["X-Requested-With"] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( _ ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+
+						var status,
+							statusText,
+							responseHeaders,
+							responses,
+							xml;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occured
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									delete xhrCallbacks[ handle ];
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+									responses = {};
+									xml = xhr.responseXML;
+
+									// Construct response list
+									if ( xml && xml.documentElement /* #4958 */ ) {
+										responses.xml = xml;
+									}
+									responses.text = xhr.responseText;
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					// if we're in sync mode or it's in cache
+					// and has been retrieved directly (IE6 & IE7)
+					// we need to manually fire the callback
+					if ( !s.async || xhr.readyState === 4 ) {
+						callback();
+					} else {
+						// Create the active xhrs callbacks list if needed
+						// and attach the unload handler
+						if ( !xhrCallbacks ) {
+							xhrCallbacks = {};
+							xhrOnUnloadAbort();
+						}
+						// Add to list of active xhrs callbacks
+						handle = xhrId++;
+						xhr.onreadystatechange = xhrCallbacks[ handle ] = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback(0,1);
+					}
+				}
+			};
+		}
+	});
+}
+
+
+
+
+var elemdisplay = {},
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	];
+
+jQuery.fn.extend({
+	show: function( speed, easing, callback ) {
+		var elem, display;
+
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				// Reset the inline display of this element to learn if it is
+				// being hidden by cascaded rules or not
+				if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
+					display = elem.style.display = "";
+				}
+
+				// Set elements which have been overridden with display: none
+				// in a stylesheet to whatever the default browser style is
+				// for such an element
+				if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+					jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+				}
+			}
+
+			// Set the display of most of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				if ( display === "" || display === "none" ) {
+					elem.style.display = jQuery._data(elem, "olddisplay") || "";
+				}
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, easing, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				var display = jQuery.css( this[i], "display" );
+
+				if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+					jQuery._data( this[i], "olddisplay", display );
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				this[i].style.display = "none";
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2, callback ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, easing, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, easing, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed(speed, easing, callback);
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete );
+		}
+
+		return this[ optall.queue === false ? "each" : "queue" ](function() {
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			var opt = jQuery.extend({}, optall), p,
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				self = this;
+
+			for ( p in prop ) {
+				var name = jQuery.camelCase( p );
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
+				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
+					return opt.complete.call(this);
+				}
+
+				if ( isElement && ( p === "height" || p === "width" ) ) {
+					// Make sure that nothing sneaks out
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height
+					// animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+						if ( !jQuery.support.inlineBlockNeedsLayout ) {
+							this.style.display = "inline-block";
+
+						} else {
+							var display = defaultDisplay(this.nodeName);
+
+							// inline-level elements accept inline-block;
+							// block-level elements need to be inline with layout
+							if ( display === "inline" ) {
+								this.style.display = "inline-block";
+
+							} else {
+								this.style.display = "inline";
+								this.style.zoom = 1;
+							}
+						}
+					}
+				}
+
+				if ( jQuery.isArray( prop[p] ) ) {
+					// Create (if needed) and add to specialEasing
+					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+					prop[p] = prop[p][0];
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			opt.curAnim = jQuery.extend({}, prop);
+
+			jQuery.each( prop, function( name, val ) {
+				var e = new jQuery.fx( self, opt, name );
+
+				if ( rfxtypes.test(val) ) {
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
+				} else {
+					var parts = rfxnum.exec(val),
+						start = e.cur();
+
+					if ( parts ) {
+						var end = parseFloat( parts[2] ),
+							unit = parts[3] || ( jQuery.cssNumber[ name ] ? "" : "px" );
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							jQuery.style( self, name, (end || 1) + unit);
+							start = ((end || 1) / e.cur()) * start;
+							jQuery.style( self, name, start + unit);
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			});
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+
+	stop: function( clearQueue, gotoEnd ) {
+		var timers = jQuery.timers;
+
+		if ( clearQueue ) {
+			this.queue([]);
+		}
+
+		this.each(function() {
+			// go in reverse order so anything added to the queue during the loop is ignored
+			for ( var i = timers.length - 1; i >= 0; i-- ) {
+				if ( timers[i].elem === this ) {
+					if (gotoEnd) {
+						// force the next step to be the last
+						timers[i](true);
+					}
+
+					timers.splice(i, 1);
+				}
+			}
+		});
+
+		// start the next in the queue if the last step wasn't forced
+		if ( !gotoEnd ) {
+			this.dequeue();
+		}
+
+		return this;
+	}
+
+});
+
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
+
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function() {
+			if ( opt.queue !== false ) {
+				jQuery(this).dequeue();
+			}
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		if ( !options.orig ) {
+			options.orig = {};
+		}
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+	},
+
+	// Get the current size
+	cur: function() {
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var parsed,
+			r = jQuery.css( this.elem, this.prop );
+		// Empty strings, null, undefined and "auto" are converted to 0,
+		// complex values such as "rotate(1rad)" are returned as is,
+		// simple values such as "10px" are parsed to Float.
+		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx;
+
+		this.startTime = jQuery.now();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
+		this.now = this.start;
+		this.pos = this.state = 0;
+
+		function t( gotoEnd ) {
+			return self.step(gotoEnd);
+		}
+
+		t.elem = this.elem;
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval(fx.tick, fx.interval);
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var t = jQuery.now(), done = true;
+
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			this.options.curAnim[ this.prop ] = true;
+
+			for ( var i in this.options.curAnim ) {
+				if ( this.options.curAnim[i] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				// Reset the overflow
+				if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+					var elem = this.elem,
+						options = this.options;
+
+					jQuery.each( [ "", "X", "Y" ], function (index, value) {
+						elem.style[ "overflow" + value ] = options.overflow[index];
+					} );
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( this.options.hide ) {
+					jQuery(this.elem).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( this.options.hide || this.options.show ) {
+					for ( var p in this.options.curAnim ) {
+						jQuery.style( this.elem, p, this.options.orig[p] );
+					}
+				}
+
+				// Execute the complete function
+				this.options.complete.call( this.elem );
+			}
+
+			return false;
+
+		} else {
+			var n = t - this.startTime;
+			this.state = n / this.options.duration;
+
+			// Perform the easing function, defaults to swing
+			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
+			this.now = this.start + ((this.end - this.start) * this.pos);
+
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timers = jQuery.timers;
+
+		for ( var i = 0; i < timers.length; i++ ) {
+			if ( !timers[i]() ) {
+				timers.splice(i--, 1);
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+
+	interval: 13,
+
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+
+	speeds: {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style( fx.elem, "opacity", fx.now );
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+function defaultDisplay( nodeName ) {
+	if ( !elemdisplay[ nodeName ] ) {
+		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
+			display = elem.css("display");
+
+		elem.remove();
+
+		if ( display === "none" || display === "" ) {
+			display = "block";
+		}
+
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
+
+
+
+var rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0], box;
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		var doc = elem.ownerDocument,
+			docElem = doc.documentElement;
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow(doc),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ),
+			scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft),
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		jQuery.offset.initialize();
+
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.offset = {
+	initialize: function() {
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
+			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+
+		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+		container.innerHTML = html;
+		body.insertBefore( container, body.firstChild );
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		checkDiv.style.position = "fixed";
+		checkDiv.style.top = "20px";
+
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = "";
+
+		innerDiv.style.overflow = "hidden";
+		innerDiv.style.position = "relative";
+
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+		body.removeChild( container );
+		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = jQuery.noop;
+	},
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is absolute
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+		}
+
+		curTop  = calculatePosition ? curPosition.top  : parseFloat( curCSSTop,  10 ) || 0;
+		curLeft = calculatePosition ? curPosition.left : parseFloat( curCSSLeft, 10 ) || 0;
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if (options.top != null) {
+			props.top = (options.top - curOffset.top) + curTop;
+		}
+		if (options.left != null) {
+			props.left = (options.left - curOffset.left) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function(val) {
+		var elem = this[0], win;
+
+		if ( !elem ) {
+			return null;
+		}
+
+		if ( val !== undefined ) {
+			// Set the scroll offset
+			return this.each(function() {
+				win = getWindow( this );
+
+				if ( win ) {
+					win.scrollTo(
+						!i ? val : jQuery(win).scrollLeft(),
+						i ? val : jQuery(win).scrollTop()
+					);
+
+				} else {
+					this[ method ] = val;
+				}
+			});
+		} else {
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+
+
+
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function() {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, "padding" ) ) :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function( margin ) {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		if ( jQuery.isWindow( elem ) ) {
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+			var docElemProp = elem.document.documentElement[ "client" + name ];
+			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
+				elem.document.body[ "client" + name ] || docElemProp;
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNaN( ret ) ? orig : ret;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
+	};
+
+});
+
+
+window.jQuery = window.$ = jQuery;
+})(window);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-digilib-plugins.txt	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,47 @@
+
+The plugin API of jquery.digilib
+--------------------------------
+
+* The plugin Javascript file has to be loaded after jquery.digilib.js.
+
+* The plugin should be written as a closure on jQuery (like a jquery plugin) exporting a plugin object as its interface:
+
+  var plugin = {
+            name : 'mydigilibplugin',
+            install : install,
+            init : init,
+            buttons : {},
+            actions : {},
+            fn : {},
+            plugins : {},
+            defaults : {}
+  };
+
+  The "name" string, "install" function and "init" function are provided by the plugin and called by digilib. 
+  "buttons", "actions", "fn" and "plugins" are shared objects provided by digilib.
+  "buttons" is the array of button objects. The plugin can add its own buttons to this array.
+  "actions" is the array of action objects. The plugin can add its own actions to this array.
+  "fn" is an object with functions from digilib.
+  "plugins" is an object with all digilib plugin objects.
+  "defaults" is an object with all digilib defaults.
+
+* the plugin object is passed to digilib in the "plugin" action on loading the plugin javascript file:
+
+  $.fn.digilib('plugin', plugin);
+
+  digilib then calls the "install" function on the populated plugin object (i.e. this = plugin) with the plugin object as parameter.
+  
+* digilib calls the "init" function from the plugin object with the data object instance as a parameter in digilibs init phase.
+
+* further actions should be implemented as custom events on the data object.
+
+* events triggered by digilib on the data object:
+  "setup": in the init phase, after scalerDiv and buttons have been set up.
+  "update", updateDisplay(): after small updates in the display, e.g. when the scaler-img finished loading.
+  "redisplay", redisplay(): after changes in the display, e.g. after changing zoom factor.
+  "dragZoom(newZoomArea)": while dragging the zoom area (with parameter newZoomArea).
+
+* initial options for the plugin can be passed to digilib, together with digilib options, by passing an object to the 'digilib' function: $div.digilib(options);
+The passed options extend/override the default digilib options. The options are stored in the "data.settings" array.
+
+* A functional stub for new digilib plugins is available in the file "jquery.digilib.pluginstub.js"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-test-embedded-rc.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Digilib jQuery Test: embedded</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+
+            div.digilib {
+                /* padding for buttons and bird-div */
+                padding-right: 18px;
+                padding-bottom: 100px;
+                /* width: 220px; */
+            }
+
+            td {
+                vertical-align: top;
+                }
+
+            #debug {
+                background-color: beige;
+                position: absolute;
+                top: 400px;
+                padding: 0px 10px;
+                font-family: Arial;
+                font-size: 9pt;
+                }
+
+            div._log {
+                color: grey;
+                }
+
+            div._debug {
+                color: darkgreen;
+                }
+
+            div._error {
+                color: red;
+                }
+
+            div#test:hover {
+                background-color: cornsilk;
+                }
+
+        </style>
+
+        <script type="text/javascript" src="jquery-1.4.4.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                 $('div.digilib').digilib({
+                    interactionMode : 'embedded',
+                    birdDivWidth : 100, 
+                    birdDivHeight : 100
+                    });
+
+                 $('div.digilib').each(function(){
+                         console.log($(this).data('digilib').settings);
+                    });
+
+            });
+
+        </script>
+    </head>
+
+    <body>
+        <table>
+            <tr>
+                <td>
+                    <div id="digilib-1" class="digilib single">
+                        <img src="http://localhost:18080/digitallibrary/servlet/Scaler?dw=200&amp;dh=200&amp;fn=163127KK/pageimg&amp;pn=11" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-2" class="digilib">
+                        <img src="http://localhost:18080/digitallibrary/servlet/Scaler?dw=200&amp;dh=200&amp;fn=163127KK/pageimg&amp;pn=12" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-3" class="digilib">
+                        <img src="http://localhost:18080/digitallibrary/servlet/Scaler?dw=200&amp;dh=200&amp;fn=163127KK/pageimg&amp;pn=13" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-4" class="digilib">
+                        <img src="http://localhost:18080/digitallibrary/servlet/Scaler?dw=200&amp;dh=200&amp;fn=163127KK/pageimg&amp;pn=14" />
+                    </div>
+                </td>
+            </tr>
+        </table>
+        <div id="debug">DEBUG</div>
+        <div id="test">
+            <img id="test" src="img/black-glass-16.png"></img>
+            <img id="test2" src="img/black-glass-32.png"></img>
+        </div>
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-test-embedded.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,123 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Digilib jQuery Test: embedded</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+
+            div.digilib {
+                /* padding for buttons and bird-div */
+                padding-right: 18px;
+                padding-bottom: 100px;
+                /* width: 220px; */
+            }
+
+            div.svg {
+                position: absolute;
+                background: transparent;
+            }
+
+            td {
+                vertical-align: top;
+                }
+
+            #debug {
+                background-color: beige;
+                position: absolute;
+                top: 400px;
+                padding: 0px 10px;
+                font-family: Arial;
+                font-size: 9pt;
+                }
+
+            div._log {
+                color: grey;
+                }
+
+            div._debug {
+                color: darkgreen;
+                }
+
+            div._error {
+                color: red;
+                }
+
+            div#test:hover {
+                background-color: cornsilk;
+                }
+
+        </style>
+
+        <script type="text/javascript" src="jquery-1.5.1.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
+        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
+        <script type="text/javascript" src="jquery.digilib.pluginstub.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'embedded',
+                    scalerBaseUrl : 'http://digilib.biblhertz.it/digilib04/servlet/Scaler',
+                    showRegionNumbers : false,
+                    autoRegionLinks : true
+                    };
+                var $div = $('div.digilib');
+                $div.digilib(opts);
+
+                // $('div.digilib').each(function(){
+                //    console.log($(this).data('digilib').settings);
+                //    });
+            });
+
+        </script>
+    </head>
+
+    <body>
+        <table>
+            <tr>
+                <td>
+                    <div id="digilib-1" class="digilib single">
+                        <img title="test" alt="testalt" src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/&amp;pn=1" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-2" class="digilib">
+                        <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/ferrara" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-3" class="digilib">
+                        <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/FransHals-WillemVanHeythuysen" />
+                        <div class="keep regioncontent">
+                            <a href="http://www.mpiwg-berlin.mpg.de" coords="0.1,0.1,0.4,0.1">MPI fuer Wissenschaftsgeschichte</a>
+                            <a href="http://www.biblhertz.it" coords="0.5,0.8,0.4,0.1">Bibliotheca Hertziana</a>
+                            <a coords="0.3,0.5,0.15,0.1" />
+                        </div>
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-4" class="digilib">
+                        <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/HansHolbein-NikolausKratzer" />
+                    </div>
+                </td>
+            </tr>
+        </table>
+        <div id="debug">DEBUG</div>
+        <div id="test">
+            <img id="test" src="img/black-glass-16.png"></img>
+            <img id="test2" src="img/black-glass-32.png"></img>
+        </div>
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-test-full-rc.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Digilib jQuery Test: fullscreen</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+
+            div.digilib {
+                /* padding for buttons and bird-div */
+                padding-right: 18px;
+                padding-bottom: 100px;
+                /* width: 220px; */
+            }
+
+        </style>
+
+        <script type="text/javascript" src="jquery.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
+        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'fullscreen',
+                    scalerBaseUrl : 'http://localhost:18080/digitallibrary/servlet/Scaler'
+                    };
+                 $('div.digilib').digilib(opts);
+            });
+
+        </script>
+    </head>
+
+    <body>
+
+        <div id="digilib-1" class="digilib">
+            <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/FransHals-WillemVanHeythuysen" />
+        </div>
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-test-full.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,98 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Digilib jQuery Test: fullscreen</title>
+
+        <style type="text/css">
+            body {
+                 background: grey;
+            }
+
+            div.digilib {
+                /* padding for buttons and bird-div */
+                padding-right: 18px;
+                padding-bottom: 100px;
+                /* width: 220px; */
+            }
+
+            div.svg {
+                position: absolute;
+                background: transparent;
+            }
+
+            td {
+                vertical-align: top;
+                }
+
+            div#test:hover {
+                background-color: cornsilk;
+                }
+
+            #debug {
+                background-color: beige;
+                position: absolute;
+                opacity: 50%;
+                top: 4px;
+                left: 300px;
+                width: 500px;
+                padding: 0px 5px;
+                font-family: Arial;
+                font-size: 9px;
+                display: none;
+                }
+
+            div._log {
+                color: grey;
+                }
+
+            div._debug {
+                color: darkgreen;
+                }
+
+            div._error {
+                color: red;
+                }
+        </style>
+
+        <script type="text/javascript" src="jquery-1.5.1.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
+        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
+        <script type="text/javascript" src="jquery.digilib.pluginstub.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'fullscreen',
+                    scalerBaseUrl : 'http://digilib.biblhertz.it/digilib04/servlet/Scaler',
+                    showRegionNumbers : true,
+                    autoRegionLinks : false
+                    };
+                var $div = $('div.digilib');
+                $div.digilib(opts);
+            });
+
+        </script>
+    </head>
+
+    <body>
+
+        <div id="digilib-1" class="digilib">
+            <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/FransHals-WillemVanHeythuysen" />
+        </div>
+        <div id="debug">DEBUG</div>
+        <!-- 
+        <div class="keep regioncontent">
+            <a href="http://www.mpiwg-berlin.mpg.de" coords="0.1,0.1,0.4,0.1">MPI fuer Wissenschaftsgeschichte</a>
+            <a href="http://www.biblhertz.it" coords="0.5,0.8,0.4,0.1">Bibliotheca Hertziana</a>
+            <a coords="0.3,0.5,0.15,0.1" />
+        </div>
+         -->
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery-test-svg.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>jQuery.digilibSVG test</title>
+
+        <style type="text/css">
+        </style>
+
+        <script type="text/javascript" src="jquery-1.4.4.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="svg/jquery.svg.js"></script>
+        <script type="text/javascript" src="svg/jquery.digilibSVG.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+        <link rel="stylesheet" type="text/css" href="svg/jquery.digilibSVG.css" />
+
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'fullscreen',
+                    scalerBaseUrl : 'http://digilib.biblhertz.it/digilib04/servlet/Scaler'
+                    };
+                var $div = $('div.digilib');
+                $div.digilib(opts);
+                var svgopts = {};
+                $div.digilibSVG(svgopts);
+            });
+
+        </script>
+    </head>
+
+    <body>
+
+        <div id="digilib-1" class="digilib">
+            <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/FransHals-WillemVanHeythuysen" />
+        </div>
+        <div id="debug">DEBUG</div>
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.cookie.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,96 @@
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Create a cookie with the given name and value and other optional parameters.
+ *
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Set the value of a cookie.
+ * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
+ * @desc Create a cookie with all available options.
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Create a session cookie.
+ * @example $.cookie('the_cookie', null);
+ * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
+ *       used when the cookie was set.
+ *
+ * @param String name The name of the cookie.
+ * @param String value The value of the cookie.
+ * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
+ * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
+ *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
+ *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
+ *                             when the the browser exits.
+ * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
+ * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
+ *                        require a secure protocol (like HTTPS).
+ * @type undefined
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+
+/**
+ * Get the value of a cookie with the given name.
+ *
+ * @example $.cookie('the_cookie');
+ * @desc Get the value of a cookie.
+ *
+ * @param String name The name of the cookie.
+ * @return The value of the cookie.
+ * @type String
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+jQuery.cookie = function(name, value, options) {
+    if (typeof value != 'undefined') { // name and value given, set cookie
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+        }
+        // CAUTION: Needed to parenthesize options.path and options.domain
+        // in the following expressions, otherwise they evaluate to undefined
+        // in the packed version for some reason...
+        var path = options.path ? '; path=' + (options.path) : '';
+        var domain = options.domain ? '; domain=' + (options.domain) : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else { // only name given, get cookie
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                // Does this cookie string begin with the name we want?
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.digilib.birdseye.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,330 @@
+/**
+digilib bird's eye view plugin
+ */
+
+(function($) {
+
+    // affine geometry plugin stub
+    var geom;
+
+    // digilib object
+    var digilib;
+
+    var FULL_AREA;
+
+    var buttons = {
+            bird : {
+                onclick : "showBirdDiv",
+                tooltip : "show bird's eye view",
+                icon : "birds-eye.png"
+                }
+    };
+
+    var defaults = {
+            // is birdView shown?
+            'isBirdDivVisible' : false,
+            // dimensions of bird's eye div
+            'birdDivWidth' : 200, 
+            'birdDivHeight' : 200,
+            // parameters used by bird's eye div
+            'birdDivParams' : ['fn','pn','dw','dh']
+    };
+
+    var actions = {
+            // event handler: toggles the visibility of the bird's eye window 
+            showBirdDiv : function (data, show) {
+                var settings = data.settings;
+                if (data.$birdDiv == null) {
+                    // no bird div -> create
+                    setupBirdDiv(data);
+                }
+                var on = digilib.fn.showDiv(settings.isBirdDivVisible, data.$birdDiv, show);
+                settings.isBirdDivVisible = on;
+                digilib.fn.highlightButtons(data, 'bird', on);
+                updateBirdDiv(data);
+                digilib.fn.storeOptions(data);
+            }
+    };
+
+    // plugin installation called by digilib on plugin object.
+    var install = function(plugin) {
+        digilib = plugin;
+        console.debug('installing birdseye plugin. digilib:', digilib);
+        // import geometry classes
+        geom = digilib.fn.geometry;
+        FULL_AREA = geom.rectangle(0,0,1,1);
+        // add defaults
+        $.extend(digilib.defaults, defaults);
+        // add actions
+        $.extend(digilib.actions, actions);
+        // add buttons
+        $.extend(digilib.buttons, buttons);
+        // insert in button list -- not elegant
+        digilib.defaults.buttonSettings.fullscreen.standardSet.splice(9, 0, 'bird');
+        digilib.defaults.buttonSettings.embedded.standardSet.splice(5, 0, 'bird');
+    };
+
+    // plugin initialization
+    var init = function (data) {
+        console.debug('initialising birdseye plugin. data:', data);
+        var $data = $(data);
+        // install event handler
+        $data.bind('setup', handleSetup);
+        $data.bind('update', handleUpdate);
+        $data.bind('redisplay', handleRedisplay);
+        $data.bind('dragZoom', handleDragZoom);
+    };
+
+
+    var handleSetup = function (evt) {
+        console.debug("birdseye: handleSetup");
+        data = this;
+        // bird's eye view creation
+        if (data.settings.isBirdDivVisible) {
+            setupBirdDiv(data);
+            data.$birdDiv.show();
+        }
+    };
+
+    var handleUpdate = function (evt) {
+        console.debug("birdseye: handleUpdate");
+        data = this;
+        if (data.settings.isBirdDivVisible) {
+            renderBirdArea(data);
+            setupBirdDrag(data);
+        }
+    };
+
+    var handleRedisplay = function (evt) {
+        console.debug("birdseye: handleRedisplay");
+        data = this;
+        if (data.settings.isBirdDivVisible) {
+            updateBirdDiv(data);
+        }
+    };
+
+    var handleDragZoom = function (evt, zoomArea) {
+        //console.debug("birdseye: handleDragZoom za="+zoomArea);
+        data = this;
+        if (data.settings.isBirdDivVisible) {
+            setBirdZoom(data, zoomArea);
+        }
+    };
+
+    // returns URL for bird's eye view image
+    var getBirdImgUrl = function (data) {
+        var settings = data.settings;
+        var birdDivOptions = {
+                dw : settings.birdDivWidth,
+                dh : settings.birdDivHeight
+        };
+        var birdSettings = $.extend({}, settings, birdDivOptions);
+        // use only the relevant parameters
+        var params = digilib.fn.getParamString(birdSettings, settings.birdDivParams, digilib.defaults);
+        var url = settings.scalerBaseUrl + '?' + params;
+        return url;
+    };
+
+    // creates HTML structure for the bird's eye view in elem
+    var setupBirdDiv = function (data) {
+        var $elem = data.$elem;
+        // the bird's eye div
+        var $birdDiv = $('<div class="birdview" style="display:none"/>');
+        // the detail indicator frame
+        var $birdZoom = $('<div class="birdzoom" style="display:none; background-color:transparent;"/>');
+        // the small image
+        var $birdImg = $('<img class="birdimg"/>');
+        data.$birdDiv = $birdDiv;
+        data.$birdZoom = $birdZoom;
+        data.$birdImg = $birdImg;
+        $elem.append($birdDiv);
+        $birdDiv.append($birdZoom);
+        $birdDiv.append($birdImg);
+        // $birdZoom.css(data.settings.birdIndicatorStyle);
+        var birdUrl = getBirdImgUrl(data);
+        $birdImg.load(birdImgLoadedHandler(data));
+        $birdImg.error(function () {console.error("error loading birdview image");});
+        $birdImg.attr('src', birdUrl);
+    };
+
+    // update bird's eye view
+    var updateBirdDiv = function (data) {
+        if (!data.settings.isBirdDivVisible) return;
+        var $birdImg = data.$birdImg;
+        var oldsrc = $birdImg.attr('src');
+        var newsrc = getBirdImgUrl(data);
+        if (oldsrc !== newsrc) {
+            $birdImg.attr('src', newsrc);
+            // onload handler re-renders
+        } else {
+            // re-render
+            renderBirdArea(data);
+            // enable click and drag
+            setupBirdDrag(data);
+        }
+    };
+
+    // returns function for load event of bird's eye view img
+    var birdImgLoadedHandler = function (data) {
+        return function () {
+            var $birdImg = $(this);
+            var birdRect = geom.rectangle($birdImg);
+            console.debug("birdImg loaded!", $birdImg, "rect=", birdRect, "data=", data);
+            if (birdRect.width === 0) {
+                // malheureusement IE7 calls load handler when there is no size info yet 
+                setTimeout(function () { $birdImg.triggerHandler('load'); }, 200);
+                }
+            // update display (zoom area indicator)
+            digilib.fn.updateDisplay(data);
+        };
+    };
+
+    // show zoom area indicator on bird's eye view
+    var renderBirdArea = function (data) {
+        if (data.$birdImg == null || ! data.$birdImg.get(0).complete) return;
+        var $birdZoom = data.$birdZoom;
+        var zoomArea = data.zoomArea;
+        var normalSize = digilib.fn.isFullArea(zoomArea);
+        if (normalSize) {
+            $birdZoom.hide();
+            return;
+        } else {
+            $birdZoom.show();
+        }
+        // create Transform from current area and picsize
+        data.birdTrafo = digilib.fn.getImgTrafo(data.$birdImg, FULL_AREA);
+        var zoomRect = data.birdTrafo.transform(zoomArea);
+        console.debug("renderBirdArea:", zoomRect, "zoomArea:", zoomArea, "$birdTrafo:", data.birdTrafo);
+        // acount for border width
+        var bw = digilib.fn.getBorderWidth($birdZoom);
+        zoomRect.addPosition({x : -bw, y : -bw});
+        if (data.settings.interactionMode === 'fullscreen') {
+            // no animation for fullscreen
+            zoomRect.adjustDiv($birdZoom);
+        } else {
+            // nice animation for embedded mode :-)
+            // correct offsetParent because animate doesn't use offset
+            var ppos = $birdZoom.offsetParent().offset();
+            var dest = {
+                left : (zoomRect.x - ppos.left) + 'px',
+                top : (zoomRect.y - ppos.top) + 'px',
+                width : zoomRect.width,
+                height : zoomRect.height
+                };
+            $birdZoom.animate(dest);
+        }
+    };
+
+    // bird's eye view zoom area click and drag handler
+    var setupBirdDrag = function(data) {
+        var $birdImg = data.$birdImg;
+        var $birdZoom = data.$birdZoom;
+        var $document = $(document);
+        var $scaler = data.$scaler;
+        var startPos, newRect, birdImgRect, birdZoomRect, fullRect, scalerPos;
+        var bw = digilib.fn.getBorderWidth($birdZoom);
+
+        // mousedown handler: start dragging bird zoom to a new position
+        var birdZoomStartDrag = function(evt) {
+            startPos = geom.position(evt);
+            // position may have changed
+            data.birdTrafo = digilib.fn.getImgTrafo($birdImg, FULL_AREA);
+            birdImgRect = geom.rectangle($birdImg);
+            birdZoomRect = geom.rectangle($birdZoom);
+            scalerPos = geom.position($scaler);
+            newRect = null;
+            data.$elem.find(".overlay").hide(); // hide all overlays (marks/regions)
+            fullRect = digilib.fn.setZoomBG(data); // setup zoom background image
+            $document.bind("mousemove.dlBirdMove", birdZoomMove);
+            $document.bind("mouseup.dlBirdMove", birdZoomEndDrag);
+            return false;
+        };
+
+        // mousemove handler: drag
+        var birdZoomMove = function(evt) {
+            var pos = geom.position(evt);
+            var delta = startPos.delta(pos);
+            // move birdZoom div, keeping size
+            newRect = birdZoomRect.copy();
+            newRect.addPosition(delta);
+            newRect.stayInside(birdImgRect);
+            // reflect birdview zoom position in scaler image
+            var area = data.birdTrafo.invtransform(newRect);
+            var imgArea = data.imgTrafo.transform(area);
+            var offset = imgArea.getPosition().neg();
+            offset.add(scalerPos);
+            if (fullRect) {
+                var bgPos = fullRect.getPosition().add(offset);
+            } else {
+                var bgPos = offset;
+            }
+            // move the background image to the new position
+            data.$scaler.css({
+                'background-position' : bgPos.x + "px " + bgPos.y + "px"
+                });
+            // acount for border width
+            newRect.addPosition({x : -bw, y : -bw});
+            newRect.adjustDiv($birdZoom);
+            return false;
+        };
+
+        // mouseup handler: reload page
+        var birdZoomEndDrag = function(evt) {
+            var settings = data.settings;
+            $document.unbind("mousemove.dlBirdMove", birdZoomMove);
+            $document.unbind("mouseup.dlBirdMove", birdZoomEndDrag);
+            if (newRect == null) { 
+                // no movement happened - set center to click position
+                startPos = birdZoomRect.getCenter();
+                birdZoomMove(evt); 
+                }
+            // ugly, but needed to prevent double border width compensation
+            newRect.addPosition({x : bw, y : bw});
+            var newArea = data.birdTrafo.invtransform(newRect);
+            data.zoomArea = newArea;
+            digilib.fn.redisplay(data);
+            return false;
+        };
+
+        // clear old handler
+        $document.unbind(".dlBirdMove");
+        $birdImg.unbind(".dlBirdMove");
+        $birdZoom.unbind(".dlBirdMove");
+        if (! digilib.fn.isFullArea(data.zoomArea)) {
+            // set new handler
+            $birdImg.bind("mousedown.dlBirdMove", birdZoomStartDrag);
+            $birdZoom.bind("mousedown.dlBirdMove", birdZoomStartDrag);
+        }
+    };
+
+    // move bird zoom indicator to reflect zoomed detail area
+    var setBirdZoom = function(data, rect) {
+        var part = data.imgTrafo.invtransform(rect);
+        // area = FULL_AREA.fit(part); // no, we want to see where we transcend the borders
+        birdTrafo = digilib.fn.getImgTrafo(data.$birdImg, FULL_AREA);
+        var birdRect = birdTrafo.transform(part);
+        var $birdZoom = data.$birdZoom;
+        // acount for border width
+        var bw = digilib.fn.getBorderWidth($birdZoom);
+        birdRect.addPosition({x : -bw, y : -bw});
+        birdRect.adjustDiv(data.$birdZoom);
+    };
+
+    // plugin object with name and init
+    // shared objects filled by digilib on registration
+    var plugin = {
+            name : 'birdseye',
+            install : install,
+            init : init,
+            buttons : {},
+            actions : {},
+            fn : {},
+            plugins : {}
+    };
+
+    if ($.fn.digilib == null) {
+        $.error("jquery.digilib.birdseye must be loaded after jquery.digilib!");
+    } else {
+        $.fn.digilib('plugin', plugin);
+    }
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.digilib.css	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,206 @@
+/* 
+ * CSS style file for jQuery digilib
+ *
+ * Martin Raspe, Robert Casties, 11.1.2011
+ */
+div.digilib div.scaler {
+	background-color: grey;
+	z-index: 0;
+	width: 0px;
+	height: 0px;
+}
+
+div.digilib div.birdview {
+	border: 1px solid white;
+	z-index: 10;
+}
+
+div.digilib div.zoomrect {
+	position: absolute;
+	border: 2px solid #ff0000;
+	z-index: 100;
+}
+
+div.digilib div.birdzoom {
+    position: absolute;
+    border: 2px solid #ff0000;
+    z-index: 100;
+}
+
+div.digilib div.mark {
+	position: absolute;
+	color: white;
+	background: url('../greyskin/mark-bg-16.png');
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	font-size: 11px;
+	height: 15px;
+	width: 16px;
+	padding-top: 1px;
+	text-align: center;
+	z-index: 10;
+}
+
+div.digilib div.about {
+	position: absolute;
+	width: 200px;
+	top: 100px;
+	left: 350px;
+	height: 200px;
+	padding: 0px 2px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	border: 2px solid lightcyan;
+	background-color: lightgrey;
+	text-align: center;
+	display: none;
+	z-index: 1000;
+}
+
+div.digilib div.region {
+	position: absolute;
+	background-color: red;
+    opacity: 0.3;
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); 
+}
+
+div.digilib div.region:hover {
+	opacity: 0.5;
+	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50); 
+}
+
+div.digilib div.region {
+    color: white;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 11px;
+}
+
+div.digilib div.region a.regionnumber {
+    color: white;
+    text-decoration: none;
+	font-weight: bold;
+	font-size: 11px;
+	text-align: center;
+    padding: 0px 2px;
+    margin-right: 4px;
+    border: 1px solid white;
+    display: inline-block;
+}
+
+div.digilib div.regioncontent {
+    display: none;
+}
+
+div.digilib div.regionHTML {
+    display: none;
+    position: absolute;
+	top: 100px;
+	padding: 10px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	border: 2px solid lightcyan;
+	color: black;
+	background-color: lightgrey;
+	z-index: 1000;
+}
+
+div.digilib div.regionHTML a {
+    color: white;
+    text-decoration: none;
+    font-size: 11px;
+	font-weight: bold;
+}
+
+div.infobutton {
+    background-color: white;
+    color: grey;
+    padding: 0px 4px;
+    margin: 0px 2px;
+    float: left;
+}
+
+div.info {
+    clear: both;
+    display: none;
+    margin: 10px;
+}
+
+div.infoheader {
+    width: 300px;
+    margin-bottom: 20px;
+}
+
+div.digilib div.arrows {
+    display: none;
+}
+
+div.digilib div.arrows div.button {
+    position: absolute;
+    text-align: center;
+    background-color: black;
+    opacity: 0.08;
+    z-index: 200;
+    }
+
+div.digilib div.arrows div.button:hover {
+    opacity: 0.5;
+}
+
+div.digilib div.arrows div.button a {
+    position: relative;
+}
+
+/* special definitions for fullscreen */
+div.digilib.dl_fullscreen div.buttons {
+	position: fixed;
+	right: 0px;
+	top: 0px;
+	padding: 2px;
+	background-color: transparent;
+	z-index: 200;
+}
+
+div.digilib.dl_fullscreen div.buttons div.button:hover {
+	background-image: url('img/fullscreen/corona.png');
+	background-repeat: no-repeat;
+}
+
+div.digilib.dl_fullscreen div.button-on {
+	background-image: url('img/fullscreen/whitedisc.png');
+	background-repeat: no-repeat;
+}
+
+div.digilib.dl_fullscreen div.birdview {
+	position: fixed;
+	bottom: 8px;
+	right: 48px;
+}
+
+/* special definitions for embedded */
+div.digilib.dl_embedded {
+	position: relative;
+}
+
+div.digilib.dl_embedded div.buttons {
+	position: absolute;
+	right: 0px;
+	top: 0px;
+	padding: 1px;
+	background-color: grey;
+	opacity: 0.5;
+	z-index: 100;
+}
+
+div.digilib.dl_embedded div.buttons div.button:hover {
+	background-color: black;
+}
+
+div.digilib.dl_embedded div.button-on {
+	background-color: darkgreen;
+}
+
+div.digilib.dl_embedded div.birdview {
+	position: absolute;
+	bottom: 0px;
+	right: 0px;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.digilib.geometry.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,506 @@
+/** required digilib geometry plugin
+ */
+
+(function($) {
+//var dlGeometry = function() {
+    /*
+     * Size class
+     */
+    var size = function(w, h) {
+        var that;
+        if (typeof w === "object") {
+            // assume its size
+            that = {
+                width : w.width,
+                height : w.height
+            };
+        } else {
+            that = {
+                width : parseFloat(w),
+                height : parseFloat(h)
+            };
+        }
+        that.equals = function(other) {
+            return (this.width === other.width && this.height === other.height);
+        };
+        that.toString = function() {
+            return (this.width + "x" + this.height);
+        };
+        return that;
+    };
+
+    /*
+     * Position class
+     */
+    var position = function(x, y) {
+        var that;
+        if (typeof x === "object") {
+            if (x instanceof jQuery) {
+                // jQuery object
+                var pos = x.offset();
+                that = {
+                    x : pos.left,
+                    y : pos.top
+                };
+            } else {
+                if (x.x != null) {
+                    // position object
+                    that = {
+                        x : x.x,
+                        y : x.y
+                    };
+                }
+                if (x.pageX != null) {
+                    // event object
+                    that = {
+                        x : x.pageX,
+                        y : x.pageY
+                    };
+                }
+            }
+        } else {
+            that = {
+                x : parseFloat(x),
+                y : parseFloat(y)
+            };
+        }
+        that.equals = function(other) {
+            return (this.x === other.x && this.y === other.y);
+        };
+        // add position other to this
+        that.add = function(other) {
+            this.x += other.x;
+            this.y += other.y;
+            return this;
+        };
+        // returns negative position
+        that.neg = function() {
+            return position({
+                x : -this.x,
+                y : -this.y
+            });
+        };
+        // returns new position that is the difference between this and other
+        that.delta = function(other) {
+            return position({
+                x : other.x - this.x,
+                y : other.y - this.y
+            });
+        };
+        // adjusts position $elem to this position
+        that.adjustDiv = function($elem) {
+            $elem.offset({
+                left : this.x,
+                top : this.y
+            });
+        };
+        // returns distance of this position to pos (length if pos == null)
+        that.distance = function(pos) {
+            if (pos == null) {
+                pos = {
+                    x : 0,
+                    y : 0
+                };
+            }
+            var dx = pos.x - this.x;
+            var dy = pos.y - this.y;
+            return Math.sqrt(dx * dx + dy * dy);
+        };
+        that.toString = function() {
+            return (this.x + "," + this.y);
+        };
+        return that;
+    };
+    /*
+     * Rectangle class
+     */
+    var rectangle = function(x, y, w, h) {
+        var that = {};
+        if (typeof x === "object") {
+            if (x instanceof jQuery) {
+                // jQuery object
+                var pos = x.offset();
+                that = {
+                    x : pos.left,
+                    y : pos.top,
+                    width : x.width(),
+                    height : x.height()
+                };
+            } else if (y == null) {
+                // assume x is rectangle
+                that = {
+                    x : x.x,
+                    y : x.y,
+                    width : x.width,
+                    height : x.height
+                };
+            } else {
+                // assume x and y are Position
+                that = {
+                    x : Math.min(x.x, y.x),
+                    y : Math.min(x.y, y.y),
+                    width : Math.abs(y.x - x.x),
+                    height : Math.abs(y.y - x.y)
+                };
+            }
+        } else {
+            that = {
+                x : parseFloat(x),
+                y : parseFloat(y),
+                width : parseFloat(w),
+                height : parseFloat(h)
+            };
+        }
+        // returns a copy of this Rectangle
+        that.copy = function() {
+            return rectangle(this);
+        };
+        // returns the position of this Rectangle
+        that.getPosition = function() {
+            return position(this);
+        };
+        // returns the size of this Rectangle
+        that.getSize = function() {
+            return size(this);
+        };
+        // returns the upper left corner position
+        that.getPt1 = that.getPosition;
+        // returns the lower right corner position of this Rectangle
+        that.getPt2 = function() {
+            return position({
+                x : this.x + this.width,
+                y : this.y + this.height
+            });
+        };
+        // sets the upper left corner position to pos
+        that.setPosition = function(pos) {
+            this.x = pos.x;
+            this.y = pos.y;
+            return this;
+        };
+        // adds pos to the position
+        that.setPt1 = that.setPosition; // TODO: not really the same
+        that.addPosition = function(pos) {
+            this.x += pos.x;
+            this.y += pos.y;
+            return this;
+        };
+        // adds pos to the dimensions
+        that.enlarge = function(pos) {
+            this.width += pos.x;
+            this.height += pos.y;
+            return this;
+        };
+        // sets the lower right corner to position pos
+        that.setPt2 = function(pos) {
+            this.width = pos.x - this.x;
+            this.height = pos.y - this.y;
+            return this;
+        };
+        // returns the center position of this Rectangle
+        that.getCenter = function() {
+            return position({
+                x : this.x + this.width / 2,
+                y : this.y + this.height / 2
+            });
+        };
+        // moves this rectangle's center to position pos
+        that.setCenter = function(pos) {
+            this.x = pos.x - this.width / 2;
+            this.y = pos.y - this.height / 2;
+            return this;
+        };
+        // returns true if both rectangles have equal position and proportion
+        that.equals = function(other) {
+            var eq = (this.x === other.x && this.y === other.y && this.width === other.width);
+            return eq;
+        };
+        // returns the area of this Rectangle
+        that.getArea = function() {
+            return (this.width * this.height);
+        };
+        // eliminates negative width and height
+        that.normalize = function() {
+            var p = this.getPt2();
+            this.x = Math.min(this.x, p.x);
+            this.y = Math.min(this.y, p.y);
+            this.width = Math.abs(this.width);
+            this.height = Math.abs(this.height);
+            return this;
+        };
+        // returns if Position "pos" lies inside of this rectangle
+        that.containsPosition = function(pos) {
+            var ct = ((pos.x >= this.x) && (pos.y >= this.y)
+                    && (pos.x <= this.x + this.width) && (pos.y <= this.y
+                    + this.height));
+            return ct;
+        };
+        // returns true if rectangle "rect" is contained in this rectangle
+        that.containsRect = function(rect) {
+            return (this.containsPosition(rect.getPt1()) && this
+                    .containsPosition(rect.getPt2()));
+        };
+        // returns true if rectangle "rect" and this rectangle overlap
+        that.overlapsRect = function(rect) {
+            return this.intersect(rect) != null;
+        };
+        // changes this rectangle's x/y values so it stays inside of rectangle
+        // "rect", keeping the proportions
+        that.stayInside = function(rect) {
+            this.x = Math.max(this.x, rect.x);
+            this.y = Math.max(this.y, rect.y);
+            if (this.x + this.width > rect.x + rect.width) {
+                this.x = rect.x + rect.width - this.width;
+            }
+            if (this.y + this.height > rect.y + rect.height) {
+                this.y = rect.y + rect.height - this.height;
+            }
+            return this;
+        };
+        // clips this rectangle so it stays inside of rectangle "rect"
+        that.clipTo = function(rect) {
+            var p1 = rect.getPt1();
+            var p2 = rect.getPt2();
+            var this2 = this.getPt2();
+            this.setPosition(position(Math.max(this.x, p1.x), Math.max(this.y, p1.y)));
+            this.setPt2(position(Math.min(this2.x, p2.x), Math.min(this2.y, p2.y)));
+            return this;
+        };
+        // returns the intersection of rectangle "rect" and this one
+        that.intersect = function(rect) {
+            var r = rect.copy();
+            var result = r.clipTo(this);
+            if (result.width < 0 || result.height < 0) result = null;
+            return result;
+        };
+
+        // returns a copy of rectangle "rect" that fits into this one
+        // (moving it first)
+        that.fit = function(rect) {
+            var r = rect.copy();
+            r.x = Math.max(r.x, this.x);
+            r.y = Math.max(r.y, this.x);
+            if (r.x + r.width > this.x + this.width) {
+                r.x = this.x + this.width - r.width;
+            }
+            if (r.y + r.height > this.y + this.height) {
+                r.y = this.y + this.height - r.height;
+            }
+            return r.intersect(this);
+        };
+        // adjusts position and size of jQuery element "$elem" to this rectangle
+        that.adjustDiv = function($elem) {
+            $elem.offset({
+                left : this.x,
+                top : this.y
+            });
+            $elem.width(this.width).height(this.height);
+        };
+        // returns position and size of this rectangle in css-compatible format
+        that.getAsCss = function() {
+            return {
+                left : this.x,
+                top : this.y,
+                width : this.width,
+                height : this.height
+            };
+        };
+        // returns position and size of this rectangle formatted for SVG attributes
+        that.getAsSvg = function() {
+            return [this.x, this.y, this.width, this.height].join(" ");
+        };
+        // returns size and position of this rectangle formatted for ??? (w x h@x,y)
+        that.toString = function() {
+            return this.width + "x" + this.height + "@" + this.x + "," + this.y;
+        };
+        return that;
+    };
+
+    /*
+     * Transform class
+     * 
+     * defines a class of affine transformations
+     */
+    var transform = function(spec) {
+        var that = {
+            m00 : 1.0,
+            m01 : 0.0,
+            m02 : 0.0,
+            m10 : 0.0,
+            m11 : 1.0,
+            m12 : 0.0,
+            m20 : 0.0,
+            m21 : 0.0,
+            m22 : 1.0
+        };
+        if (spec) {
+            jQuery.extend(that, spec);
+        }
+        ;
+        that.concat = function(trafA) {
+            // add Transform trafA to this Transform (i.e. this = trafC = trafA
+            // * this)
+            var trafC = {};
+            for ( var i = 0; i < 3; i++) {
+                for ( var j = 0; j < 3; j++) {
+                    var c = 0.0;
+                    for ( var k = 0; k < 3; k++) {
+                        c += trafA["m" + i + k] * this["m" + k + j];
+                    }
+                    trafC["m" + i + j] = c;
+                }
+            }
+            jQuery.extend(this, trafC);
+            return this;
+        };
+        that.transform = function(rect) {
+            // returns transformed Rectangle or Position with this Transform
+            // applied
+            var x = this.m00 * rect.x + this.m01 * rect.y + this.m02;
+            var y = this.m10 * rect.x + this.m11 * rect.y + this.m12;
+            var pt = position(x, y);
+            if (rect.width) {
+                // transform the other corner point
+                var pt2 = this.transform(rect.getPt2());
+                return rectangle(pt, pt2);
+            }
+            return pt;
+        };
+        that.invtransform = function(rect) {
+            // returns transformed Rectangle or Position with the inverse of
+            // this Transform applied
+            var det = this.m00 * this.m11 - this.m01 * this.m10;
+            var x = (this.m11 * rect.x - this.m01 * rect.y - this.m11
+                    * this.m02 + this.m01 * this.m12)
+                    / det;
+            var y = (-this.m10 * rect.x + this.m00 * rect.y + this.m10
+                    * this.m02 - this.m00 * this.m12)
+                    / det;
+            var pt = position(x, y);
+            if (rect.width) {
+                // transform the other corner point
+                var pt2 = this.invtransform(rect.getPt2());
+                return rectangle(pt, pt2);
+            }
+            return pt;
+        };
+        that.toString = function(pretty) {
+            var s = '[';
+            if (pretty)
+                s += '\n';
+            for ( var i = 0; i < 3; ++i) {
+                s += '[';
+                for ( var j = 0; j < 3; ++j) {
+                    if (j)
+                        s += ',';
+                    s += this['m' + i + j];
+                }
+                s += ']';
+                if (pretty)
+                    s += '\n';
+            }
+            s += ']';
+            if (pretty)
+                s += '\n';
+            return s;
+        };
+        // add class methods to instance
+        that.getRotation = transform.getRotation;
+        that.getRotationAround = transform.getRotationAround;
+        that.getTranslation = transform.getTranslation;
+        that.getMirror = transform.getMirror;
+        that.getScale = transform.getScale;
+
+        return that;
+    };
+
+    transform.getRotation = function(angle) {
+        // returns a Transform that is a rotation by angle degrees around [0,0]
+        if (angle !== 0) {
+            var t = Math.PI * parseFloat(angle) / 180.0;
+            var cost = Math.cos(t);
+            var sint = Math.sin(t);
+            var traf = {
+                m00 : cost,
+                m01 : -sint,
+                m10 : sint,
+                m11 : cost
+            };
+            return transform(traf);
+        }
+        return transform();
+    };
+
+    transform.getRotationAround = function(angle, pos) {
+        // returns a Transform that is a rotation by angle degrees around pos
+        var traf = transform.getTranslation(pos.neg());
+        traf.concat(transform.getRotation(angle));
+        traf.concat(transform.getTranslation(pos));
+        return traf;
+    };
+
+    transform.getTranslation = function(pos) {
+        // returns a Transform that is a translation by [pos.x, pos,y]
+        var traf = {
+            m02 : pos.x,
+            m12 : pos.y
+        };
+        return transform(traf);
+    };
+
+    transform.getMirror = function(type) {
+        // returns a Transform that is a mirror about the axis type
+        if (type === 'x') {
+            var traf = {
+                m00 : 1,
+                m11 : -1
+            };
+        } else {
+            var traf = {
+                m00 : -1,
+                m11 : 1
+            };
+        }
+        return transform(traf);
+    };
+
+    transform.getScale = function(size) {
+        // returns a Transform that is a scale by [size.width, size.height]
+        var traf = {
+            m00 : size.width,
+            m11 : size.height
+        };
+        return transform(traf);
+    };
+
+    // export constructor functions to digilib plugin
+    var geometry = {
+            size : size,
+            position : position,
+            rectangle : rectangle,
+            transform : transform
+    };
+    // install function called by digilib on plugin object
+    var install = function() {
+        // add constructor object to fn
+        this.fn.geometry = geometry;
+    };
+    // digilib plugin object
+    var plugin = {
+            name : 'geometry',
+            install : install,
+            fn : {},
+            // TODO: remove old init
+            init : init
+    };
+    // TODO: remove old version of init returning contructor
+    var init = function () {
+        return geometry;
+    };
+    // plug into digilib
+    if ($.fn.digilib == null) {
+        $.error("jquery.digilib.geometry must be loaded after jquery.digilib!");
+    } else {
+        $.fn.digilib('plugin', plugin);
+    }
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.digilib.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1838 @@
+/* Copyright (c) 2011 Martin Raspe, Robert Casties
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+Authors:
+  Martin Raspe, Robert Casties, 11.1.2011
+*/
+
+/**
+ * digilib jQuery plugin
+**/ 
+
+/*jslint browser: true, debug: true, forin: true
+*/
+
+// fallback for console.log calls
+if (typeof console === 'undefined') {
+    var console = {
+        log : function(){}, 
+        debug : function(){}, 
+        error : function(){}
+        };
+    var customConsole = false; // set to true if debugging for MS IE
+}
+
+(function($) {
+    var buttons = {
+        reference : {
+            onclick : "reference",
+            tooltip : "get a reference URL",
+            icon : "reference.png"
+            },
+        zoomin : {
+            onclick : ["zoomBy", 1.4],
+            tooltip : "zoom in",
+            icon : "zoom-in.png"
+            },
+        zoomout : {
+            onclick : ["zoomBy", 0.7],
+            tooltip : "zoom out",
+            icon : "zoom-out.png"
+            },
+        zoomarea : {
+            onclick : "zoomArea",
+            tooltip : "zoom area",
+            icon : "zoom-area.png"
+            },
+        zoomfull : {
+            onclick : "zoomFull",
+            tooltip : "view the whole image",
+            icon : "zoom-full.png"
+            },
+        pagewidth : {
+            onclick : ["zoomFull", "width"],
+            tooltip : "page width",
+            icon : "pagewidth.png"
+            },
+        back : {
+            onclick : ["gotoPage", "-1"],
+            tooltip : "goto previous image",
+            icon : "back.png"
+            },
+        fwd : {
+            onclick : ["gotoPage", "+1"],
+            tooltip : "goto next image",
+            icon : "fwd.png"
+            },
+        page : {
+            onclick : "gotoPage",
+            tooltip : "goto image number",
+            icon : "page.png"
+            },
+        help : {
+            onclick : "showAboutDiv",
+            tooltip : "about Digilib",
+            icon : "help.png"
+            },
+        reset : {
+            onclick : "reset",
+            tooltip : "reset image",
+            icon : "reset.png"
+            },
+        mark : {
+            onclick : "setMark",
+            tooltip : "set a mark",
+            icon : "mark.png"
+            },
+        delmark : {
+            onclick : "removeMark",
+            tooltip : "delete the last mark",
+            icon : "delmark.png"
+            },
+        hmir : {
+            onclick : ["mirror", "h"],
+            tooltip : "mirror horizontally",
+            icon : "mirror-horizontal.png"
+            },
+        vmir : {
+            onclick : ["mirror", "v"],
+            tooltip : "mirror vertically",
+            icon : "mirror-vertical.png"
+            },
+        rot : {
+            onclick : "rotate",
+            tooltip : "rotate image",
+            icon : "rotate.png"
+            },
+        brgt : {
+            onclick : "brightness",
+            tooltip : "set brightness",
+            icon : "brightness.png"
+            },
+        cont : {
+            onclick : "contrast",
+            tooltip : "set contrast",
+            icon : "contrast.png"
+            },
+        rgb : {
+            onclick : "javascript:setParamWin('rgb', '...')",
+            tooltip : "set rgb values",
+            icon : "rgb.png"
+            },
+        quality : {
+            onclick : "setQuality",
+            tooltip : "set image quality",
+            icon : "quality.png"
+            },
+        size : {
+            onclick : "javascript:toggleSizeMenu()",
+            tooltip : "set page size",
+            icon : "size.png"
+            },
+        calibrationx : {
+            onclick : "calibrate",
+            tooltip : "calibrate screen resolution",
+            icon : "calibration-x.png"
+            },
+        scale : {
+            onclick : "setScaleMode",
+            tooltip : "change image scale",
+            icon : "original-size.png"
+            },
+        toggleoptions : {
+            onclick : "moreButtons",
+            tooltip : "more options",
+            icon : "options.png"
+            },
+        moreoptions : {
+            onclick : ["moreButtons", "+1"],
+            tooltip : "more options",
+            icon : "options.png"
+            },
+        lessoptions : {
+            onclick : ["moreButtons", "-1"],
+            tooltip : "less options",
+            icon : "options.png"
+            },
+        up : {
+            onclick : ["moveZoomArea", 0, -1],
+            tooltip : "move zoom area up",
+            icon : "up.png"
+            },
+        down : {
+            onclick : ["moveZoomArea", 0, 1],
+            tooltip : "move zoom area down",
+            icon : "down.png"
+            },
+        left : {
+            onclick : ["moveZoomArea", -1, 0],
+            tooltip : "move zoom area left",
+            icon : "left.png"
+            },
+        right : {
+            onclick : ["moveZoomArea", 1, 0],
+            tooltip : "move zoom area right",
+            icon : "right.png"
+            },
+        SEP : {
+            icon : "sep.png"
+            }
+        };
+
+    var defaults = {
+        // version of this script
+        'version' : 'jquery.digilib.js 0.9',
+        // logo url
+        'logoUrl' : '../img/digilib-logo-text1.png',
+        // homepage url (behind logo)
+        'homeUrl' : 'http://digilib.berlios.de',
+        // base URL to digilib viewer (for reference URLs)
+        'digilibBaseUrl' : null,
+        // base URL to Scaler servlet
+        'scalerBaseUrl' : null,
+        // list of Scaler parameters
+        'scalerParamNames' : ['fn','pn','dw','dh','ww','wh','wx','wy','ws','mo',
+                              'rot','cont','brgt','rgbm','rgba','ddpi','ddpix','ddpiy'],
+        // Scaler parameter defaults
+        'pn' : 1,
+        'ww' : 1.0,
+        'wh' : 1.0,
+        'wx' : 0.0,
+        'wy' : 0.0,
+        'ws' : 1.0,
+        'mo' : '',
+        'rot' : 0,
+        'cont' : 0,
+        'brgt' : 0,
+        'rgbm' : '0/0/0',
+        'rgba' : '0/0/0',
+        'ddpi' : null,
+        'ddpix' : null,
+        'ddpiy' : null,
+        // list of digilib parameters
+        'digilibParamNames' : ['fn','pn','ww','wh','wx','wy','ws','mo','rot','cont','brgt','rgbm','rgba','ddpi','mk','clop'],
+        // digilib parameter defaults
+        'mk' : '',
+        'clop' : '',
+        // mode of operation: 
+        // fullscreen = take parameters from page URL, keep state in page URL
+        // embedded = take parameters from Javascript options, keep state inside object 
+        'interactionMode' : 'fullscreen',
+        // buttons
+        'buttons' : buttons,
+        // defaults for digilib buttons
+        'buttonSettings' : {
+            'fullscreen' : {
+                // path to button images (must end with a slash)
+                'imagePath' : 'img/fullscreen/',
+                'buttonSetWidth' : 36,
+                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","help","reset","toggleoptions"],
+                'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","size","calibrationx","scale","lessoptions"],
+                'arrowSet' : ["up", "down", "left", "right"],
+                'buttonSets' : ['standardSet', 'specialSet']
+                },
+            'embedded' : {
+                'imagePath' : 'img/embedded/16/',
+                'buttonSetWidth' : 18,
+                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","help","reset","toggleoptions"],
+                'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","scale","lessoptions"],
+                'arrowSet' : ["up", "down", "left", "right"],
+                'buttonSets' : ['standardSet', 'specialSet']
+                },
+        },
+        // arrow bar overlays for moving the zoomed area
+        'showZoomArrows' : true,
+        // zoom arrow bar minimal width (for small images)
+        'zoomArrowMinWidth' : 6,
+        // zoom arrow bar standard width
+        'zoomArrowWidth' : 32,
+        // by what percentage should the arrows move the zoomed area?
+        'zoomArrowMoveFactor' : 0.5,
+        // number of visible button groups
+        'visibleButtonSets' : 1,
+        // is the "about" window shown?
+        'isAboutDivVisible' : false,
+        // default size of background image for drag-scroll (same as Bird's Eye View image)
+        'bgImgWidth' : 200,
+        'bgImgHeight' : 200,
+        // maximum width or height of background image for drag-scroll
+        'maxBgSize' : 10000,
+        // parameters used by background image
+        'bgImgParams' : ['fn','pn','dw','dh','mo','rot'],
+        // reserved space in full page display (default value accounts for vertical scrollbar)
+        'scalerInset' : 10
+        };
+
+    // list of plugins
+    var plugins = {};
+    // object to export functions to plugins
+    var fn;
+    // affine geometry plugin stub
+    var geom;
+
+    var FULL_AREA;
+
+    var actions = {
+        // init: digilib initialization
+        init : function(options) {
+            // import geometry classes
+            if (plugins.geometry == null) {
+                $.error("jquery.digilib.geometry plugin not found!");
+                // last straw: old version
+                geom = dlGeometry();
+            } else {
+                // geometry plugin puts classes in the shared fn
+                geom = fn.geometry;
+            }
+            FULL_AREA  = geom.rectangle(0, 0, 1, 1);
+
+            // settings for this digilib instance are merged from defaults and options
+            var settings = $.extend({}, defaults, options);
+            var isFullscreen = settings.interactionMode === 'fullscreen';
+            var queryParams = {};
+            if (isFullscreen) {
+                queryParams = parseQueryParams();
+                // check scalerBaseUrl
+                if (settings.scalerBaseUrl == null) {
+                    // try the host this came from
+                    var h = window.location.host;
+                    if (window.location.host) {
+                        var url = window.location.href;
+                        // assume the page lives in [webapp]/jquery/
+                        var pos = url.indexOf('jquery/');
+                        if (pos > 0) {
+                            settings.scalerBaseUrl = url.substring(0, pos) + 'servlet/Scaler';
+                        }
+                    }
+                }
+            }
+            return this.each(function() {
+                var $elem = $(this);
+                var data = $elem.data('digilib');
+                var params, elemSettings;
+                // if the plugin hasn't been initialized yet
+                if (!data) {
+                    // merge query parameters
+                    if (isFullscreen) {
+                        params = queryParams;
+                    } else {
+                        params = parseImgParams($elem);
+                        if ($.cookie) {
+                            // retrieve params from cookie
+                            var ck = "digilib-embed:fn:" + escape(params.fn) + ":pn:" + (params.pn || '1');
+                            var cs = $.cookie(ck);
+                            console.debug("get cookie=", ck, " value=", cs);
+                            if (cs) {
+                                var cp = parseQueryString(cs);
+                                // ignore fn and pn from cookie TODO: should we keep pn?
+                                delete cp.fn;
+                                delete cp.pn;
+                                $.extend(params, cp);
+                            }
+                        }
+                    }
+                    // setup $elem.data, needs "deep copy" because of nesting
+                    elemSettings = $.extend(true, {}, settings, params);
+                    data = {
+                            // let $(this) know about $(this) :-)
+                            $elem : $elem,
+                            // let $elem have its own copy of settings
+                            settings : elemSettings,
+                            // and of the URL query parameters
+                            queryParams : params,
+                            // TODO: move plugins reference out of data
+                            plugins : plugins
+                    };
+                    // store in jQuery data element
+                    $elem.data('digilib', data);
+                }
+                unpackParams(data);
+                // check if browser knows *background-size
+                for (var bs in {'':1, '-moz-':1, '-webkit-':1, '-o-':1}) {
+                    if ($elem.css(bs+'background-size')) {
+                        data.hasBgSize = true;
+                        data.bgSizeName = bs+'background-size';
+                        break;
+                    }
+                }
+                // check digilib base URL
+                if (elemSettings.digilibBaseUrl == null) {
+                    if (isFullscreen) {
+                        // take current host
+                        var url = window.location.toString();
+                        var pos = url.indexOf('?');
+                        elemSettings.digilibBaseUrl = url.substring(0, pos);
+                    } else {
+                        var url = elemSettings.scalerBaseUrl;
+                        if (url) {
+                            // build it from scaler URL
+                            var bp = url.indexOf('/servlet/Scaler');
+                            elemSettings.digilibBaseUrl = url.substring(0, bp) + '/digilib.jsp';
+                        }
+                    }
+                }
+                // initialise plugins
+                for (n in plugins) {
+                    var p = plugins[n];
+                    if (typeof p.init === 'function') {
+                        p.init(data);
+                    }
+                }
+                // get image info from server if needed
+                if (data.scaleMode === 'pixel' || data.scaleMode === 'size') {
+                    $(data).bind('imageInfo', handleImageInfo);
+                    loadImageInfo(data); // triggers "imageInfo" on completion
+                }
+                // create buttons before scaler 
+                for (var i = 0; i < elemSettings.visibleButtonSets; ++i) {
+                    showButtons(data, true, i);
+                    }
+                // create HTML structure for scaler, taking width of buttons div into account
+                setupScalerDiv(data);
+                highlightButtons(data);
+                // about window creation - TODO: could be deferred? restrict to only one item?
+                setupAboutDiv(data);
+                // arrow overlays for moving zoomed detail
+                setupZoomArrows(data);
+                // send setup event
+                $(data).trigger('setup');
+            });
+        },
+
+        // destroy: clean up digilib
+        destroy : function(data) {
+            return this.each(function(){
+                var $elem = $(this);
+                $(window).unbind('.digilib'); // unbind all digilibs(?)
+                data.digilib.remove();
+                $elem.removeData('digilib');
+            });
+        },
+
+        // show or hide the 'about' window
+        showAboutDiv : function(data, show) {
+            var on = showDiv(data.settings.isAboutDivVisible, data.$aboutDiv, show);
+            data.settings.isAboutDivVisible = on;
+            highlightButtons(data, 'help', on);
+        },
+
+        // goto given page nr (+/-: relative)
+        gotoPage : function (data, pageNr) {
+            var settings = data.settings;
+            var oldpn = settings.pn;
+            if (pageNr == null) {
+                pageNr = window.prompt("Goto page number", oldpn);
+            }
+            var pn = setNumValue(settings, "pn", pageNr);
+            if (pn == null) return false; // nothing happened
+            if (pn < 1) {
+                alert("no such page (page number too low)");
+                settings.pn = oldpn;
+                return false;
+                }
+            // TODO: how do we get pt?
+            if (settings.pt) {
+                if (pn > settings.pt) {
+                    alert("no such page (page number too high)");
+                    settings.pn = oldpn;
+                    return false;
+                    }
+                }
+            // reset mk and others(?)
+            data.marks = [];
+            data.zoomArea = FULL_AREA;
+            // then reload
+            redisplay(data);
+        },
+
+        // zoom by a given factor
+        zoomBy : function (data, factor) {
+            zoomBy(data, factor);
+        },
+
+        // zoom to area (or interactive)
+        zoomArea : function (data, area) {
+            var settings = data.settings;
+            if (area == null) {
+                // interactively
+                zoomArea(data);
+            } else {
+                data.zoomArea = geom.rectangle(area);
+                redisplay(data);
+            }
+        },
+
+        // zoom out to full page
+        zoomFull : function (data, mode) {
+            data.zoomArea = FULL_AREA;
+            if (mode === 'width') {
+                data.dlOpts.fitwidth = 1;
+                delete data.dlOpts.fitheight;
+            } else if (mode === 'height') {
+                data.dlOpts.fitheight = 1;
+                delete data.dlOpts.fitwidth;
+            } else {
+                delete data.dlOpts.fitwidth;
+                delete data.dlOpts.fitheight;
+            }
+            redisplay(data);
+        },
+
+        // move zoomed area
+        moveZoomArea : function (data, dx, dy) {
+            var za = data.zoomArea;
+            var factor = data.settings.zoomArrowMoveFactor;
+            var deltaX = dx * factor * za.width;
+            var deltaY = dy * factor * za.height;
+            za.addPosition(geom.position(deltaX, deltaY));
+            data.zoomArea = FULL_AREA.fit(za);
+            redisplay(data);
+        },
+
+        // set a mark by clicking (or giving a position)
+        setMark : function (data, mpos) {
+            if (mpos == null) {
+                // interactive
+                setMark(data);
+            } else {
+                // use position
+                data.marks.push(pos);
+                redisplay(data);
+            }
+        },
+
+        // remove the last mark
+        removeMark : function (data) {
+            data.marks.pop();
+            redisplay(data);
+        },
+
+        // mirror the image
+        mirror : function (data, mode) {
+            var flags = data.scalerFlags;
+            if (mode === 'h') {
+                if (flags.hmir) {
+                    delete flags.hmir;
+                } else {
+                    flags.hmir = 1;
+                }
+            } else {
+                if (flags.vmir) {
+                    delete flags.vmir;
+                } else {
+                    flags.vmir = 1;
+                }
+            }
+            redisplay(data);
+        },
+
+        // rotate the image
+        rotate : function (data, angle) {
+            var rot = data.settings.rot;
+            if (angle == null) {
+                angle = window.prompt("Rotation angle:", rot);
+            }
+            data.settings.rot = angle;
+            redisplay(data);
+        },
+
+        // change brightness
+        brightness : function (data, factor) {
+            var brgt = data.settings.brgt;
+            if (factor == null) {
+                factor = window.prompt("Brightness (-255..255)", brgt);
+            }
+            data.settings.brgt = factor;
+            redisplay(data);
+        },
+
+        // change contrast
+        contrast : function (data, factor) {
+            var cont = data.settings.cont;
+            if (factor == null) {
+                factor = window.prompt("Contrast (-8, 8)", cont);
+            }
+            data.settings.cont = factor;
+            redisplay(data);
+        },
+
+        // display more (or less) button sets
+        moreButtons : function (data, more) {
+            var settings = data.settings;
+            if (more == null) {
+                // toggle more or less (only works for 2 sets)
+                var maxbtns = settings.buttonSettings[settings.interactionMode].buttonSets.length;
+                if (settings.visibleButtonSets >= maxbtns) {
+                    more = '-1';
+                } else {
+                    more = '+1';
+                }
+            }
+            if (more === '-1') {
+                // remove set
+                var setIdx = settings.visibleButtonSets - 1;
+                if (showButtons(data, false, setIdx, true)) {
+                    settings.visibleButtonSets--;
+                }
+            } else {
+                // add set
+                var setIdx = settings.visibleButtonSets;
+                if (showButtons(data, true, setIdx, true)) {
+                    settings.visibleButtonSets++;
+                }
+            }
+            // persist setting
+            storeOptions(data);
+        },
+
+        // reset image parameters to defaults
+        reset : function (data) {
+            var settings = data.settings;
+            var paramNames = settings.digilibParamNames;
+            var params = data.queryParams;
+            // delete all digilib parameters
+            for (var i = 0; i < paramNames.length; i++) {
+                var paramName = paramNames[i];
+                delete settings[paramName];
+                }
+            settings.fn = params.fn || ''; // no default defined
+            settings.pn = params.pn || defaults.pn;
+            settings.dw = params.dw;
+            settings.dh = params.dh;
+            settings.isBirdDivVisible = false;
+            settings.visibleButtonSets = 1;
+            // resets zoomArea, marks, scalerflags
+            data.zoomArea = FULL_AREA;
+            data.marks = [];
+            data.scalerFlags = {};
+            delete data.dlOpts.fitwidth;
+            delete data.dlOpts.fitheight;
+            redisplay(data);
+        },
+
+        // presents a reference url (returns value if noprompt)
+        reference : function (data, noprompt) {
+            var settings = data.settings;
+            var url = getDigilibUrl(data);
+            if (noprompt == null) {
+                window.prompt("URL reference to the current view", url);
+            }
+            return url;
+        },
+
+        // set image quality
+        setQuality : function (data, qual) {
+            var oldq = getQuality(data);
+            if (qual == null) {
+                qual = window.prompt("Image quality (0..2)", oldq);
+            }
+            qual = parseInt(qual, 10);
+            if (qual >= 0 && qual <= 2) {
+                setQuality(data, qual);
+                redisplay(data);
+            }
+        },
+
+        // calibrate (only faking)
+        calibrate : function (data, res) {
+            var oldRes = data.settings.ddpi;
+            if (res == null) {
+                res = window.prompt("Display resolution (dpi)", oldRes);
+            }
+            if (res != null) {
+                data.settings.ddpi = res;
+                redisplay(data);
+            }
+        },
+
+        // set image scale mode
+        setScaleMode : function (data, mode) {
+            var oldM = getScaleMode(data);
+            if (mode == null) {
+                mode = window.prompt("Image scale mode (screen, pixel, size)", oldM);
+            }
+            if (mode != null) {
+                setScaleMode(data, mode);
+                data.scaleMode = mode;
+                redisplay(data);
+            }
+        }
+
+    // end of actions
+    };
+
+    // returns parameters from page url
+    var parseQueryParams = function() {
+        return parseQueryString(window.location.search.slice(1));
+    };
+
+    // returns parameters from embedded img-element
+    var parseImgParams = function($elem) {
+        var src = $elem.find('img').first().attr('src');
+        if (!src) return null;
+        var pos = src.indexOf('?');
+        var query = (pos < 0) ? '' : src.substring(pos + 1);
+        var scalerUrl = src.substring(0, pos);
+        var params = parseQueryString(query);
+        params.scalerBaseUrl = scalerUrl;
+        return params;
+    };
+
+    // parses query parameter string into parameter object
+    var parseQueryString = function(query) {
+        var params = {};
+        if (query == null) return params;
+        var pairs = query.split("&");
+        //var keys = [];
+        for (var i = 0; i < pairs.length; i++) {
+            var pair = pairs[i].split("=");
+            if (pair.length === 2) {
+                params[pair[0]] = pair[1];
+                //keys.push(pair[0]);
+            }
+        }
+        return params;
+    };
+
+    // returns a query string from key names from a parameter hash (ignoring if the same value is in defaults)
+    var getParamString = function (settings, keys, defaults) {
+        var paramString = '';
+        var nx = false;
+        for (i = 0; i < keys.length; ++i) {
+            var key = keys[i];
+            if ((settings[key] != null) && ((defaults == null) || (settings[key] != defaults[key]))) {
+                // first param gets no '&'
+                if (nx) {
+                    paramString += '&';
+                } else {
+                    nx = true;
+                }
+                // add parm=val
+                paramString += key + '=' + settings[key];
+            }
+        }
+        return paramString;
+    };
+
+    // returns URL and query string for Scaler
+    var getScalerUrl = function (data) {
+        packParams(data);
+        var settings = data.settings;
+        if (settings.scalerBaseUrl == null) {
+            alert("ERROR: URL of digilib Scaler servlet missing!");
+            }
+        var keys = settings.scalerParamNames;
+        var queryString = getParamString(settings, keys, defaults);
+        var url = settings.scalerBaseUrl + '?' + queryString;
+        return url;
+    };
+
+    // returns URL for bird's eye view image
+    var getBgImgUrl = function (data, moreParams) {
+        var settings = data.settings;
+        var bgOptions = {
+                dw : settings.bgImgWidth,
+                dh : settings.bgImgHeight
+        };
+        var bgSettings = $.extend({}, settings, bgOptions);
+        // filter scaler flags
+        if (bgSettings.mo != null) {
+            var mo = '';
+            if (data.scalerFlags.hmir != null) {
+                mo += 'hmir,';
+            }
+            if (data.scalerFlags.vmir != null) {
+                mo += 'vmir';
+            }
+            bgSettings.mo = mo;
+        }
+        var params = getParamString(bgSettings, settings.bgImgParams, defaults);
+        var url = settings.scalerBaseUrl + '?' + params;
+        return url;
+    };
+
+    // returns URL and query string for current digilib
+    var getDigilibUrl = function (data) {
+        packParams(data);
+        var settings = data.settings;
+        var queryString = getParamString(settings, settings.digilibParamNames, defaults);
+        return settings.digilibBaseUrl + '?' + queryString;
+    };
+
+    // loads image information from digilib server via HTTP
+    var loadImageInfo = function (data) {
+        var settings = data.settings;
+        var p = settings.scalerBaseUrl.indexOf('/servlet/Scaler');
+        var url = settings.scalerBaseUrl.substring(0, p) + '/ImgInfo-json.jsp';
+        url += '?' + getParamString(settings, ['fn', 'pn'], defaults);
+        // TODO: better error handling
+        $.getJSON(url, function (json) {
+            console.debug("got json data=", json);
+            data.imgInfo = json;
+            // send event
+            $(data).trigger('imageInfo', [json]);
+        });
+    };
+
+    // processes some parameters into objects and stuff
+    var unpackParams = function (data) {
+        var settings = data.settings;
+        // zoom area
+        var zoomArea = geom.rectangle(settings.wx, settings.wy, settings.ww, settings.wh);
+        data.zoomArea = zoomArea;
+        // marks
+        var marks = [];
+        if (settings.mk) {
+            var mk = settings.mk;
+            if (mk.indexOf(";") >= 0) {
+                var pa = mk.split(";");    // old format with ";"
+            } else {
+                var pa = mk.split(",");    // new format
+            }
+            for (var i = 0; i < pa.length ; i++) {
+                var pos = pa[i].split("/");
+                if (pos.length > 1) {
+                    marks.push(geom.position(pos[0], pos[1]));
+                    }
+                }
+            }
+        data.marks = marks;
+        // mo (Scaler flags)
+        var flags = {};
+        if (settings.mo) {
+            var pa = settings.mo.split(",");
+            for (var i = 0; i < pa.length ; i++) {
+                flags[pa[i]] = pa[i];
+                }
+            }
+        data.scalerFlags = flags;
+        data.scaleMode = getScaleMode(data);
+        retrieveOptions(data);
+    };
+
+    // put area into parameters
+    var packArea = function (settings, area) {
+        if (!area) return;
+        // zoom area
+        settings.wx = cropFloat(area.x);
+        settings.wy = cropFloat(area.y);
+        settings.ww = cropFloat(area.width);
+        settings.wh = cropFloat(area.height);
+    };
+
+    // put marks into parameters
+    var packMarks = function (settings, marks) {
+        if (!marks) return;
+        settings.mk = '';
+        for (var i = 0; i < marks.length; i++) {
+            if (i) {
+                settings.mk += ',';
+                }
+            settings.mk +=
+                cropFloatStr(marks[i].x) + '/' + 
+                cropFloatStr(marks[i].y);
+            }
+    };
+
+    // pack scaler flags into parameters
+    var packScalerFlags = function (settings, flags) {
+        if (!flags) return;
+        var mo = '';
+        for (var f in flags) {
+            if (mo) {
+                mo += ',';
+            }
+            mo += f;
+        }
+        settings.mo = mo;
+    };
+
+    // put objects back into parameters
+    var packParams = function (data) {
+        var settings = data.settings;
+        packArea(settings, data.zoomArea);
+        packMarks(settings, data.marks);
+        packScalerFlags(settings, data.scalerFlags);
+        // store user interface options in cookie
+        storeOptions(data);
+    };
+
+    var storeOptions = function (data) {
+        // save digilib options in cookie
+        var settings = data.settings;
+        if (data.dlOpts) {
+            // save digilib settings in options
+            data.dlOpts.birdview = settings.isBirdDivVisible ? 1 : 0;
+            data.dlOpts.buttons = settings.visibleButtonSets;
+            var clop = '';
+            for (var o in data.dlOpts) {
+                if (clop) {
+                    clop += '&';
+                    }
+                clop += o + '=' + data.dlOpts[o];
+                }
+            if ($.cookie) {
+                var ck = "digilib:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+                console.debug("set cookie=", ck, " value=", clop);
+                $.cookie(ck, clop);
+                }
+        }
+        if (settings.interactionMode !== 'fullscreen' && $.cookie) {
+            // store normal parameters in cookie for embedded mode
+            var qs = getParamString(settings, settings.digilibParamNames, defaults);
+            var ck = "digilib-embed:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+            console.debug("set cookie=", ck, " value=", qs);
+            $.cookie(ck, qs);
+        }
+    };
+
+    var retrieveOptions = function (data) {
+        // clop (digilib options)
+        var opts = {};
+        var settings = data.settings;
+        if ($.cookie) {
+            // read from cookie
+            var ck = "digilib:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+            var cp = $.cookie(ck);
+            console.debug("get cookie=", ck, " value=", cp);
+            // in query string format
+            opts = parseQueryString(cp);
+            }
+        data.dlOpts = opts;
+        // birdview option
+        if (opts.birdview != null) {
+            settings.isBirdDivVisible = opts.birdview === '1';
+            }
+        // visible button sets
+        if (opts.buttons != null) {
+            settings.visibleButtonSets = opts.buttons;
+            }
+    };
+
+    // (re)load the img from a new scaler URL
+    var redisplay = function (data) {
+        var settings = data.settings; 
+        if (settings.interactionMode === 'fullscreen') {
+            // update location.href (browser URL) in fullscreen mode
+            var url = getDigilibUrl(data);
+            var history = window.history;
+            if (typeof history.pushState === 'function') {
+                console.debug("faking reload to "+url);
+                // change url without reloading (stateObj, title, url)
+                // TODO: we really need to push the state in stateObj and listen to pop-events
+                history.replaceState({}, '', url);
+                // change img src
+                var imgurl = getScalerUrl(data);
+                data.$img.attr('src', imgurl);
+                highlightButtons(data);
+                // send event
+                $(data).trigger('redisplay');
+            } else {
+                // reload window
+                window.location = url;
+            }
+        } else {
+            // embedded mode -- just change img src
+            var url = getScalerUrl(data);
+            data.$img.attr('src', url);
+            highlightButtons(data);
+            // send event
+            $(data).trigger('redisplay');
+            }
+    };
+
+    // update display (overlays etc.)
+    var updateDisplay = function (data) {
+        updateImgTrafo(data);
+        renderMarks(data);
+        setupZoomDrag(data);
+        renderZoomArrows(data);
+        // send event
+        $(data).trigger('update');
+    };
+
+    // returns maximum size for scaler img in fullscreen mode
+    var getFullscreenImgSize = function (data) {
+        var mode = data.settings.interactionMode;
+        var $win = $(window);
+        var winH = $win.height();
+        var winW = $win.width();
+        var $body = $('body');
+        // include standard body margins and check plausibility
+        var borderW = $body.outerWidth(true) - $body.width();
+        if (borderW === 0 || borderW > 100) {
+            console.debug("fixing border width for getFullscreenImgSize!");
+            borderW = data.settings.scalerInset;
+        }
+        var borderH = $body.outerHeight(true) - $body.height();
+        if (borderH === 0 || borderH > 100) {
+            console.debug("fixing border height for getFullscreenImgSize!");
+            borderH = 5;
+        }
+        var buttonsW = 0; 
+        if (data.settings.visibleButtonSets) {
+            // get button width from settings
+            buttonsW = data.settings.buttonSettings[mode].buttonSetWidth;
+            // TODO: leave space for all button sets?
+        }
+        // account for left/right border, body margins and additional requirements
+        var imgW = winW - borderW - buttonsW;
+        var imgH = winH - borderH;
+        console.debug(winW, winH, 'winW:', $win.width(), 'border:', borderW, 'buttonsW:', buttonsW, 'calc:', imgW);
+        return geom.size(imgW, imgH);
+    };
+
+    // creates HTML structure for digilib in elem
+    var setupScalerDiv = function (data) {
+        var settings = data.settings;
+        var $elem = data.$elem;
+        $elem.addClass('digilib');
+        var $img;
+        var scalerUrl;
+        if (settings.interactionMode === 'fullscreen') {
+            // fullscreen
+            $elem.addClass('dl_fullscreen');
+            var imgSize = getFullscreenImgSize(data);
+            // fitwidth/height omits destination height/width
+            if (data.dlOpts.fitheight == null) {
+                settings.dw = imgSize.width;
+            }
+            if (data.dlOpts.fitwidth == null) {
+                settings.dh = imgSize.height;
+            }
+            scalerUrl = getScalerUrl(data);
+            $img = $('<img/>');
+        } else {
+            // embedded mode -- try to keep img tag
+            $elem.addClass('dl_embedded');
+            scalerUrl = getScalerUrl(data);
+            $img = $elem.find('img');
+            if ($img.length > 0) {
+                var oldUrl = $img.attr('src');
+                // keep img attributes from html
+                var title = $img.attr('title');
+                var alt = $img.attr('alt');
+                if (oldUrl === scalerUrl) {
+                    console.debug("img detach:", $img);
+                    $img.detach();
+                } else {
+                    $img = $('<img/>');
+                    $img.attr("title", title);
+                    $img.attr("alt", alt);
+                }
+            } else {
+                $img = $('<img/>');
+            }
+        }
+        // create new inner html, keeping buttons and content marked with "keep" class
+        $elem.contents(":not(.keep)").remove();
+        var $scaler = $('<div class="scaler"/>');
+        // scaler should be the first child element?
+        $elem.prepend($scaler);
+        $scaler.append($img);
+        $img.addClass('pic');
+        data.$scaler = $scaler;
+        data.$img = $img;
+        // setup image load handler before setting the src attribute (IE bug)
+        $img.load(scalerImgLoadedHandler(data));
+        $img.error(function () {console.error("error loading scaler image");});
+        $img.attr('src', scalerUrl);
+    };
+
+    // creates HTML structure for a single button
+    var createButton = function (data, $div, buttonName) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var mode = settings.interactionMode;
+        var imagePath = settings.buttonSettings[mode].imagePath;
+        var buttonConfig = settings.buttons[buttonName];
+        // button properties
+        var action = buttonConfig.onclick;
+        var tooltip = buttonConfig.tooltip;
+        var icon = imagePath + buttonConfig.icon;
+        // construct the button html
+        var $button = $('<div class="button"></div>');
+        var $a = $('<a/>');
+        var $img = $('<img class="button"/>');
+        $div.append($button);
+        $button.append($a);
+        $a.append($img);
+        // add attributes and bindings
+        $button.attr('title', tooltip);
+        $button.addClass('button-' + buttonName);
+        $img.attr('src', icon);
+        // create handler for the buttons
+        $button.bind('click.digilib', (function () {
+            // we create a new closure to capture the value of action
+            if ($.isArray(action)) {
+                // the handler function calls digilib with action and parameters
+                return function (evt) {
+                    console.debug('click action=', action, ' evt=', evt);
+                    $elem.digilib.apply($elem, action);
+                    return false;
+                };
+            } else {
+                // the handler function calls digilib with action
+                return function (evt) {
+                    console.debug('click action=', action, ' evt=', evt);
+                    $elem.digilib(action);
+                    return false;
+                };
+            }
+        })());
+    };
+
+    // creates HTML structure for buttons in elem
+    var createButtons = function (data, buttonSetIdx) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var mode = settings.interactionMode;
+        var buttonSettings = settings.buttonSettings[mode];
+        var buttonGroup = buttonSettings.buttonSets[buttonSetIdx];
+        if (buttonGroup == null) {
+            // no buttons here
+            return;
+        }
+        // button divs are marked with class "keep"
+        var $buttonsDiv = $('<div class="keep buttons"/>');
+        var buttonNames = buttonSettings[buttonGroup];
+        for (var i = 0; i < buttonNames.length; i++) {
+            var buttonName = buttonNames[i];
+            createButton(data, $buttonsDiv, buttonName);
+        }
+        // make buttons div scroll if too large for window
+        if ($buttonsDiv.height() > $(window).height() - 10) {
+            $buttonsDiv.css('position', 'absolute');
+        }
+        // buttons hidden at first
+        $buttonsDiv.hide();
+        $elem.append($buttonsDiv);
+        if (data.$buttonSets == null) {
+            // first button set
+            data.$buttonSets = [$buttonsDiv];
+        } else {
+            $elem.append($buttonsDiv);
+            data.$buttonSets[buttonSetIdx] = $buttonsDiv;
+        }
+        return $buttonsDiv;
+    };
+
+    // creates arrow overlays for moving the zoomed area
+    var setupZoomArrows = function (data) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var show = settings.showZoomArrows;
+        console.log('zoom arrows:', show);
+        if (!show) return;
+        var mode = settings.interactionMode;
+        var arrowNames = settings.buttonSettings[mode].arrowSet;
+        if (arrowNames == null) return;
+        // arrow divs are marked with class "keep"
+        var $arrowsDiv = $('<div class="keep arrows"/>');
+        $elem.append($arrowsDiv);
+        // create all arrow buttons
+        $.each(arrowNames, function(i, arrowName){
+            createButton(data, $arrowsDiv, arrowName);
+            });
+    };
+
+    // size and show arrow overlays, called after scaler img is loaded
+    var renderZoomArrows = function (data) {
+        var settings = data.settings;
+        var $arrowsDiv = data.$elem.find('div.arrows');
+        if (isFullArea(data.zoomArea) || !settings.showZoomArrows) {
+            $arrowsDiv.hide();
+            return;
+            }
+        $arrowsDiv.show();
+        var r = geom.rectangle(data.$scaler);
+        // calculate arrow bar width
+        var aw = settings.zoomArrowWidth;
+        var minWidth = settings.zoomArrowMinWidth;
+        // arrow bar width should not exceed 10% of scaler width/height
+        var maxWidth = Math.min(r.width, r.height)/10;
+        if (aw > maxWidth) {
+            aw = maxWidth;
+            if (aw < minWidth) {
+                aw = minWidth;
+            }
+        }
+        // vertical position of left/right image
+        var arrowData = [{
+            name : 'up',
+            rect : geom.rectangle(r.x, r.y, r.width, aw), 
+            show : canMove(data, 0, -1)
+        }, {
+            name : 'down',
+            rect : geom.rectangle(r.x, r.y + r.height - aw, r.width, aw),
+            show : canMove(data, 0, 1)
+        }, {
+            name : 'left',
+            rect : geom.rectangle(r.x, r.y, aw, r.height),
+            show : canMove(data, -1, 0)
+        }, {
+            name : 'right',
+            rect : geom.rectangle(r.x + r.width - aw, r.y, aw, r.height),
+            show : canMove(data, 1, 0)
+        }];
+        // render a single zoom Arrow
+        var render = function (i, item) {
+            var $arrow = $arrowsDiv.find('div.button-' + item.name);
+            if (item.show) {
+                $arrow.show();
+            } else {
+                $arrow.hide();
+                return;
+            }
+            var r = item.rect; 
+            r.adjustDiv($arrow);
+            var $a = $arrow.contents('a');
+            var $img = $a.contents('img');
+            $img.width(aw).height(aw);
+            // hack for missing vertical-align
+            if (item.name.match(/left|right/)) {
+                var top = (r.height - $a.height())/2;
+                $a.css({'top' : top}); // position : 'relative'
+                }
+        };
+        $.each(arrowData, render);
+    };
+
+    // creates HTML structure for the about view in elem
+    var setupAboutDiv = function (data) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var $aboutDiv = $('<div class="about" style="display:none"/>');
+        var $header = $('<p>Digilib Image Viewer</p>');
+        var $link = $('<a/>');
+        var $logo = $('<img class="logo" title="digilib"/>');
+        var $content = $('<p/>');
+        $elem.append($aboutDiv);
+        $aboutDiv.append($header);
+        $aboutDiv.append($link);
+        $aboutDiv.append($content);
+        $link.append($logo);
+        $logo.attr('src', settings.logoUrl);
+        $link.attr('href', settings.homeUrl);
+        $content.text('Version: ' + settings.version);
+        data.$aboutDiv = $aboutDiv;
+        // click hides
+        $aboutDiv.bind('click.digilib', function () {
+            actions['showAboutDiv'](data, false);
+            });
+    };
+
+    // shows some window e.g. 'about' (toggle visibility if show is null)
+    var showDiv = function (isVisible, $div, show) {
+        if (show == null) {
+            // toggle visibility
+            isVisible = !isVisible;
+        } else {
+            // set visibility
+            isVisible = show;
+            }
+        if (isVisible) {
+            $div.fadeIn();
+        } else {
+            $div.fadeOut();
+            }
+        return isVisible;
+    };
+
+    // display more (or less) button sets
+    var showButtons = function (data, more, setIdx, animated) {
+        var atime = animated ? 'fast': 0;
+        // get button width from settings
+        var mode = data.settings.interactionMode;
+        var btnWidth = data.settings.buttonSettings[mode].buttonSetWidth;
+        if (more) {
+            // add set
+            var $otherSets = data.$elem.find('div.buttons:visible');
+            var $set;
+            if (data.$buttonSets && data.$buttonSets[setIdx]) {
+                // set exists
+                $set = data.$buttonSets[setIdx];
+            } else {
+                $set = createButtons(data, setIdx);
+                }
+            if ($set == null) return false;
+            // include border in calculation
+            //var btnWidth = $set.outerWidth();
+            // console.debug("btnWidth", btnWidth);
+            // move remaining sets left and show new set
+            if ($otherSets.length > 0) {
+                    $otherSets.animate({right : '+='+btnWidth+'px'}, atime,
+                            function () {$set.show();});
+            } else {
+                $set.show();
+            }
+        } else {
+            // remove set
+            var $set = data.$buttonSets[setIdx];
+            if ($set == null) return false;
+            //var btnWidth = $set.outerWidth();
+            // hide last set
+            $set.hide();
+            // take remaining sets and move right
+            var $otherSets = data.$elem.find('div.buttons:visible');
+            $otherSets.animate({right : '-='+btnWidth+'px'}, atime);
+        }
+        return true;
+    };
+
+    // check for buttons to highlight
+    var highlightButtons = function (data, name, on) {
+        var $buttons = data.$elem.find('div.buttons:visible'); // include hidden?
+        // add a class for highlighted button
+        var highlight = function (name, on) {
+            var $button = $buttons.find('div.button-' + name);
+            if (on) {
+                $button.addClass('button-on');
+            } else {
+                $button.removeClass('button-on');
+            }
+        };
+        if (name != null) {
+            return highlight(name, on);
+            }
+        var flags = data.scalerFlags;
+        var settings = data.settings;
+        highlight('rot', settings.rot);
+        highlight('brgt', settings.brgt);
+        highlight('cont', settings.cont);
+        highlight('bird', settings.isBirdDivVisible);
+        highlight('help', settings.isAboutDivVisible);
+        highlight('hmir', flags.hmir);
+        highlight('vmir', flags.vmir);
+        highlight('quality', flags.q1 || flags.q2);
+        highlight('zoomin', ! isFullArea(data.zoomArea));
+        };
+
+    // create Transform from area and $img
+    var getImgTrafo = function ($img, area, rot, hmir, vmir, mode, data) {
+        var picrect = geom.rectangle($img);
+        if (mode != null) {
+            var imgInfo = data.imgInfo;
+            if (mode === 'pixel') {
+                // scaler mo=clip - image area size does not come from ww, wh
+                if (imgInfo != null) {
+                    area.width = picrect.width / imgInfo.width;
+                    area.height = picrect.height / imgInfo.height;
+                } else {
+                    console.error("No image info for pixel mode!");
+                }
+            }
+            if (mode === 'size') {
+                // scaler mo=osize - image area size does not come from ww, wh
+                if (imgInfo != null) {
+                    var ddpi = parseFloat(data.settings.ddpi);
+                    area.width = (picrect.width / ddpi) / (imgInfo.width / imgInfo.dpi_x);
+                    area.height = (picrect.height / ddpi) / (imgInfo.height / imgInfo.dpi_y);
+                } else {
+                    console.error("No image info for original size mode!");
+                }
+            }
+        }
+        var trafo = geom.transform();
+        // move zoom area offset to center
+        trafo.concat(trafo.getTranslation(geom.position(-area.x, -area.y)));
+        // scale zoom area size to [1,1]
+        trafo.concat(trafo.getScale(geom.size(1/area.width, 1/area.height)));
+        // rotate and mirror (around transformed image center i.e. [0.5,0.5])
+        if (rot || hmir || vmir) {
+            // move [0.5,0.5] to center
+            trafo.concat(trafo.getTranslation(geom.position(-0.5, -0.5)));
+            if (hmir) {
+                // mirror about center
+                trafo.concat(trafo.getMirror('y'));
+                }
+            if (vmir) {
+                // mirror about center
+                trafo.concat(trafo.getMirror('x'));
+                }
+            if (rot) {
+                // rotate around center
+                trafo.concat(trafo.getRotation(parseFloat(rot)));
+                }
+            // move back
+            trafo.concat(trafo.getTranslation(geom.position(0.5, 0.5)));
+            }
+        // scale to screen position and size
+        trafo.concat(trafo.getScale(picrect));
+        trafo.concat(trafo.getTranslation(picrect));
+        return trafo;
+    };
+
+    // update scaler image transform
+    var updateImgTrafo = function (data) {
+        var $img = data.$img;
+        if ($img == null)
+            return;
+        var image  = $img.get(0);
+        var imgLoaded = $.browser.msie
+            ? image.width > 0
+            : image.complete;
+        if (imgLoaded) {
+            // create Transform from current zoomArea and image size
+            data.imgTrafo = getImgTrafo($img, data.zoomArea,
+                    data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir,
+                    data.scaleMode, data);
+            // console.debug("imgTrafo=", data.imgTrafo);
+        }
+    };
+
+    // returns handler for load event of scaler img
+    var scalerImgLoadedHandler = function (data) {
+        return function () {
+            var $img = $(this);
+            console.debug("scaler img loaded=",$img);
+            var $scaler = data.$scaler;
+            var imgRect = geom.rectangle($img);
+            // adjust scaler div size
+            imgRect.adjustDiv($scaler);
+            // show image in case it was hidden (for example in zoomDrag)
+            $img.css('visibility', 'visible');
+            $scaler.css({'opacity' : '1', 'background-image' : 'none'});
+            // update display (render marks, etc.)
+            updateDisplay(data);
+        };
+    };
+
+    // handler for imageInfo loaded event
+    var handleImageInfo = function (evt, json) {
+        var data = this;
+        updateDisplay(data);
+    };
+
+    // place marks on the image
+    var renderMarks = function (data) {
+        if (data.$img == null || data.imgTrafo == null) return;
+        console.debug("renderMarks: img=",data.$img," imgtrafo=",data.imgTrafo);
+        var $elem = data.$elem;
+        var marks = data.marks;
+        // clear marks
+        $elem.find('div.mark').remove();
+        for (var i = 0; i < marks.length; i++) {
+            var mark = marks[i];
+            if (data.zoomArea.containsPosition(mark)) {
+                var mpos = data.imgTrafo.transform(mark);
+                console.debug("renderMarks: pos=",mpos);
+                // create mark
+                var html = '<div class="mark overlay">'+(i+1)+'</div>';
+                var $mark = $(html);
+                $mark.attr("id", "digilib-mark-"+(i+1));
+                $elem.append($mark);
+                mpos.adjustDiv($mark);
+                }
+            }
+    };
+
+    // zooms by the given factor
+    var zoomBy = function(data, factor) {
+        var area = data.zoomArea;
+        var newarea = area.copy();
+        // scale
+        newarea.width /= factor;
+        newarea.height /= factor;
+        // and recenter
+        newarea.x -= 0.5 * (newarea.width - area.width);
+        newarea.y -= 0.5 * (newarea.height - area.height);
+        newarea = FULL_AREA.fit(newarea);
+        data.zoomArea = newarea;
+        redisplay(data);
+    };
+
+    // add a mark where clicked
+    var setMark = function (data) {
+        var $scaler = data.$scaler;
+        // unbind other handler
+        $scaler.unbind(".dlZoomDrag");
+        // start event capturing
+        $scaler.one('mousedown.dlSetMark', function (evt) {
+            // event handler adding a new mark
+            console.log("setmark at=", evt);
+            var mpos = geom.position(evt);
+            var pos = data.imgTrafo.invtransform(mpos);
+            data.marks.push(pos);
+            redisplay(data);
+            return false;
+        });
+    };
+
+    // zoom to the area around two clicked points
+    var zoomArea = function(data) {
+        $elem = data.$elem;
+        $scaler = data.$scaler;
+        var pt1, pt2;
+        var $zoomDiv = $('<div class="zoomrect" style="display:none"/>');
+        $elem.append($zoomDiv);
+        // $zoomDiv.css(data.settings.zoomrectStyle);
+        var picRect = geom.rectangle($scaler);
+        // FIX ME: is there a way to query the border width from CSS info?
+        // rect.x -= 2; // account for overlay borders
+        // rect.y -= 2;
+
+        var zoomStart = function (evt) {
+            pt1 = geom.position(evt);
+            // setup and show zoom div
+            pt1.adjustDiv($zoomDiv);
+            $zoomDiv.width(0).height(0);
+            $zoomDiv.show();
+            // register events
+            $elem.bind("mousemove.dlZoomArea", zoomMove);
+            $elem.bind("mouseup.dlZoomArea", zoomEnd);
+            return false;
+        };
+
+        // mouse move handler
+        var zoomMove = function (evt) {
+            pt2 = geom.position(evt);
+            var rect = geom.rectangle(pt1, pt2);
+            rect.clipTo(picRect);
+            // update zoom div
+            rect.adjustDiv($zoomDiv);
+            return false;
+        };
+
+        // mouseup handler: end moving
+        var zoomEnd = function (evt) {
+            pt2 = geom.position(evt);
+            // assume a click and continue if the area is too small
+            var clickRect = geom.rectangle(pt1, pt2);
+            if (clickRect.getArea() <= 5) return false;
+            // hide zoom div
+            $zoomDiv.remove();
+            // unregister events
+            $elem.unbind("mousemove.dlZoomArea", zoomMove);
+            $elem.unbind("mouseup.dlZoomArea", zoomEnd);
+            // clip and transform
+            clickRect.clipTo(picRect);
+            var area = data.imgTrafo.invtransform(clickRect);
+            data.zoomArea = area;
+            // zoomed is always fit
+            data.settings.ws = 1;
+            delete data.dlOpts.fitwidth;
+            delete data.dlOpts.fitheight;
+            redisplay(data);
+            return false;
+        };
+
+        // clear old handler (also ZoomDrag)
+        $scaler.unbind('.dlZoomArea');
+        $scaler.unbind(".dlZoomDrag");
+        $elem.unbind('.dlZoomArea');
+        // bind start zoom handler
+        $scaler.one('mousedown.dlZoomArea', zoomStart);
+    };
+
+    // set zoom background
+    var setZoomBG = function(data) {
+        var $scaler = data.$scaler;
+        var $img = data.$img;
+        var fullRect = null;
+        // hide the scaler img, show background of div instead
+        $img.css('visibility', 'hidden');
+        var scalerCss = {
+            'background-image' : 'url(' + $img.attr('src') + ')',
+            'background-repeat' : 'no-repeat',
+            'background-position' : 'left top',
+            'opacity' : '0.5',
+            'cursor' : 'move'
+            };
+        if (data.hasBgSize) {
+            // full-size background using CSS3-background-size
+            fullRect = data.imgTrafo.transform(FULL_AREA);
+            if (fullRect.height < data.settings.maxBgSize && fullRect.width < data.settings.maxBgSize) {
+                // correct offset because background is relative
+                var scalerPos = geom.position($scaler);
+                fullRect.addPosition(scalerPos.neg());
+                var url = getBgImgUrl(data);
+                scalerCss['background-image'] = 'url(' + url + ')';
+                scalerCss[data.bgSizeName] = fullRect.width + 'px ' + fullRect.height + 'px';
+                scalerCss['background-position'] = fullRect.x + 'px '+ fullRect.y + 'px';
+            } else {
+                // too big
+                fullRect = null;
+                }
+            }
+            $scaler.css(scalerCss);
+            // isBgReady = true;
+        return fullRect;
+    };
+
+    // setup handlers for dragging the zoomed image
+    var setupZoomDrag = function(data) {
+        var startPos, delta, fullRect;
+        var $document = $(document);
+        var $data = $(data);
+        var $elem = data.$elem;
+        var $scaler = data.$scaler;
+        var $img = data.$img;
+
+        // drag the image and load a new detail on mouse up
+        var dragStart = function (evt) {
+            console.debug("dragstart at=", evt);
+            // don't start dragging if not zoomed
+            if (isFullArea(data.zoomArea)) return false;
+            $elem.find(".overlay").hide(); // hide all overlays (marks/regions)
+            startPos = geom.position(evt);
+            delta = null;
+            // set low res background immediately on mousedown
+            fullRect = setZoomBG(data);
+            $document.bind("mousemove.dlZoomDrag", dragMove);
+            $document.bind("mouseup.dlZoomDrag", dragEnd);
+            return false;
+            };
+
+        // mousemove handler: drag zoomed image
+        var dragMove = function (evt) {
+            var pos = geom.position(evt);
+            delta = startPos.delta(pos);
+            if (fullRect) {
+                var bgPos = fullRect.getPosition().add(delta);
+            } else {
+                var bgPos = delta;
+            }
+            // move the background image to the new position
+            $scaler.css({
+                'background-position' : bgPos.x + "px " + bgPos.y + "px"
+                });
+            // send message event with current zoom position
+            var za = geom.rectangle($img);
+            za.addPosition(delta.neg());
+            $data.trigger('dragZoom', [za]);
+            //TODO: setBirdZoom(data, za);
+            return false;
+            };
+
+        // mouseup handler: reload zoomed image in new position
+        var dragEnd = function (evt) {
+            $scaler.css('cursor', 'auto');
+            $document.unbind("mousemove.dlZoomDrag", dragMove);
+            $document.unbind("mouseup.dlZoomDrag", dragEnd);
+            if (delta == null || delta.distance() < 2) {
+                // no movement
+                $img.css('visibility', 'visible');
+                $scaler.css({'opacity' : '1', 'background-image' : 'none'});
+                // unhide marks
+                data.$elem.find('div.mark').show();
+                $(data).trigger('redisplay');
+                return false; 
+            }
+            // get old zoom area (screen coordinates)
+            var za = geom.rectangle($img);
+            // move
+            za.addPosition(delta.neg());
+            // transform back
+            var newArea = data.imgTrafo.invtransform(za);
+            data.zoomArea = FULL_AREA.fit(newArea);
+            redisplay(data);
+            return false;
+            };
+
+        // clear old handler
+        $document.unbind(".dlZoomDrag");
+        $scaler.unbind(".dlZoomDrag");
+        if (! isFullArea(data.zoomArea)) {
+            // set handler
+            $scaler.bind("mousedown.dlZoomDrag", dragStart);
+        }
+    };
+
+    // get image quality as a number (0..2)
+    var getQuality = function (data) {
+        var flags = data.scalerFlags;
+        var q = flags.q2 || flags.q1 || 'q0'; // assume q0 as default
+        return parseInt(q[1], 10);
+    };
+
+    // set image quality as a number (0..2)
+    var setQuality = function (data, qual) {
+        var flags = data.scalerFlags;
+        // clear flags
+        for (var i = 0; i < 3; ++i) {
+            delete flags['q'+i];
+            }
+        flags['q'+qual] = 'q'+qual;
+    };
+
+    // get image scale mode (screen, pixel, size)
+    var getScaleMode = function (data) {
+        if (data.scalerFlags.clip != null) {
+            return 'pixel';
+        } else if (data.scalerFlags.osize != null) {
+            return 'size';
+        }
+        // mo=fit is default
+        return 'screen';
+    };
+
+    // set image scale mode (screen, pixel, size)
+    var setScaleMode = function (data, mode) {
+        delete data.scalerFlags.fit;
+        delete data.scalerFlags.clip;
+        delete data.scalerFlags.osize;
+        if (mode === 'pixel') {
+            data.scalerFlags.clip = 'clip';
+        } else if (mode === 'size') {
+            data.scalerFlags.osize = 'osize';
+        }
+        // mo=fit is default
+    };
+
+     // sets a key to a value (relative values with +/- if relative=true)
+    var setNumValue = function(settings, key, value) {
+        if (value == null) return null;
+        if (isNumber(value)) {
+            settings[key] = value;
+            return value;
+        }
+        var sign = value[0];
+        if (sign === '+' || sign === '-') {
+            if (settings[key] == null) {
+                // this isn't perfect but still...
+                settings[key] = 0;
+                }
+            settings[key] = parseFloat(settings[key]) + parseFloat(value);
+        } else {
+            settings[key] = value;
+            }
+        return settings[key];
+    };
+
+    // auxiliary function, assuming equal border width on all sides
+    var getBorderWidth = function($elem) {
+        var border = $elem.outerWidth() - $elem.width();
+        return border/2;
+    };
+
+    // auxiliary function, can the current zoomarea be moved further?
+    var canMove = function(data, movx, movy) {
+        var za = data.zoomArea;
+        if (isFullArea(za)) return false;
+        var x2 = za.x + za.width;
+        var y2 = za.y + za.height;
+        return ((movx < 0) && (za.x > 0))
+            || ((movx > 0) && (x2 < 1.0))
+            || ((movy < 0) && (za.y > 0))
+            || ((movy > 0) && (y2 < 1.0))
+    };
+
+    // auxiliary function (from old dllib.js)
+    var isFullArea = function (area) {
+        return (area.width === 1.0) && (area.height === 1.0);
+    };
+
+    // auxiliary function (from Douglas Crockford, A.10)
+    var isNumber = function (value) {
+        return typeof value === 'number' && isFinite(value);
+    };
+
+    // auxiliary function to crop senseless precision
+    var cropFloat = function (x) {
+        return parseInt(10000 * x, 10) / 10000;
+    };
+
+    // idem, string version
+    var cropFloatStr = function (x) {
+        return cropFloat(x).toString();
+    };
+
+    // fallback for console.log calls
+    if (customConsole) {
+        var logFunction = function(type) {
+            return function(){
+                var $debug = $('#debug'); // debug div
+                if (!$debug) return;
+                var args = Array.prototype.slice.call(arguments);
+                var argtext = args.join(' ');
+                var $logDiv = $('<div/>');
+                $logDiv.addClass(type);
+                $logDiv.text(argtext);
+                $debug.append($logDiv);
+                };
+            };
+        console.log = logFunction('_log'); 
+        console.debug = logFunction('_debug'); 
+        console.error = logFunction('_error');
+        }
+
+    // functions to export to plugins
+    fn = {
+            geometry : geom,
+            parseQueryString : parseQueryString,
+            getScalerUrl : getScalerUrl,
+            getParamString : getParamString,
+            getDigilibUrl : getDigilibUrl,
+            unpackParams : unpackParams,
+            packParams : packParams,
+            packArea : packArea,
+            packMarks : packMarks,
+            packScalerFlags : packScalerFlags,
+            storeOptions : storeOptions,
+            redisplay : redisplay,
+            updateDisplay : updateDisplay,
+            highlightButtons : highlightButtons,
+            showDiv : showDiv,
+            setZoomBG : setZoomBG,
+            getImgTrafo : getImgTrafo,
+            getQuality : getQuality,
+            setQuality : setQuality,
+            getScaleMode : getScaleMode,
+            setScaleMode : setScaleMode,
+            canMove : canMove,
+            isFullArea : isFullArea,
+            isNumber : isNumber,
+            getBorderWidth : getBorderWidth,
+            cropFloat : cropFloat,
+            cropFloatStr : cropFloatStr
+    };
+
+    // hook digilib plugin into jquery
+    $.fn.digilib = function (action) {
+        // plugin extension mechanism, called when the plugins' code is read 
+        if (action === 'plugin') {
+            var plugin = arguments[1];
+            // each plugin needs a name
+            if (plugin.name != null) {
+                plugins[plugin.name] = plugin;
+                // share common objects
+                plugin.defaults = defaults;
+                plugin.buttons = buttons;
+                plugin.actions = actions;
+                plugin.fn = fn;
+                plugin.plugins = plugins;
+                // and install
+                if (typeof plugin.install === 'function') {
+                    plugin.install(plugin);
+                }
+            }
+            // plugins will be initialised when action.init is called
+        } else if (actions[action]) {
+            // call action on this with the remaining arguments (inserting data as first argument)
+            var $elem = $(this);
+            var data = $elem.data('digilib');
+            var args = Array.prototype.slice.call(arguments, 1);
+            args.unshift(data);
+            return actions[action].apply(this, args);
+        } else if (typeof action === 'object' || !action) {
+            // call init on the digilib jQuery object
+            return actions.init.apply(this, arguments);
+        } else {
+            $.error('action ' + action + ' does not exist on jQuery.digilib');
+        }
+    };
+
+})(jQuery);
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.digilib.pluginstub.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,97 @@
+/**
+digilib plugin stub
+ */
+
+(function($) {
+
+    // affine geometry
+    var geom;
+    // plugin object with digilib data
+    var digilib;
+
+    var FULL_AREA;
+
+    var buttons = {
+            stub : {
+                onclick : ["doStub", 1],
+                tooltip : "what does this button do?",
+                icon : "stub.png"
+                }
+    };
+
+    var defaults = {
+            // is stub active?
+            'isStubActive' : true
+    };
+
+    var actions = {
+            // action code goes here 
+            doStub : function (data, param) {
+                var settings = data.settings;
+                console.log('isStubActive', settings.isStubActive);
+                // do some useful stuff ...
+            }
+    };
+
+    // plugin installation called by digilib on plugin object.
+    var install = function(plugin) {
+        digilib = plugin;
+        console.debug('installing stub plugin. digilib:', digilib);
+        // import geometry classes
+        geom = digilib.fn.geometry;
+        FULL_AREA = geom.rectangle(0,0,1,1);
+        // add defaults, actins, buttons
+        $.extend(digilib.defaults, defaults);
+        $.extend(digilib.actions, actions);
+        $.extend(digilib.buttons, buttons);
+    };
+
+    // plugin initialization
+    var init = function (data) {
+        console.debug('initialising stub plugin. data:', data);
+        var $data = $(data);
+        // install event handler
+        $data.bind('setup', handleSetup);
+        $data.bind('update', handleUpdate);
+        $data.bind('redisplay', handleRedisplay);
+        $data.bind('dragZoom', handleDragZoom);
+    };
+
+
+    var handleSetup = function (evt) {
+        console.debug("stub: handleSetup");
+        var data = this;
+    };
+
+    var handleUpdate = function (evt) {
+        console.debug("stub: handleUpdate");
+        var data = this;
+    };
+
+    var handleRedisplay = function (evt) {
+        console.debug("stub: handleRedisplay");
+        var data = this;
+    };
+
+    var handleDragZoom = function (evt, zoomArea) {
+        var data = this;
+    };
+
+    // plugin object with name and init
+    // shared objects filled by digilib on registration
+    var plugin = {
+            name : 'pluginstub',
+            install : install,
+            init : init,
+            buttons : {},
+            actions : {},
+            fn : {},
+            plugins : {}
+    };
+
+    if ($.fn.digilib == null) {
+        $.error("jquery.digilib.pluginstub must be loaded after jquery.digilib!");
+    } else {
+        $.fn.digilib('plugin', plugin);
+    }
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.digilib.regions.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,541 @@
+/** optional digilib regions plugin
+
+markup a digilib image with rectangular regions
+
+TODO:
+    how to display regions correctly in embedded mode?
+*/
+
+(function($) {
+    // the digilib object
+    var digilib;
+    // the data object passed by digilib
+    var data;
+    // the functions made available by digilib
+    var fn;
+    // affine geometry plugin
+    var geom;
+
+    var FULL_AREA;
+
+    var ID_PREFIX = "digilib-region-";
+
+    var buttons = {
+        addregion : {
+            onclick : "defineRegion",
+            tooltip : "define a region",
+            icon : "addregion.png"
+            },
+        delregion : {
+            onclick : "removeRegion",
+            tooltip : "delete the last region",
+            icon : "delregion.png"
+            },
+        regions : {
+            onclick : "toggleRegions",
+            tooltip : "show or hide regions",
+            icon : "regions.png"
+            },
+        regionhtml : {
+            onclick : "showRegionInfo",
+            tooltip : "show information about regions",
+            icon : "regioninfo.png"
+            }
+        };
+
+    var defaults = {
+        // are regions shown?
+        'isRegionVisible' : true,
+        // are region numbers shown?
+        'showRegionNumbers' : false,
+        // is window with region HTML shown?
+        'showRegionInfo' : false,
+        // is there region content in the page?
+        'hasRegionContent' : false,
+        // turn any region into a clickable link to its detail view
+        'autoRegionLinks' : false,
+        // class name for content divs (must additionally be marked with class "keep")
+        'regionContentSelector' : 'div.regioncontent',
+        // buttonset of this plugin
+        'regionSet' : ['regions', 'addregion', 'delregion', 'regionhtml', 'lessoptions'],
+        // url param for regions
+        'rg' : null
+        };
+
+    var actions = { 
+
+        // define a region interactively with two clicked points
+        "defineRegion" : function(data) {
+            if (!data.settings.isRegionVisible) {
+                alert("Please turn on regions visibility!");
+                return;
+            }
+            var $elem = data.$elem;
+            var $body = $('body');
+            var bodyRect = geom.rectangle($body);
+            var $scaler = data.$scaler;
+            var scalerRect = geom.rectangle($scaler);
+            var pt1, pt2;
+            // overlay prevents other elements from reacting to mouse events 
+            var $overlay = $('<div class="digilib-overlay"/>');
+            $body.append($overlay);
+            bodyRect.adjustDiv($overlay);
+            var $regionDiv = addRegionDiv(data, data.regions.length);
+
+            // mousedown handler: start sizing
+            var regionStart = function (evt) {
+                pt1 = geom.position(evt);
+                // setup and show zoom div
+                pt1.adjustDiv($regionDiv);
+                $regionDiv.width(0).height(0);
+                $regionDiv.show();
+                // register mouse events
+                $overlay.bind("mousemove.dlRegion", regionMove);
+                $overlay.bind("mouseup.dlRegion", regionEnd);
+                return false;
+            };
+
+            // mousemove handler: size region
+            var regionMove = function (evt) {
+                pt2 = geom.position(evt);
+                var rect = geom.rectangle(pt1, pt2);
+                rect.clipTo(scalerRect);
+                // update region
+                rect.adjustDiv($regionDiv);
+                return false;
+            };
+
+            // mouseup handler: end sizing
+            var regionEnd = function (evt) {
+                pt2 = geom.position(evt);
+                // assume a click and continue if the area is too small
+                var clickRect = geom.rectangle(pt1, pt2);
+                if (clickRect.getArea() <= 5) return false;
+                // unregister mouse events and get rid of overlay
+                $overlay.unbind("mousemove.dlRegion", regionMove);
+                $overlay.unbind("mouseup.dlRegion", regionEnd);
+                $overlay.remove();
+                // clip region
+                clickRect.clipTo(scalerRect);
+                clickRect.adjustDiv($regionDiv);
+                storeRegion(data, $regionDiv);
+                // fn.redisplay(data);
+                fn.highlightButtons(data, 'addregion', 0);
+                redisplay(data);
+                return false;
+            };
+
+            // bind start zoom handler
+            $overlay.one('mousedown.dlRegion', regionStart);
+            fn.highlightButtons(data, 'addregion', 1);
+        },
+
+        // remove the last added region
+        "removeRegion" : function (data) {
+            if (!data.settings.isRegionVisible) {
+                alert("Please turn on regions visibility!");
+                return;
+            }
+            var region = data.regions.pop();
+            if (region == null) return;
+            var $regionDiv = region.$div; 
+            $regionDiv.remove();
+            redisplay(data);
+        },
+
+        // show/hide regions 
+        "toggleRegions" : function (data) {
+            var show = !data.settings.isRegionVisible;
+            data.settings.isRegionVisible = show;
+            fn.highlightButtons(data, 'regions', show);
+            renderRegions(data, 1);
+        },
+
+        // show/hide region HTML code 
+        "showRegionInfo" : function (data) {
+            var show = !data.settings.showRegionInfo;
+            data.settings.showRegionInfo = show;
+            fn.highlightButtons(data, 'regionhtml', show);
+            var $html = data.$htmlDiv;
+            if (!show) {
+                // empty the div
+                $html.fadeOut(function () { 
+                    $html.contents().remove();
+                    });
+                return;
+            }
+            regionInfo(data);
+        },
+
+        "redraw" : function (data) {
+            renderRegions(data);
+        }
+    };
+
+    // store a region div
+    var storeRegion = function (data, $regionDiv) {
+        var regions = data.regions;
+        var rect = geom.rectangle($regionDiv);
+        var regionRect = data.imgTrafo.invtransform(rect);
+        regionRect.$div = $regionDiv;
+        regions.push(regionRect);
+        console.debug("regions", data.regions, "regionRect", regionRect);
+    };
+
+    // clickable header
+    var regionInfoHeader = function (data) {
+        var $infoDiv = $('<div class="infoheader"/>');
+        var $h01 = $('<div class="infobutton">HTML</div>'); 
+        var $h02 = $('<div class="infobutton">SVG</div>'); 
+        var $h03 = $('<div class="infobutton">Digilib</div>'); 
+        var $h04 = $('<div class="infobutton">X</div>');
+        var bind = function($div, name) {
+            $div.bind('click.regioninfo', function () {
+                var $top = $(this).parent().parent();
+                $top.find('.info').hide();
+                $top.find('.' + name).show();
+                });
+            };
+        bind($h01, 'html');
+        bind($h02, 'svgattr');
+        bind($h03, 'digilib');
+        var $html = data.$htmlDiv;
+        $h04.bind('click.regioninfo', function () {
+            data.settings.showRegionInfo = false;
+            fn.highlightButtons(data, 'regionhtml', false);
+            $html.fadeOut(function () { 
+                $html.contents().remove();
+                });
+            });
+        $infoDiv.append($h01, $h02, $h03, $h04);
+        return $infoDiv;
+    };
+
+    // html for later insertion
+    var regionInfoHTML = function (data) {
+        var $infoDiv = $('<div class="info html"/>');
+        $infoDiv.append($('<div/>').text('<div class="keep regioncontent">'));
+        $.each(data.regions, function(index, r) {
+            var area = [
+                fn.cropFloatStr(r.x),
+                fn.cropFloatStr(r.y),
+                fn.cropFloatStr(r.width),
+                fn.cropFloatStr(r.height)].join(',');
+            $infoDiv.append($('<div/>').text('<a coords="' + area + '" >'));
+            });
+        $infoDiv.append($('<div/>').text('</div>'));
+        return $infoDiv;
+    };
+
+    // SVG-style
+    var regionInfoSVG = function (data) {
+        var $infoDiv = $('<div class="info svgattr"/>');
+        $.each(data.regions, function(index, r) {
+            var area = [
+                fn.cropFloatStr(r.x),
+                fn.cropFloatStr(r.y),
+                fn.cropFloatStr(r.width),
+                fn.cropFloatStr(r.height)].join(' ');
+            $infoDiv.append($('<div/>').text('"' + area + '"'));
+            });
+        return $infoDiv;
+    };
+
+    // digilib-style
+    var regionInfoDigilib = function (data) {
+        var $infoDiv = $('<div class="info digilib"/>');
+        $.each(data.regions, function(index, r) {
+            var area = r.toString();
+            $infoDiv.append($('<div/>').text(area));
+            });
+        return $infoDiv;
+    };
+
+    // show region info in a window
+    var regionInfo = function (data) {
+        var $html = data.$htmlDiv;
+        $html.append(regionInfoHeader(data));
+        $html.append(regionInfoHTML(data));
+        $html.append(regionInfoSVG(data));
+        $html.append(regionInfoDigilib(data));
+        $html.fadeIn();
+    };
+
+    // add a region to data.$elem
+    var addRegionDiv = function (data, index, attributes) {
+        var nr = index + 1; // we count regions from 1
+        // create a digilib URL for this detail
+        var url = attributes ? attributes.href : getRegionUrl(data, index);
+        var $regionDiv = $('<div class="region overlay" style="display:none"/>');
+        $regionDiv.attr("id", ID_PREFIX + nr);
+        data.$elem.append($regionDiv);
+        if (data.settings.showRegionNumbers) {
+            var $regionLink = $('<a class="regionnumber"/>');
+            $regionLink.attr(attributes);
+            $regionLink.text(nr);
+            $regionDiv.append($regionLink);
+        }
+        if (data.settings.autoRegionLinks) {
+            if (attributes) {
+                delete attributes.href;
+                $regionDiv.attr(attributes);
+                };
+            $regionDiv.bind('click.dlRegion', function() {
+                 window.location = url;
+            });
+        }
+        return $regionDiv;
+    };
+
+    // create a region div from the data.regions array
+    var createRegionDiv = function (regions, index, attributes) {
+        var $regionDiv = addRegionDiv(data, index, attributes);
+        var region = regions[index];
+        region.$div = $regionDiv;
+        return $regionDiv;
+    };
+
+    // create regions from URL parameters
+    var createRegionsFromURL = function (data) {
+        unpackRegions(data);
+        var regions = data.regions;
+        $.each(regions, function(i) {
+            createRegionDiv(regions, i);
+            });
+    };
+
+    // create regions from HTML
+    var createRegionsFromHTML = function (data) {
+        var regions = data.regions;
+        var selector = data.settings.regionContentSelector;
+        // regions are defined in "a" tags
+        var $content = data.$elem.contents(selector).contents('a');
+        console.debug("createRegionsFromHTML. elems: ", $content);
+        $content.each(function(index, a) {
+            var $a = $(a); 
+            // the "coords" attribute contains the region coords (0..1)
+            var coords = $a.attr('coords');
+            var pos = coords.split(",", 4);
+            var rect = geom.rectangle(pos[0], pos[1], pos[2], pos[3]);
+            regions.push(rect);
+            // save the attributes
+            var attributes = {};
+            if ($a.attr('id')) { attributes.id = $a.attr('id'); }
+            if ($a.attr('href')) { attributes.href = $a.attr('href'); }
+            if ($a.attr('title')) { attributes.title = $a.attr('title'); }
+            // create the div
+            var $regionDiv = createRegionDiv(regions, index, attributes);
+            var $contents = $a.contents().clone();
+            $regionDiv.append($contents);
+        });
+    };
+
+    // show a region on top of the scaler image 
+    var renderRegion = function (data, index, anim) {
+        if (!data.imgTrafo) return;
+        var $elem = data.$elem;
+        var regions = data.regions;
+        if (index > regions.length) return;
+        var region = regions[index];
+        var $regionDiv = region.$div;
+        if (!$regionDiv) {
+            console.debug("renderRegion: region has no $div", region);
+            // alert("renderRegion: region has no $div to show");
+            return;
+        }
+        var regionRect = region.copy();
+        var show = data.settings.isRegionVisible;
+        if (show && data.zoomArea.overlapsRect(regionRect)) {
+            regionRect.clipTo(data.zoomArea);
+            var screenRect = data.imgTrafo.transform(regionRect);
+            console.debug("renderRegion: pos=",geom.position(screenRect));
+            if (anim) {
+                $regionDiv.fadeIn();
+            } else{
+                $regionDiv.show();
+            }
+            // for some reason adjustDiv sets wrong coords when called BEFORE show()?
+            screenRect.adjustDiv($regionDiv);
+        } else {
+            if (anim) {
+                $regionDiv.fadeOut();
+            } else{
+                $regionDiv.hide();
+            }
+        }
+    };
+
+    // show regions 
+    var renderRegions = function (data, anim) {
+        for (var i = 0; i < data.regions.length ; i++) {
+            renderRegion(data, i, anim);
+        }
+    };
+
+    var unpackRegions = function (data) { 
+        // create regions from parameters
+        var rg = data.settings.rg;
+        if (rg == null) return;
+        var regions = data.regions;
+        var rs = rg.split(";");
+        for (var i = 0; i < rs.length; i++) {
+            var r = rs[i];
+            var pos = r.split(",", 4);
+            var rect = geom.rectangle(pos[0], pos[1], pos[2], pos[3]);
+            regions.push(rect);
+            }
+    };
+
+    // pack regions array into a parameter string
+    var packRegions = function (data) {
+        var regions = data.regions;
+        if (!regions.length) {
+            data.settings.rg = null;
+            return;
+        }
+        var rg = '';
+        for (var i = 0; i < regions.length; i++) {
+            region = regions[i];
+            if (i) {
+                rg += ';';
+            }
+            rg += [
+                fn.cropFloatStr(region.x), 
+                fn.cropFloatStr(region.y),
+                fn.cropFloatStr(region.width),
+                fn.cropFloatStr(region.height)
+                ].join(',');
+        }
+        data.settings.rg = rg;
+    };
+
+    // reload display after a region has been added or removed
+    var redisplay = function (data) {
+        if (!data.settings.hasRegionContent) {
+            packRegions(data);
+        }
+        fn.redisplay(data);
+    };
+
+    // for turning region numbers/region divs into links to zoomed details 
+    var getRegionUrl = function (data, index) {
+        var region = data.regions[index];
+        var settings = data.settings;
+        var params = {
+            "fn" : settings.fn,
+            "pn" : settings.pn
+            };
+        fn.packArea(params, region);
+        fn.packMarks(params, data.marks);
+        fn.packScalerFlags(params, data.scalerFlags);
+        var paramNames = digilib.defaults.digilibParamNames;
+        // build our own digilib URL without storing anything
+        var queryString = fn.getParamString(params, paramNames, digilib.defaults);
+        return settings.digilibBaseUrl + '?' + queryString;
+    };
+
+    // event handler, reads region parameter and creates region divs
+    var handleSetup = function (evt) {
+        data = this;
+        console.debug("regions: handleSetup", data.settings.rg);
+        // regions with content are given in HTML divs
+        if (data.settings.hasRegionContent) {
+            createRegionsFromHTML(data);
+        // regions are defined in the URL
+        } else {
+            createRegionsFromURL(data);
+            fn.highlightButtons(data, 'regionhtml', data.settings.showRegionInfo);
+        }
+    };
+
+    // event handler, sets buttons and shows regions when scaler img is reloaded
+    var handleUpdate = function (evt) {
+        data = this;
+        console.debug("regions: handleUpdate");
+        var settings = data.settings;
+        fn.highlightButtons(data, 'regions' , settings.isRegionVisible);
+        fn.highlightButtons(data, 'regionhtml' , settings.showRegionInfo);
+        renderRegions(data);
+    };
+
+    // event handler, redisplays regions (e.g. in a new position)
+    var handleRedisplay = function (evt) {
+        data = this;
+        console.debug("regions: handleRedisplay");
+        // renderRegions(data);
+    };
+
+    // event handler
+    var handleDragZoom = function (evt, zoomArea) {
+        // console.debug("regions: handleDragZoom, zoomArea:", zoomArea);
+        // data = this;
+    };
+
+    // plugin installation called by digilib on plugin object.
+    var install = function(plugin) {
+        digilib = plugin;
+        console.debug('installing regions plugin. digilib:', digilib);
+        fn = digilib.fn;
+        // import geometry classes
+        geom = fn.geometry;
+        FULL_AREA = geom.rectangle(0,0,1,1);
+        // add defaults, actions, buttons
+        $.extend(digilib.defaults, defaults);
+        $.extend(digilib.actions, actions);
+        $.extend(digilib.buttons, buttons);
+    };
+
+    // plugin initialization
+    var init = function (data) {
+        console.debug('initialising regions plugin. data:', data);
+        var $elem = data.$elem;
+        // regions array
+        data.regions = [];
+        // regions div
+        var $html = $('<div class="keep regionHTML"/>');
+        $elem.append($html);
+        data.$htmlDiv = $html;
+        // install event handler
+        var $data = $(data);
+        $data.bind('setup', handleSetup);
+        $data.bind('update', handleUpdate);
+        $data.bind('redisplay', handleRedisplay);
+        $data.bind('dragZoom', handleDragZoom);
+        var settings = data.settings;
+        var selector = data.settings.regionContentSelector;
+        settings.hasRegionContent = $elem.has(selector).length > 0;
+        // neither URL-defined regions nor buttons when regions are predefined in HTML
+        if (!settings.hasRegionContent) {
+            var mode = settings.interactionMode;
+            // add "rg" to digilibParamNames
+            settings.digilibParamNames.push('rg');
+            // additional buttons
+            var buttonSettings = settings.buttonSettings[mode];
+            // configure buttons through digilib "regionSet" option
+            var buttonSet = settings.regionSet || regionSet; 
+            // set regionSet to [] or '' for no buttons (when showing regions only)
+            if (buttonSet.length && buttonSet.length > 0) {
+                buttonSettings.regionSet = buttonSet;
+                buttonSettings.buttonSets.push('regionSet');
+            }
+        }
+    };
+
+    // plugin object with name and install/init methods
+    // shared objects filled by digilib on registration
+    var pluginProperties = {
+            name : 'region',
+            install : install,
+            init : init,
+            buttons : {},
+            actions : {},
+            fn : {},
+            plugins : {}
+    };
+
+    if ($.fn.digilib == null) {
+        $.error("jquery.digilib.regions must be loaded after jquery.digilib!");
+    } else {
+        $.fn.digilib('plugin', pluginProperties);
+    }
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/jquery.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,8316 @@
+/*!
+ * jQuery JavaScript Library v1.5.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Feb 23 13:55:29 2011 -0500
+ */
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Check for digits
+	rdigit = /\d/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+
+	// Has the ready events already been bound?
+	readyBound = false,
+
+	// The deferred used on DOM ready
+	readyList,
+
+	// Promise methods
+	promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context && document.body ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = "body";
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			match = quickExpr.exec( selector );
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+					doc = (context ? context.ownerDocument || context : document);
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
+					}
+
+					return jQuery.merge( this, selector );
+
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return (context || rootjQuery).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if (selector.selector !== undefined) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.5.1",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = this.constructor();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// Add the callback
+		readyList.done( fn );
+
+		return this;
+	},
+
+	eq: function( i ) {
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, +i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		window.$ = _$;
+
+		if ( deep ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+		// A third-party is pushing the ready event forwards
+		if ( wait === true ) {
+			jQuery.readyWait--;
+		}
+
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 1 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
+			}
+
+			// If there are functions bound, to execute
+			readyList.resolveWith( document, [ jQuery ] );
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).unbind( "ready" );
+			}
+		}
+	},
+
+	bindReady: function() {
+		if ( readyBound ) {
+			return;
+		}
+
+		readyBound = true;
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent("onreadystatechange", DOMContentLoaded);
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	// A crude way of determining if an object is a window
+	isWindow: function( obj ) {
+		return obj && typeof obj === "object" && "setInterval" in obj;
+	},
+
+	isNaN: function( obj ) {
+		return obj == null || !rdigit.test( obj ) || isNaN( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		// Not own constructor property must be Object
+		if ( obj.constructor &&
+			!hasOwn.call(obj, "constructor") &&
+			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			return false;
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+
+		var key;
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw msg;
+	},
+
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test(data.replace(rvalidescape, "@")
+			.replace(rvalidtokens, "]")
+			.replace(rvalidbraces, "")) ) {
+
+			// Try to use the native JSON parser first
+			return window.JSON && window.JSON.parse ?
+				window.JSON.parse( data ) :
+				(new Function("return " + data))();
+
+		} else {
+			jQuery.error( "Invalid JSON: " + data );
+		}
+	},
+
+	// Cross-browser xml parsing
+	// (xml & tmp used internally)
+	parseXML: function( data , xml , tmp ) {
+
+		if ( window.DOMParser ) { // Standard
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data , "text/xml" );
+		} else { // IE
+			xml = new ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+
+		tmp = xml.documentElement;
+
+		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evalulates a script in a global context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test(data) ) {
+			// Inspired by code by Andrea Giammarchi
+			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+			var head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement,
+				script = document.createElement( "script" );
+
+			if ( jQuery.support.scriptEval() ) {
+				script.appendChild( document.createTextNode( data ) );
+			} else {
+				script.text = data;
+			}
+
+			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
+			head.removeChild( script );
+		}
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction(object);
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( var value = object[0];
+					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+			}
+		}
+
+		return object;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type(array);
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array ) {
+		if ( array.indexOf ) {
+			return array.indexOf( elem );
+		}
+
+		for ( var i = 0, length = array.length; i < length; i++ ) {
+			if ( array[ i ] === elem ) {
+				return i;
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length,
+			j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [], retVal;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var ret = [], value;
+
+		// Go through the array, translating each of the items to their
+		// new value (or values).
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			value = callback( elems[ i ], i, arg );
+
+			if ( value != null ) {
+				ret[ ret.length ] = value;
+			}
+		}
+
+		// Flatten any nested arrays
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	proxy: function( fn, proxy, thisObject ) {
+		if ( arguments.length === 2 ) {
+			if ( typeof proxy === "string" ) {
+				thisObject = fn;
+				fn = thisObject[ proxy ];
+				proxy = undefined;
+
+			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
+				thisObject = proxy;
+				proxy = undefined;
+			}
+		}
+
+		if ( !proxy && fn ) {
+			proxy = function() {
+				return fn.apply( thisObject || this, arguments );
+			};
+		}
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		if ( fn ) {
+			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+		}
+
+		// So proxy can be declared as an argument
+		return proxy;
+	},
+
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can be optionally by executed if its a function
+	access: function( elems, key, value, exec, fn, pass ) {
+		var length = elems.length;
+
+		// Setting many attributes
+		if ( typeof key === "object" ) {
+			for ( var k in key ) {
+				jQuery.access( elems, k, key[k], exec, fn, value );
+			}
+			return elems;
+		}
+
+		// Setting one attribute
+		if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = !pass && exec && jQuery.isFunction(value);
+
+			for ( var i = 0; i < length; i++ ) {
+				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+			}
+
+			return elems;
+		}
+
+		// Getting an attribute
+		return length ? fn( elems[0], key ) : undefined;
+	},
+
+	now: function() {
+		return (new Date()).getTime();
+	},
+
+	// Create a simple deferred (one callbacks list)
+	_Deferred: function() {
+		var // callbacks list
+			callbacks = [],
+			// stored [ context , args ]
+			fired,
+			// to avoid firing when already doing so
+			firing,
+			// flag to know if the deferred has been cancelled
+			cancelled,
+			// the deferred itself
+			deferred  = {
+
+				// done( f1, f2, ...)
+				done: function() {
+					if ( !cancelled ) {
+						var args = arguments,
+							i,
+							length,
+							elem,
+							type,
+							_fired;
+						if ( fired ) {
+							_fired = fired;
+							fired = 0;
+						}
+						for ( i = 0, length = args.length; i < length; i++ ) {
+							elem = args[ i ];
+							type = jQuery.type( elem );
+							if ( type === "array" ) {
+								deferred.done.apply( deferred, elem );
+							} else if ( type === "function" ) {
+								callbacks.push( elem );
+							}
+						}
+						if ( _fired ) {
+							deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] );
+						}
+					}
+					return this;
+				},
+
+				// resolve with given context and args
+				resolveWith: function( context, args ) {
+					if ( !cancelled && !fired && !firing ) {
+						firing = 1;
+						try {
+							while( callbacks[ 0 ] ) {
+								callbacks.shift().apply( context, args );
+							}
+						}
+						// We have to add a catch block for
+						// IE prior to 8 or else the finally
+						// block will never get executed
+						catch (e) {
+							throw e;
+						}
+						finally {
+							fired = [ context, args ];
+							firing = 0;
+						}
+					}
+					return this;
+				},
+
+				// resolve with this as context and given arguments
+				resolve: function() {
+					deferred.resolveWith( jQuery.isFunction( this.promise ) ? this.promise() : this, arguments );
+					return this;
+				},
+
+				// Has this deferred been resolved?
+				isResolved: function() {
+					return !!( firing || fired );
+				},
+
+				// Cancel
+				cancel: function() {
+					cancelled = 1;
+					callbacks = [];
+					return this;
+				}
+			};
+
+		return deferred;
+	},
+
+	// Full fledged deferred (two callbacks list)
+	Deferred: function( func ) {
+		var deferred = jQuery._Deferred(),
+			failDeferred = jQuery._Deferred(),
+			promise;
+		// Add errorDeferred methods, then and promise
+		jQuery.extend( deferred, {
+			then: function( doneCallbacks, failCallbacks ) {
+				deferred.done( doneCallbacks ).fail( failCallbacks );
+				return this;
+			},
+			fail: failDeferred.done,
+			rejectWith: failDeferred.resolveWith,
+			reject: failDeferred.resolve,
+			isRejected: failDeferred.isResolved,
+			// Get a promise for this deferred
+			// If obj is provided, the promise aspect is added to the object
+			promise: function( obj ) {
+				if ( obj == null ) {
+					if ( promise ) {
+						return promise;
+					}
+					promise = obj = {};
+				}
+				var i = promiseMethods.length;
+				while( i-- ) {
+					obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ];
+				}
+				return obj;
+			}
+		} );
+		// Make sure only one callback list will be used
+		deferred.done( failDeferred.cancel ).fail( deferred.cancel );
+		// Unexpose cancel
+		delete deferred.cancel;
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( object ) {
+		var lastIndex = arguments.length,
+			deferred = lastIndex <= 1 && object && jQuery.isFunction( object.promise ) ?
+				object :
+				jQuery.Deferred(),
+			promise = deferred.promise();
+
+		if ( lastIndex > 1 ) {
+			var array = slice.call( arguments, 0 ),
+				count = lastIndex,
+				iCallback = function( index ) {
+					return function( value ) {
+						array[ index ] = arguments.length > 1 ? slice.call( arguments, 0 ) : value;
+						if ( !( --count ) ) {
+							deferred.resolveWith( promise, array );
+						}
+					};
+				};
+			while( ( lastIndex-- ) ) {
+				object = array[ lastIndex ];
+				if ( object && jQuery.isFunction( object.promise ) ) {
+					object.promise().then( iCallback(lastIndex), deferred.reject );
+				} else {
+					--count;
+				}
+			}
+			if ( !count ) {
+				deferred.resolveWith( promise, array );
+			}
+		} else if ( deferred !== object ) {
+			deferred.resolve( object );
+		}
+		return promise;
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	sub: function() {
+		function jQuerySubclass( selector, context ) {
+			return new jQuerySubclass.fn.init( selector, context );
+		}
+		jQuery.extend( true, jQuerySubclass, this );
+		jQuerySubclass.superclass = this;
+		jQuerySubclass.fn = jQuerySubclass.prototype = this();
+		jQuerySubclass.fn.constructor = jQuerySubclass;
+		jQuerySubclass.subclass = this.subclass;
+		jQuerySubclass.fn.init = function init( selector, context ) {
+			if ( context && context instanceof jQuery && !(context instanceof jQuerySubclass) ) {
+				context = jQuerySubclass(context);
+			}
+
+			return jQuery.fn.init.call( this, selector, context, rootjQuerySubclass );
+		};
+		jQuerySubclass.fn.init.prototype = jQuerySubclass.fn;
+		var rootjQuerySubclass = jQuerySubclass(document);
+		return jQuerySubclass;
+	},
+
+	browser: {}
+});
+
+// Create readyList deferred
+readyList = jQuery._Deferred();
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+if ( indexOf ) {
+	jQuery.inArray = function( elem, array ) {
+		return indexOf.call( array, elem );
+	};
+}
+
+// IE doesn't match non-breaking spaces with \s
+if ( rnotwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch(e) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+// Expose jQuery to the global object
+return jQuery;
+
+})();
+
+
+(function() {
+
+	jQuery.support = {};
+
+	var div = document.createElement("div");
+
+	div.style.display = "none";
+	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	var all = div.getElementsByTagName("*"),
+		a = div.getElementsByTagName("a")[0],
+		select = document.createElement("select"),
+		opt = select.appendChild( document.createElement("option") ),
+		input = div.getElementsByTagName("input")[0];
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return;
+	}
+
+	jQuery.support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: div.firstChild.nodeType === 3,
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText insted)
+		style: /red/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: a.getAttribute("href") === "/a",
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55$/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: input.value === "on",
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Will be defined later
+		deleteExpando: true,
+		optDisabled: false,
+		checkClone: false,
+		noCloneEvent: true,
+		noCloneChecked: true,
+		boxModel: null,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableHiddenOffsets: true
+	};
+
+	input.checked = true;
+	jQuery.support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as diabled)
+	select.disabled = true;
+	jQuery.support.optDisabled = !opt.disabled;
+
+	var _scriptEval = null;
+	jQuery.support.scriptEval = function() {
+		if ( _scriptEval === null ) {
+			var root = document.documentElement,
+				script = document.createElement("script"),
+				id = "script" + jQuery.now();
+
+			try {
+				script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+			} catch(e) {}
+
+			root.insertBefore( script, root.firstChild );
+
+			// Make sure that the execution of code works by injecting a script
+			// tag with appendChild/createTextNode
+			// (IE doesn't support this, fails, and uses .text instead)
+			if ( window[ id ] ) {
+				_scriptEval = true;
+				delete window[ id ];
+			} else {
+				_scriptEval = false;
+			}
+
+			root.removeChild( script );
+			// release memory in IE
+			root = script = id  = null;
+		}
+
+		return _scriptEval;
+	};
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete div.test;
+
+	} catch(e) {
+		jQuery.support.deleteExpando = false;
+	}
+
+	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+		div.attachEvent("onclick", function click() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			jQuery.support.noCloneEvent = false;
+			div.detachEvent("onclick", click);
+		});
+		div.cloneNode(true).fireEvent("onclick");
+	}
+
+	div = document.createElement("div");
+	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+
+	var fragment = document.createDocumentFragment();
+	fragment.appendChild( div.firstChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+
+	// Figure out if the W3C box model works as expected
+	// document.body must exist before we can do this
+	jQuery(function() {
+		var div = document.createElement("div"),
+			body = document.getElementsByTagName("body")[0];
+
+		// Frameset documents with no body should not run this code
+		if ( !body ) {
+			return;
+		}
+
+		div.style.width = div.style.paddingLeft = "1px";
+		body.appendChild( div );
+		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+
+		if ( "zoom" in div.style ) {
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			// (IE < 8 does this)
+			div.style.display = "inline";
+			div.style.zoom = 1;
+			jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
+
+			// Check if elements with layout shrink-wrap their children
+			// (IE 6 does this)
+			div.style.display = "";
+			div.innerHTML = "<div style='width:4px;'></div>";
+			jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
+		}
+
+		div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
+		var tds = div.getElementsByTagName("td");
+
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		// (only IE 8 fails this test)
+		jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
+
+		tds[0].style.display = "";
+		tds[1].style.display = "none";
+
+		// Check if empty table cells still have offsetWidth/Height
+		// (IE < 8 fail this test)
+		jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
+		div.innerHTML = "";
+
+		body.removeChild( div ).style.display = "none";
+		div = tds = null;
+	});
+
+	// Technique from Juriy Zaytsev
+	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+	var eventSupported = function( eventName ) {
+		var el = document.createElement("div");
+		eventName = "on" + eventName;
+
+		// We only care about the case where non-standard event systems
+		// are used, namely in IE. Short-circuiting here helps us to
+		// avoid an eval call (in setAttribute) which can cause CSP
+		// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+		if ( !el.attachEvent ) {
+			return true;
+		}
+
+		var isSupported = (eventName in el);
+		if ( !isSupported ) {
+			el.setAttribute(eventName, "return;");
+			isSupported = typeof el[eventName] === "function";
+		}
+		el = null;
+
+		return isSupported;
+	};
+
+	jQuery.support.submitBubbles = eventSupported("submit");
+	jQuery.support.changeBubbles = eventSupported("change");
+
+	// release memory in IE
+	div = all = a = null;
+})();
+
+
+
+var rbrace = /^(?:\{.*\}|\[.*\])$/;
+
+jQuery.extend({
+	cache: {},
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache,
+
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
+
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
+
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando;
+
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) {
+			return;
+		}
+
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ jQuery.expando ] = id = ++jQuery.uuid;
+			} else {
+				id = jQuery.expando;
+			}
+		}
+
+		if ( !cache[ id ] ) {
+			cache[ id ] = {};
+
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+		}
+
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if ( typeof name === "object" || typeof name === "function" ) {
+			if ( pvt ) {
+				cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
+			} else {
+				cache[ id ] = jQuery.extend(cache[ id ], name);
+			}
+		}
+
+		thisCache = cache[ id ];
+
+		// Internal jQuery data is stored in a separate object inside the object's data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data
+		if ( pvt ) {
+			if ( !thisCache[ internalKey ] ) {
+				thisCache[ internalKey ] = {};
+			}
+
+			thisCache = thisCache[ internalKey ];
+		}
+
+		if ( data !== undefined ) {
+			thisCache[ name ] = data;
+		}
+
+		// TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
+		// not attempt to inspect the internal events object using jQuery.data, as this
+		// internal data object is undocumented and subject to change.
+		if ( name === "events" && !thisCache[name] ) {
+			return thisCache[ internalKey ] && thisCache[ internalKey ].events;
+		}
+
+		return getByName ? thisCache[ name ] : thisCache;
+	},
+
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var internalKey = jQuery.expando, isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+
+			// See jQuery.data for more information
+			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
+
+		if ( name ) {
+			var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ];
+
+			if ( thisCache ) {
+				delete thisCache[ name ];
+
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !isEmptyDataObject(thisCache) ) {
+					return;
+				}
+			}
+		}
+
+		// See jQuery.data for more information
+		if ( pvt ) {
+			delete cache[ id ][ internalKey ];
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !isEmptyDataObject(cache[ id ]) ) {
+				return;
+			}
+		}
+
+		var internalCache = cache[ id ][ internalKey ];
+
+		// Browsers that fail expando deletion also refuse to delete expandos on
+		// the window, but it will allow it on all other JS objects; other browsers
+		// don't care
+		if ( jQuery.support.deleteExpando || cache != window ) {
+			delete cache[ id ];
+		} else {
+			cache[ id ] = null;
+		}
+
+		// We destroyed the entire user cache at once because it's faster than
+		// iterating through each key, but we need to continue to persist internal
+		// data if it existed
+		if ( internalCache ) {
+			cache[ id ] = {};
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+
+			cache[ id ][ internalKey ] = internalCache;
+
+		// Otherwise, we need to eliminate the expando on the node to avoid
+		// false lookups in the cache for entries that no longer exist
+		} else if ( isNode ) {
+			// IE does not allow us to delete expando properties from nodes,
+			// nor does it have a removeAttribute function on Document nodes;
+			// we must handle all of these cases
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
+			} else {
+				elem[ jQuery.expando ] = null;
+			}
+		}
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
+		}
+
+		return true;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var data = null;
+
+		if ( typeof key === "undefined" ) {
+			if ( this.length ) {
+				data = jQuery.data( this[0] );
+
+				if ( this[0].nodeType === 1 ) {
+					var attr = this[0].attributes, name;
+					for ( var i = 0, l = attr.length; i < l; i++ ) {
+						name = attr[i].name;
+
+						if ( name.indexOf( "data-" ) === 0 ) {
+							name = name.substr( 5 );
+							dataAttr( this[0], name, data[ name ] );
+						}
+					}
+				}
+			}
+
+			return data;
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		var parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			// Try to fetch any internally stored data first
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+				data = dataAttr( this[0], key, data );
+			}
+
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+
+		} else {
+			return this.each(function() {
+				var $this = jQuery( this ),
+					args = [ parts[0], value ];
+
+				$this.triggerHandler( "setData" + parts[1] + "!", args );
+				jQuery.data( this, key, value );
+				$this.triggerHandler( "changeData" + parts[1] + "!", args );
+			});
+		}
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		data = elem.getAttribute( "data-" + key );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				!jQuery.isNaN( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON
+// property to be considered empty objects; this property always exists in
+// order to make sure JSON.stringify does not expose internal metadata
+function isEmptyDataObject( obj ) {
+	for ( var name in obj ) {
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+
+
+
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		if ( !elem ) {
+			return;
+		}
+
+		type = (type || "fx") + "queue";
+		var q = jQuery._data( elem, type );
+
+		// Speed up dequeue by getting out quickly if this is just a lookup
+		if ( !data ) {
+			return q || [];
+		}
+
+		if ( !q || jQuery.isArray(data) ) {
+			q = jQuery._data( elem, type, jQuery.makeArray(data) );
+
+		} else {
+			q.push( data );
+		}
+
+		return q;
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift();
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift("inprogress");
+			}
+
+			fn.call(elem, function() {
+				jQuery.dequeue(elem, type);
+			});
+		}
+
+		if ( !queue.length ) {
+			jQuery.removeData( elem, type + "queue", true );
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined ) {
+			return jQuery.queue( this[0], type );
+		}
+		return this.each(function( i ) {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function() {
+			var elem = this;
+			setTimeout(function() {
+				jQuery.dequeue( elem, type );
+			}, time );
+		});
+	},
+
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	}
+});
+
+
+
+
+var rclass = /[\n\t\r]/g,
+	rspaces = /\s+/,
+	rreturn = /\r/g,
+	rspecialurl = /^(?:href|src|style)$/,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rradiocheck = /^(?:radio|checkbox)$/i;
+
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	colspan: "colSpan",
+	tabindex: "tabIndex",
+	usemap: "useMap",
+	frameborder: "frameBorder"
+};
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name, fn ) {
+		return this.each(function(){
+			jQuery.attr( this, name, "" );
+			if ( this.nodeType === 1 ) {
+				this.removeAttribute( name );
+			}
+		});
+	},
+
+	addClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.addClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className ) {
+						elem.className = value;
+
+					} else {
+						var className = " " + elem.className + " ",
+							setClass = elem.className;
+
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+								setClass += " " + classNames[c];
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.removeClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						var className = (" " + elem.className + " ").replace(rclass, " ");
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[c] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( rspaces );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ";
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		if ( !arguments.length ) {
+			var elem = this[0];
+
+			if ( elem ) {
+				if ( jQuery.nodeName( elem, "option" ) ) {
+					// attributes.value is undefined in Blackberry 4.7 but
+					// uses .value. See #6932
+					var val = elem.attributes.value;
+					return !val || val.specified ? elem.value : elem.text;
+				}
+
+				// We need to handle select boxes special
+				if ( jQuery.nodeName( elem, "select" ) ) {
+					var index = elem.selectedIndex,
+						values = [],
+						options = elem.options,
+						one = elem.type === "select-one";
+
+					// Nothing was selected
+					if ( index < 0 ) {
+						return null;
+					}
+
+					// Loop through all the selected options
+					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[ i ];
+
+						// Don't return options that are disabled or in a disabled optgroup
+						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+								(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+							// Get the specific value for the option
+							value = jQuery(option).val();
+
+							// We don't need an array for one selects
+							if ( one ) {
+								return value;
+							}
+
+							// Multi-Selects return an array
+							values.push( value );
+						}
+					}
+
+					// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
+					if ( one && !values.length && options.length ) {
+						return jQuery( options[ index ] ).val();
+					}
+
+					return values;
+				}
+
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+					return elem.getAttribute("value") === null ? "on" : elem.value;
+				}
+
+				// Everything else, we just grab the value
+				return (elem.value || "").replace(rreturn, "");
+
+			}
+
+			return undefined;
+		}
+
+		var isFunction = jQuery.isFunction(value);
+
+		return this.each(function(i) {
+			var self = jQuery(this), val = value;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call(this, i, self.val());
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray(val) ) {
+				val = jQuery.map(val, function (value) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+				this.checked = jQuery.inArray( self.val(), val ) >= 0;
+
+			} else if ( jQuery.nodeName( this, "select" ) ) {
+				var values = jQuery.makeArray(val);
+
+				jQuery( "option", this ).each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					this.selectedIndex = -1;
+				}
+
+			} else {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+
+	attr: function( elem, name, value, pass ) {
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || elem.nodeType === 2 ) {
+			return undefined;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery(elem)[name](value);
+		}
+
+		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+			// Whether we are setting (or getting)
+			set = value !== undefined;
+
+		// Try to normalize/fix the name
+		name = notxml && jQuery.props[ name ] || name;
+
+		// Only do all the following if this is a node (faster for style)
+		if ( elem.nodeType === 1 ) {
+			// These attributes require special treatment
+			var special = rspecialurl.test( name );
+
+			// Safari mis-reports the default selected property of an option
+			// Accessing the parent's selectedIndex property fixes it
+			if ( name === "selected" && !jQuery.support.optSelected ) {
+				var parent = elem.parentNode;
+				if ( parent ) {
+					parent.selectedIndex;
+
+					// Make sure that it also works with optgroups, see #5701
+					if ( parent.parentNode ) {
+						parent.parentNode.selectedIndex;
+					}
+				}
+			}
+
+			// If applicable, access the attribute via the DOM 0 way
+			// 'in' checks fail in Blackberry 4.7 #6931
+			if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
+				if ( set ) {
+					// We can't allow the type property to be changed (since it causes problems in IE)
+					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+						jQuery.error( "type property can't be changed" );
+					}
+
+					if ( value === null ) {
+						if ( elem.nodeType === 1 ) {
+							elem.removeAttribute( name );
+						}
+
+					} else {
+						elem[ name ] = value;
+					}
+				}
+
+				// browsers index elements by id/name on forms, give priority to attributes.
+				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
+					return elem.getAttributeNode( name ).nodeValue;
+				}
+
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				if ( name === "tabIndex" ) {
+					var attributeNode = elem.getAttributeNode( "tabIndex" );
+
+					return attributeNode && attributeNode.specified ?
+						attributeNode.value :
+						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+							0 :
+							undefined;
+				}
+
+				return elem[ name ];
+			}
+
+			if ( !jQuery.support.style && notxml && name === "style" ) {
+				if ( set ) {
+					elem.style.cssText = "" + value;
+				}
+
+				return elem.style.cssText;
+			}
+
+			if ( set ) {
+				// convert the value to a string (all browsers do this but IE) see #1070
+				elem.setAttribute( name, "" + value );
+			}
+
+			// Ensure that missing attributes return undefined
+			// Blackberry 4.7 returns "" from getAttribute #6938
+			if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
+				return undefined;
+			}
+
+			var attr = !jQuery.support.hrefNormalized && notxml && special ?
+					// Some attributes require a special call on IE
+					elem.getAttribute( name, 2 ) :
+					elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return attr === null ? undefined : attr;
+		}
+		// Handle everything which isn't a DOM element node
+		if ( set ) {
+			elem[ name ] = value;
+		}
+		return elem[ name ];
+	}
+});
+
+
+
+
+var rnamespaces = /\.(.*)$/,
+	rformElems = /^(?:textarea|input|select)$/i,
+	rperiod = /\./g,
+	rspace = / /g,
+	rescape = /[^\w\s.|`]/g,
+	fcleanup = function( nm ) {
+		return nm.replace(rescape, "\\$&");
+	};
+
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function( elem, types, handler, data ) {
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// TODO :: Use a try/catch until it's safe to pull this out (likely 1.6)
+		// Minor release fix for bug #8018
+		try {
+			// For whatever reason, IE has trouble passing the window object
+			// around, causing it to be cloned in the process
+			if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
+				elem = window;
+			}
+		}
+		catch ( e ) {}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		} else if ( !handler ) {
+			// Fixes bug #7229. Fix recommended by jdalton
+			return;
+		}
+
+		var handleObjIn, handleObj;
+
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+		}
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure
+		var elemData = jQuery._data( elem );
+
+		// If no elemData is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !elemData ) {
+			return;
+		}
+
+		var events = elemData.events,
+			eventHandle = elemData.handle;
+
+		if ( !events ) {
+			elemData.events = events = {};
+		}
+
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function() {
+				// Handle the second event of a trigger and when
+				// an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+		}
+
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native events in IE.
+		eventHandle.elem = elem;
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		var type, i = 0, namespaces;
+
+		while ( (type = types[ i++ ]) ) {
+			handleObj = handleObjIn ?
+				jQuery.extend({}, handleObjIn) :
+				{ handler: handler, data: data };
+
+			// Namespaced event handlers
+			if ( type.indexOf(".") > -1 ) {
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				handleObj.namespace = namespaces.slice(0).sort().join(".");
+
+			} else {
+				namespaces = [];
+				handleObj.namespace = "";
+			}
+
+			handleObj.type = type;
+			if ( !handleObj.guid ) {
+				handleObj.guid = handler.guid;
+			}
+
+			// Get the current list of functions bound to this event
+			var handlers = events[ type ],
+				special = jQuery.event.special[ type ] || {};
+
+			// Init the event handler queue
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add the function to the element's handler list
+			handlers.push( handleObj );
+
+			// Keep track of which events have been used, for global triggering
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, pos ) {
+		// don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		}
+
+		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
+			events = elemData && elemData.events;
+
+		if ( !elemData || !events ) {
+			return;
+		}
+
+		// types is actually an event object here
+		if ( types && types.type ) {
+			handler = types.handler;
+			types = types.type;
+		}
+
+		// Unbind all events for the element
+		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+			types = types || "";
+
+			for ( type in events ) {
+				jQuery.event.remove( elem, type + types );
+			}
+
+			return;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).unbind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		while ( (type = types[ i++ ]) ) {
+			origType = type;
+			handleObj = null;
+			all = type.indexOf(".") < 0;
+			namespaces = [];
+
+			if ( !all ) {
+				// Namespaced event handlers
+				namespaces = type.split(".");
+				type = namespaces.shift();
+
+				namespace = new RegExp("(^|\\.)" +
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
+			}
+
+			eventType = events[ type ];
+
+			if ( !eventType ) {
+				continue;
+			}
+
+			if ( !handler ) {
+				for ( j = 0; j < eventType.length; j++ ) {
+					handleObj = eventType[ j ];
+
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						jQuery.event.remove( elem, origType, handleObj.handler, j );
+						eventType.splice( j--, 1 );
+					}
+				}
+
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+
+			for ( j = pos || 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( handler.guid === handleObj.guid ) {
+					// remove the given handler for the given type
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						if ( pos == null ) {
+							eventType.splice( j--, 1 );
+						}
+
+						if ( special.remove ) {
+							special.remove.call( elem, handleObj );
+						}
+					}
+
+					if ( pos != null ) {
+						break;
+					}
+				}
+			}
+
+			// remove generic event handler if no more handlers exist
+			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				ret = null;
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			var handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			delete elemData.events;
+			delete elemData.handle;
+
+			if ( jQuery.isEmptyObject( elemData ) ) {
+				jQuery.removeData( elem, undefined, true );
+			}
+		}
+	},
+
+	// bubbling is internal
+	trigger: function( event, data, elem /*, bubbling */ ) {
+		// Event object or event type
+		var type = event.type || event,
+			bubbling = arguments[3];
+
+		if ( !bubbling ) {
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[ jQuery.expando ] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
+
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
+
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+
+				// Only trigger if we've ever bound an event for it
+				if ( jQuery.event.global[ type ] ) {
+					// XXX This code smells terrible. event.js should not be directly
+					// inspecting the data cache
+					jQuery.each( jQuery.cache, function() {
+						// internalKey variable is just used to make it easier to find
+						// and potentially change this stuff later; currently it just
+						// points to jQuery.expando
+						var internalKey = jQuery.expando,
+							internalCache = this[ internalKey ];
+						if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
+							jQuery.event.trigger( event, data, internalCache.handle.elem );
+						}
+					});
+				}
+			}
+
+			// Handle triggering a single element
+
+			// don't do events on text and comment nodes
+			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+				return undefined;
+			}
+
+			// Clean up in case it is reused
+			event.result = undefined;
+			event.target = elem;
+
+			// Clone the incoming data, if any
+			data = jQuery.makeArray( data );
+			data.unshift( event );
+		}
+
+		event.currentTarget = elem;
+
+		// Trigger the event, it is assumed that "handle" is a function
+		var handle = jQuery._data( elem, "handle" );
+
+		if ( handle ) {
+			handle.apply( elem, data );
+		}
+
+		var parent = elem.parentNode || elem.ownerDocument;
+
+		// Trigger an inline bound script
+		try {
+			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
+					event.result = false;
+					event.preventDefault();
+				}
+			}
+
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (inlineError) {}
+
+		if ( !event.isPropagationStopped() && parent ) {
+			jQuery.event.trigger( event, data, parent, true );
+
+		} else if ( !event.isDefaultPrevented() ) {
+			var old,
+				target = event.target,
+				targetType = type.replace( rnamespaces, "" ),
+				isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
+				special = jQuery.event.special[ targetType ] || {};
+
+			if ( (!special._default || special._default.call( elem, event ) === false) &&
+				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+
+				try {
+					if ( target[ targetType ] ) {
+						// Make sure that we don't accidentally re-trigger the onFOO events
+						old = target[ "on" + targetType ];
+
+						if ( old ) {
+							target[ "on" + targetType ] = null;
+						}
+
+						jQuery.event.triggered = true;
+						target[ targetType ]();
+					}
+
+				// prevent IE from throwing an error for some elements with some event types, see #3533
+				} catch (triggerError) {}
+
+				if ( old ) {
+					target[ "on" + targetType ] = old;
+				}
+
+				jQuery.event.triggered = false;
+			}
+		}
+	},
+
+	handle: function( event ) {
+		var all, handlers, namespaces, namespace_re, events,
+			namespace_sort = [],
+			args = jQuery.makeArray( arguments );
+
+		event = args[0] = jQuery.event.fix( event || window.event );
+		event.currentTarget = this;
+
+		// Namespaced event handlers
+		all = event.type.indexOf(".") < 0 && !event.exclusive;
+
+		if ( !all ) {
+			namespaces = event.type.split(".");
+			event.type = namespaces.shift();
+			namespace_sort = namespaces.slice(0).sort();
+			namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");
+		}
+
+		event.namespace = event.namespace || namespace_sort.join(".");
+
+		events = jQuery._data(this, "events");
+
+		handlers = (events || {})[ event.type ];
+
+		if ( events && handlers ) {
+			// Clone the handlers to prevent manipulation
+			handlers = handlers.slice(0);
+
+			for ( var j = 0, l = handlers.length; j < l; j++ ) {
+				var handleObj = handlers[ j ];
+
+				// Filter the functions by class
+				if ( all || namespace_re.test( handleObj.namespace ) ) {
+					// Pass in a reference to the handler function itself
+					// So that we can later remove it
+					event.handler = handleObj.handler;
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+
+					var ret = handleObj.handler.apply( this, args );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+
+					if ( event.isImmediatePropagationStopped() ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
+		var originalEvent = event;
+		event = jQuery.Event( originalEvent );
+
+		for ( var i = this.props.length, prop; i; ) {
+			prop = this.props[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary
+		if ( !event.target ) {
+			// Fixes #1925 where srcElement might not be defined either
+			event.target = event.srcElement || document;
+		}
+
+		// check if target is a textnode (safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement ) {
+			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+		}
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var doc = document.documentElement,
+				body = document.body;
+
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+		}
+
+		// Add which for key events
+		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
+			event.which = event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button !== undefined ) {
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+		}
+
+		return event;
+	},
+
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
+	proxy: jQuery.proxy,
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady,
+			teardown: jQuery.noop
+		},
+
+		live: {
+			add: function( handleObj ) {
+				jQuery.event.add( this,
+					liveConvert( handleObj.origType, handleObj.selector ),
+					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
+			},
+
+			remove: function( handleObj ) {
+				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
+			}
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
+	};
+
+jQuery.Event = function( src ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !this.preventDefault ) {
+		return new jQuery.Event( src );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+	// Check if mouse(over|out) are still within the same parent element
+	var parent = event.relatedTarget;
+
+	// Firefox sometimes assigns relatedTarget a XUL element
+	// which we cannot access the parentNode property of
+	try {
+
+		// Chrome does something similar, the parentNode property
+		// can be accessed but is null.
+		if ( parent !== document && !parent.parentNode ) {
+			return;
+		}
+		// Traverse up the tree
+		while ( parent && parent !== this ) {
+			parent = parent.parentNode;
+		}
+
+		if ( parent !== this ) {
+			// set the correct event type
+			event.type = event.data;
+
+			// handle event if we actually just moused on to a non sub-element
+			jQuery.event.handle.apply( this, arguments );
+		}
+
+	// assuming we've left the element since we most likely mousedover a xul element
+	} catch(e) { }
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+	event.type = event.data;
+	jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		setup: function( data ) {
+			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+		},
+		teardown: function( data ) {
+			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		}
+	};
+});
+
+// submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function( data, namespaces ) {
+			if ( this.nodeName && this.nodeName.toLowerCase() !== "form" ) {
+				jQuery.event.add(this, "click.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+						trigger( "submit", this, arguments );
+					}
+				});
+
+				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+						trigger( "submit", this, arguments );
+					}
+				});
+
+			} else {
+				return false;
+			}
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialSubmit" );
+		}
+	};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+	var changeFilters,
+
+	getVal = function( elem ) {
+		var type = elem.type, val = elem.value;
+
+		if ( type === "radio" || type === "checkbox" ) {
+			val = elem.checked;
+
+		} else if ( type === "select-multiple" ) {
+			val = elem.selectedIndex > -1 ?
+				jQuery.map( elem.options, function( elem ) {
+					return elem.selected;
+				}).join("-") :
+				"";
+
+		} else if ( elem.nodeName.toLowerCase() === "select" ) {
+			val = elem.selectedIndex;
+		}
+
+		return val;
+	},
+
+	testChange = function testChange( e ) {
+		var elem = e.target, data, val;
+
+		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
+			return;
+		}
+
+		data = jQuery._data( elem, "_change_data" );
+		val = getVal(elem);
+
+		// the current data will be also retrieved by beforeactivate
+		if ( e.type !== "focusout" || elem.type !== "radio" ) {
+			jQuery._data( elem, "_change_data", val );
+		}
+
+		if ( data === undefined || val === data ) {
+			return;
+		}
+
+		if ( data != null || val ) {
+			e.type = "change";
+			e.liveFired = undefined;
+			jQuery.event.trigger( e, arguments[1], elem );
+		}
+	};
+
+	jQuery.event.special.change = {
+		filters: {
+			focusout: testChange,
+
+			beforedeactivate: testChange,
+
+			click: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+					testChange.call( this, e );
+				}
+			},
+
+			// Change has to be called before submit
+			// Keydown will be called before keypress, which is used in submit-event delegation
+			keydown: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+					type === "select-multiple" ) {
+					testChange.call( this, e );
+				}
+			},
+
+			// Beforeactivate happens also before the previous element is blurred
+			// with this event you can't trigger a change event, but you can store
+			// information
+			beforeactivate: function( e ) {
+				var elem = e.target;
+				jQuery._data( elem, "_change_data", getVal(elem) );
+			}
+		},
+
+		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
+				return false;
+			}
+
+			for ( var type in changeFilters ) {
+				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			}
+
+			return rformElems.test( this.nodeName );
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialChange" );
+
+			return rformElems.test( this.nodeName );
+		}
+	};
+
+	changeFilters = jQuery.event.special.change.filters;
+
+	// Handle when the input is .focus()'d
+	changeFilters.focus = changeFilters.beforeactivate;
+}
+
+function trigger( type, elem, args ) {
+	// Piggyback on a donor event to simulate a different one.
+	// Fake originalEvent to avoid donor's stopPropagation, but if the
+	// simulated event prevents default then we do the same on the donor.
+	// Don't pass args or remember liveFired; they apply to the donor event.
+	var event = jQuery.extend( {}, args[ 0 ] );
+	event.type = type;
+	event.originalEvent = {};
+	event.liveFired = undefined;
+	jQuery.event.handle.call( elem, event );
+	if ( event.isDefaultPrevented() ) {
+		args[ 0 ].preventDefault();
+	}
+}
+
+// Create "bubbling" focus and blur events
+if ( document.addEventListener ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				this.addEventListener( orig, handler, true );
+			},
+			teardown: function() {
+				this.removeEventListener( orig, handler, true );
+			}
+		};
+
+		function handler( e ) {
+			e = jQuery.event.fix( e );
+			e.type = fix;
+			return jQuery.event.handle.call( this, e );
+		}
+	});
+}
+
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this[ name ](key, data, type[key], fn);
+			}
+			return this;
+		}
+
+		if ( jQuery.isFunction( data ) || data === false ) {
+			fn = data;
+			data = undefined;
+		}
+
+		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
+			jQuery( this ).unbind( event, handler );
+			return fn.apply( this, arguments );
+		}) : fn;
+
+		if ( type === "unload" && name !== "one" ) {
+			this.one( type, data, fn );
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.add( this[i], type, handler, data );
+			}
+		}
+
+		return this;
+	};
+});
+
+jQuery.fn.extend({
+	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.remove( this[i], type, fn );
+			}
+		}
+
+		return this;
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.live( types, data, fn, selector );
+	},
+
+	undelegate: function( selector, types, fn ) {
+		if ( arguments.length === 0 ) {
+				return this.unbind( "live" );
+
+		} else {
+			return this.die( types, null, fn, selector );
+		}
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			var event = jQuery.Event( type );
+			event.preventDefault();
+			event.stopPropagation();
+			jQuery.event.trigger( event, data, this[0] );
+			return event.result;
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			i = 1;
+
+		// link all the functions, so any of them can unbind this click handler
+		while ( i < args.length ) {
+			jQuery.proxy( fn, args[ i++ ] );
+		}
+
+		return this.click( jQuery.proxy( fn, function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		}));
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+var liveMap = {
+	focus: "focusin",
+	blur: "focusout",
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+};
+
+jQuery.each(["live", "die"], function( i, name ) {
+	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+		var type, i = 0, match, namespaces, preType,
+			selector = origSelector || this.selector,
+			context = origSelector ? this : jQuery( this.context );
+
+		if ( typeof types === "object" && !types.preventDefault ) {
+			for ( var key in types ) {
+				context[ name ]( key, data, types[key], selector );
+			}
+
+			return this;
+		}
+
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		types = (types || "").split(" ");
+
+		while ( (type = types[ i++ ]) != null ) {
+			match = rnamespaces.exec( type );
+			namespaces = "";
+
+			if ( match )  {
+				namespaces = match[0];
+				type = type.replace( rnamespaces, "" );
+			}
+
+			if ( type === "hover" ) {
+				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+				continue;
+			}
+
+			preType = type;
+
+			if ( type === "focus" || type === "blur" ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
+
+			if ( name === "live" ) {
+				// bind live handler
+				for ( var j = 0, l = context.length; j < l; j++ ) {
+					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
+						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+				}
+
+			} else {
+				// unbind live handler
+				context.unbind( "live." + liveConvert( type, selector ), fn );
+			}
+		}
+
+		return this;
+	};
+});
+
+function liveHandler( event ) {
+	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+		elems = [],
+		selectors = [],
+		events = jQuery._data( this, "events" );
+
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911)
+	if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) {
+		return;
+	}
+
+	if ( event.namespace ) {
+		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
+	}
+
+	event.liveFired = this;
+
+	var live = events.live.slice(0);
+
+	for ( j = 0; j < live.length; j++ ) {
+		handleObj = live[j];
+
+		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+			selectors.push( handleObj.selector );
+
+		} else {
+			live.splice( j--, 1 );
+		}
+	}
+
+	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+	for ( i = 0, l = match.length; i < l; i++ ) {
+		close = match[i];
+
+		for ( j = 0; j < live.length; j++ ) {
+			handleObj = live[j];
+
+			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) {
+				elem = close.elem;
+				related = null;
+
+				// Those two events require additional checking
+				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					event.type = handleObj.preType;
+					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+				}
+
+				if ( !related || related !== elem ) {
+					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
+				}
+			}
+		}
+	}
+
+	for ( i = 0, l = elems.length; i < l; i++ ) {
+		match = elems[i];
+
+		if ( maxLevel && match.level > maxLevel ) {
+			break;
+		}
+
+		event.currentTarget = match.elem;
+		event.data = match.handleObj.data;
+		event.handleObj = match.handleObj;
+
+		ret = match.handleObj.origHandler.apply( match.elem, arguments );
+
+		if ( ret === false || event.isPropagationStopped() ) {
+			maxLevel = match.level;
+
+			if ( ret === false ) {
+				stop = false;
+			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
+		}
+	}
+
+	return stop;
+}
+
+function liveConvert( type, selector ) {
+	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&");
+}
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.bind( name, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+});
+
+
+/*!
+ * Sizzle CSS Selector Engine
+ *  Copyright 2011, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true,
+	rBackslash = /\\/g,
+	rNonWord = /\W/;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function() {
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
+		soFar = selector;
+	
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
+		
+			parts.push( m[1] );
+		
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray( set );
+
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function( results ) {
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort( sortOrder );
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
+};
+
+Sizzle.find = function( expr, context, isXML ) {
+	var set;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var match,
+			type = Expr.order[i];
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice( 1, 1 );
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace( rBackslash, "" );
+				set = Expr.find[ type ]( match, context, isXML );
+
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( "*" ) :
+			[];
+	}
+
+	return { set: set, expr: expr };
+};
+
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var found, item,
+					filter = Expr.filter[ type ],
+					left = match[1];
+
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+
+								} else {
+									curLoop[i] = false;
+								}
+
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+
+	leftMatch: {},
+
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+
+	attrHandle: {
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		},
+		type: function( elem ) {
+			return elem.getAttribute( "type" );
+		}
+	},
+
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !rNonWord.test( part ),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+
+		"": function(checkSet, part, isXML){
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
+		},
+
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
+		}
+	},
+
+	find: {
+		ID: function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		},
+
+		NAME: function( match, context ) {
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [],
+					results = context.getElementsByName( match[1] );
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+
+		TAG: function( match, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( match[1] );
+			}
+		}
+	},
+	preFilter: {
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace( rBackslash, "" ) + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+
+		ID: function( match ) {
+			return match[1].replace( rBackslash, "" );
+		},
+
+		TAG: function( match, curLoop ) {
+			return match[1].replace( rBackslash, "" ).toLowerCase();
+		},
+
+		CHILD: function( match ) {
+			if ( match[1] === "nth" ) {
+				if ( !match[2] ) {
+					Sizzle.error( match[0] );
+				}
+
+				match[2] = match[2].replace(/^\+|\s*/g, '');
+
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+			else if ( match[2] ) {
+				Sizzle.error( match[0] );
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1] = match[1].replace( rBackslash, "" );
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			// Handle if an un-quoted value was used
+			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+
+					return false;
+				}
+
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+
+		POS: function( match ) {
+			match.unshift( true );
+
+			return match;
+		}
+	},
+	
+	filters: {
+		enabled: function( elem ) {
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+
+		disabled: function( elem ) {
+			return elem.disabled === true;
+		},
+
+		checked: function( elem ) {
+			return elem.checked === true;
+		},
+		
+		selected: function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+			
+			return elem.selected === true;
+		},
+
+		parent: function( elem ) {
+			return !!elem.firstChild;
+		},
+
+		empty: function( elem ) {
+			return !elem.firstChild;
+		},
+
+		has: function( elem, i, match ) {
+			return !!Sizzle( match[3], elem ).length;
+		},
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
+		},
+
+		text: function( elem ) {
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) 
+			// use getAttribute instead to test this case
+			return "text" === elem.getAttribute( 'type' );
+		},
+		radio: function( elem ) {
+			return "radio" === elem.type;
+		},
+
+		checkbox: function( elem ) {
+			return "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return "file" === elem.type;
+		},
+		password: function( elem ) {
+			return "password" === elem.type;
+		},
+
+		submit: function( elem ) {
+			return "submit" === elem.type;
+		},
+
+		image: function( elem ) {
+			return "image" === elem.type;
+		},
+
+		reset: function( elem ) {
+			return "reset" === elem.type;
+		},
+
+		button: function( elem ) {
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
+		}
+	},
+	setFilters: {
+		first: function( elem, i ) {
+			return i === 0;
+		},
+
+		last: function( elem, i, match, array ) {
+			return i === array.length - 1;
+		},
+
+		even: function( elem, i ) {
+			return i % 2 === 0;
+		},
+
+		odd: function( elem, i ) {
+			return i % 2 === 1;
+		},
+
+		lt: function( elem, i, match ) {
+			return i < match[3] - 0;
+		},
+
+		gt: function( elem, i, match ) {
+			return i > match[3] - 0;
+		},
+
+		nth: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		},
+
+		eq: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+
+			} else {
+				Sizzle.error( name );
+			}
+		},
+
+		CHILD: function( elem, match ) {
+			var type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					if ( type === "first" ) { 
+						return true; 
+					}
+
+					node = elem;
+
+				case "last":
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					return true;
+
+				case "nth":
+					var first = match[2],
+						last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+
+					if ( first === 0 ) {
+						return diff === 0;
+
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+
+		ID: function( elem, match ) {
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		
+		CLASS: function( elem, match ) {
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+
+		ATTR: function( elem, match ) {
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function( array, results ) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder, siblingCheck;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+	};
+
+} else {
+	sortOrder = function( a, b ) {
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+		}
+
+		var cur = a.nextSibling;
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+Sizzle.getText = function( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += Sizzle.getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+
+		Expr.filter.ID = function( elem, match ) {
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+
+	// release memory in IE
+	root = form = null;
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
+		};
+	}
+
+	// release memory in IE
+	div = null;
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+	
+		Sizzle = function( query, context, extra, seed ) {
+			context = context || document;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && !Sizzle.isXML(context) ) {
+				// See if we find a selector to speed up
+				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
+				
+				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
+					// Speed-up: Sizzle("TAG")
+					if ( match[1] ) {
+						return makeArray( context.getElementsByTagName( query ), extra );
+					
+					// Speed-up: Sizzle(".CLASS")
+					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
+						return makeArray( context.getElementsByClassName( match[2] ), extra );
+					}
+				}
+				
+				if ( context.nodeType === 9 ) {
+					// Speed-up: Sizzle("body")
+					// The body element only exists once, optimize finding it
+					if ( query === "body" && context.body ) {
+						return makeArray( [ context.body ], extra );
+						
+					// Speed-up: Sizzle("#ID")
+					} else if ( match && match[3] ) {
+						var elem = context.getElementById( match[3] );
+
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						if ( elem && elem.parentNode ) {
+							// Handle the case where IE and Opera return items
+							// by name instead of ID
+							if ( elem.id === match[3] ) {
+								return makeArray( [ elem ], extra );
+							}
+							
+						} else {
+							return makeArray( [], extra );
+						}
+					}
+					
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var oldContext = context,
+						old = context.getAttribute( "id" ),
+						nid = old || id,
+						hasParent = context.parentNode,
+						relativeHierarchySelector = /^\s*[+~]/.test( query );
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					} else {
+						nid = nid.replace( /'/g, "\\$&" );
+					}
+					if ( relativeHierarchySelector && hasParent ) {
+						context = context.parentNode;
+					}
+
+					try {
+						if ( !relativeHierarchySelector || hasParent ) {
+							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
+						}
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							oldContext.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		// release memory in IE
+		div = null;
+	})();
+}
+
+(function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
+		pseudoWorks = false;
+
+	try {
+		// This should fail with an exception
+		// Gecko does not error, returns false instead
+		matches.call( document.documentElement, "[test!='']:sizzle" );
+	
+	} catch( pseudoError ) {
+		pseudoWorks = true;
+	}
+
+	if ( matches ) {
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try { 
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						return matches.call( node, expr );
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function( match, context, isXML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	// release memory in IE
+	div = null;
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+			
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
+
+Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function( selector, context ) {
+	var match,
+		tmpSet = [],
+		later = "",
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})();
+
+
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.POS,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var ret = this.pushStack( "", "find", selector ),
+			length = 0;
+
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( var n = length; n < ret.length; n++ ) {
+					for ( var r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+
+	is: function( selector ) {
+		return !!selector && jQuery.filter( selector, this ).length > 0;
+	},
+
+	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+
+		if ( jQuery.isArray( selectors ) ) {
+			var match, selector,
+				matches = {},
+				level = 1;
+
+			if ( cur && selectors.length ) {
+				for ( i = 0, l = selectors.length; i < l; i++ ) {
+					selector = selectors[i];
+
+					if ( !matches[selector] ) {
+						matches[selector] = jQuery.expr.match.POS.test( selector ) ?
+							jQuery( selector, context || this.context ) :
+							selector;
+					}
+				}
+
+				while ( cur && cur.ownerDocument && cur !== context ) {
+					for ( selector in matches ) {
+						match = matches[selector];
+
+						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+							ret.push({ selector: selector, elem: cur, level: level });
+						}
+					}
+
+					cur = cur.parentNode;
+					level++;
+				}
+			}
+
+			return ret;
+		}
+
+		var pos = POS.test( selectors ) ?
+			jQuery( selectors, context || this.context ) : null;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context ) {
+						break;
+					}
+				}
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+
+		return this.pushStack( ret, "closest", selectors );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until ),
+			// The variable 'args' was introduced in
+			// https://github.com/jquery/jquery/commit/52a0238
+			// to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed.
+			// http://code.google.com/p/v8/issues/detail?id=1050
+			args = slice.call(arguments);
+
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, args.join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+}
+
+
+
+
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery( this );
+
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append(this);
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		return this.each(function() {
+			jQuery( this ).wrapAll( html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnocache.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, "<$1></$2>");
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery( this );
+
+				self.html( value.call(this, i, self.html()) );
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = jQuery.buildFragment( args, this, scripts );
+			}
+
+			fragment = results.fragment;
+
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						// Make sure that we do not leak memory by inadvertently discarding
+						// the original fragment (which might have attached data) instead of
+						// using it; in addition, use the original fragment object for the last
+						// item instead of first because it can end up being emptied incorrectly
+						// in certain situations (Bug #8070).
+						// Fragments from the fragment cache must always be cloned and never used
+						// in place.
+						results.cacheable || (l > 1 && i < lastIndex) ?
+							jQuery.clone( fragment, true, true ) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, evalScript );
+			}
+		}
+
+		return this;
+	}
+});
+
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var internalKey = jQuery.expando,
+		oldData = jQuery.data( src ),
+		curData = jQuery.data( dest, oldData );
+
+	// Switch to use the internal data object, if it exists, for the next
+	// stage of data copying
+	if ( (oldData = oldData[ internalKey ]) ) {
+		var events = oldData.events;
+				curData = curData[ internalKey ] = jQuery.extend({}, oldData);
+
+		if ( events ) {
+			delete curData.handle;
+			curData.events = {};
+
+			for ( var type in events ) {
+				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
+				}
+			}
+		}
+	}
+}
+
+function cloneFixAttributes(src, dest) {
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	var nodeName = dest.nodeName.toLowerCase();
+
+	// clearAttributes removes the attributes, which we don't want,
+	// but also removes the attachEvent events, which we *do* want
+	dest.clearAttributes();
+
+	// mergeAttributes, in contrast, only merges back on the
+	// original attributes, not the events
+	dest.mergeAttributes(src);
+
+	// IE6-8 fail to clone children inside object elements that use
+	// the proprietary classid attribute value (rather than the type
+	// attribute) to identify the type of content to display
+	if ( nodeName === "object" ) {
+		dest.outerHTML = src.outerHTML;
+
+	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+		if ( src.checked ) {
+			dest.defaultChecked = dest.checked = src.checked;
+		}
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+
+	// Event data gets referenced instead of copied if the expando
+	// gets copied too
+	dest.removeAttribute( jQuery.expando );
+}
+
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults,
+		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+		args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+
+		cacheable = true;
+		cacheresults = jQuery.fragments[ args[0] ];
+		if ( cacheresults ) {
+			if ( cacheresults !== 1 ) {
+				fragment = cacheresults;
+			}
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [],
+			insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = (i > 0 ? this.clone(true) : this).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+function getAll( elem ) {
+	if ( "getElementsByTagName" in elem ) {
+		return elem.getElementsByTagName( "*" );
+	
+	} else if ( "querySelectorAll" in elem ) {
+		return elem.querySelectorAll( "*" );
+
+	} else {
+		return [];
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var clone = elem.cloneNode(true),
+				srcElements,
+				destElements,
+				i;
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			// IE copies events bound via attachEvent when using cloneNode.
+			// Calling detachEvent on the clone will also remove the events
+			// from the original. In order to get around this, we use some
+			// proprietary methods to clear the events. Thanks to MooTools
+			// guys for this hotness.
+
+			cloneFixAttributes( elem, clone );
+
+			// Using Sizzle here is crazy slow, so we use getElementsByTagName
+			// instead
+			srcElements = getAll( elem );
+			destElements = getAll( clone );
+
+			// Weird iteration because IE will replace the length property
+			// with an element if you are cloning the body and one of the
+			// elements on the page has a name or id of "length"
+			for ( i = 0; srcElements[i]; ++i ) {
+				cloneFixAttributes( srcElements[i], destElements[i] );
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			cloneCopyEvent( elem, clone );
+
+			if ( deepDataAndEvents ) {
+				srcElements = getAll( elem );
+				destElements = getAll( clone );
+
+				for ( i = 0; srcElements[i]; ++i ) {
+					cloneCopyEvent( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		// Return the cloned set
+		return clone;
+},
+	clean: function( elems, context, fragment, scripts ) {
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [];
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
+				// Fix "XHTML"-style tags in all browsers
+				elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+				// Trim whitespace, otherwise indexOf won't work as expected
+				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+					wrap = wrapMap[ tag ] || wrapMap._default,
+					depth = wrap[0],
+					div = context.createElement("div");
+
+				// Go to html and back, then peel off extra wrappers
+				div.innerHTML = wrap[1] + elem + wrap[2];
+
+				// Move to the right depth
+				while ( depth-- ) {
+					div = div.lastChild;
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !jQuery.support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					var hasBody = rtbody.test(elem),
+						tbody = tag === "table" && !hasBody ?
+							div.firstChild && div.firstChild.childNodes :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !hasBody ?
+								div.childNodes :
+								[];
+
+					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+							tbody[ j ].parentNode.removeChild( tbody[ j ] );
+						}
+					}
+
+				}
+
+				// IE completely kills leading whitespace when innerHTML is used
+				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+				}
+
+				elem = div.childNodes;
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			for ( i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+					}
+					fragment.appendChild( ret[i] );
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	cleanData: function( elems ) {
+		var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
+			id = elem[ jQuery.expando ];
+
+			if ( id ) {
+				data = cache[ id ] && cache[ id ][ internalKey ];
+
+				if ( data && data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						// This is a shortcut to avoid jQuery.event.remove's overhead
+						} else {
+							jQuery.removeEvent( elem, type, data.handle );
+						}
+					}
+
+					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+					if ( data.handle ) {
+						data.handle.elem = null;
+					}
+				}
+
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+
+				delete cache[ id ];
+			}
+		}
+	}
+});
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	rdashAlpha = /-([a-z])/ig,
+	rupper = /([A-Z])/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+	curCSS,
+
+	getComputedStyle,
+	currentStyle,
+
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn.css = function( name, value ) {
+	// Setting 'undefined' is a no-op
+	if ( arguments.length === 2 && value === undefined ) {
+		return this;
+	}
+
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
+	});
+};
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity", "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"zIndex": true,
+		"fontWeight": true,
+		"opacity": true,
+		"zoom": true,
+		"lineHeight": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( typeof value === "number" && isNaN( value ) || value == null ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra ) {
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
+
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name, origName );
+		}
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	},
+
+	camelCase: function( string ) {
+		return string.replace( rdashAlpha, fcamelCase );
+	}
+});
+
+// DEPRECATED, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
+
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			var val;
+
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					val = getWH( elem, name, extra );
+
+				} else {
+					jQuery.swap( elem, cssShow, function() {
+						val = getWH( elem, name, extra );
+					});
+				}
+
+				if ( val <= 0 ) {
+					val = curCSS( elem, name, name );
+
+					if ( val === "0px" && currentStyle ) {
+						val = currentStyle( elem, name, name );
+					}
+
+					if ( val != null ) {
+						// Should return "auto" instead of 0, use 0 for
+						// temporary backwards-compat
+						return val === "" || val === "auto" ? "0px" : val;
+					}
+				}
+
+				if ( val < 0 || val == null ) {
+					val = elem.style[ name ];
+
+					// Should return "auto" instead of 0, use 0 for
+					// temporary backwards-compat
+					return val === "" || val === "auto" ? "0px" : val;
+				}
+
+				return typeof val === "string" ? val : val + "px";
+			}
+		},
+
+		set: function( elem, value ) {
+			if ( rnumpx.test( value ) ) {
+				// ignore negative width and height values #1599
+				value = parseFloat(value);
+
+				if ( value >= 0 ) {
+					return value + "px";
+				}
+
+			} else {
+				return value;
+			}
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
+				(parseFloat(RegExp.$1) / 100) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style;
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// Set the alpha filter to set the opacity
+			var opacity = jQuery.isNaN(value) ?
+				"" :
+				"alpha(opacity=" + value * 100 + ")",
+				filter = style.filter || "";
+
+			style.filter = ralpha.test(filter) ?
+				filter.replace(ralpha, opacity) :
+				style.filter + ' ' + opacity;
+		}
+	};
+}
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, newName, name ) {
+		var ret, defaultView, computedStyle;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
+
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+		}
+
+		return ret;
+	};
+}
+
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
+			style = elem.style;
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			// Remember the original values
+			left = style.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : (ret || 0);
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWH( elem, name, extra ) {
+	var which = name === "width" ? cssWidth : cssHeight,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+	if ( extra === "border" ) {
+		return val;
+	}
+
+	jQuery.each( which, function() {
+		if ( !extra ) {
+			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
+		}
+
+		if ( extra === "margin" ) {
+			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
+
+		} else {
+			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
+		}
+	});
+
+	return val;
+}
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /(?:^file|^widget|\-extension):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rquery = /\?/,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rspacesAjax = /\s+/,
+	rts = /([?&])_=[^&]*/,
+	rucHeaders = /(^|\-)([a-z])/g,
+	rucHeadersFunc = function( _, $1, $2 ) {
+		return $1 + $2.toUpperCase();
+	},
+	rurl = /^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Document location
+	ajaxLocation,
+
+	// Document location segments
+	ajaxLocParts;
+
+// #8138, IE may throw an exception when accessing
+// a field from document.location if document.domain has been set
+try {
+	ajaxLocation = document.location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() );
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		if ( jQuery.isFunction( func ) ) {
+			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
+				i = 0,
+				length = dataTypes.length,
+				dataType,
+				list,
+				placeBefore;
+
+			// For each dataType in the dataTypeExpression
+			for(; i < length; i++ ) {
+				dataType = dataTypes[ i ];
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 ) || "*";
+				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( func );
+			}
+		}
+	};
+}
+
+//Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+		dataType /* internal */, inspected /* internal */ ) {
+
+	dataType = dataType || options.dataTypes[ 0 ];
+	inspected = inspected || {};
+
+	inspected[ dataType ] = true;
+
+	var list = structure[ dataType ],
+		i = 0,
+		length = list ? list.length : 0,
+		executeOnly = ( structure === prefilters ),
+		selection;
+
+	for(; i < length && ( executeOnly || !selection ); i++ ) {
+		selection = list[ i ]( options, originalOptions, jqXHR );
+		// If we got redirected to another dataType
+		// we try there if executing only and not done already
+		if ( typeof selection === "string" ) {
+			if ( !executeOnly || inspected[ selection ] ) {
+				selection = undefined;
+			} else {
+				options.dataTypes.unshift( selection );
+				selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected );
+			}
+		}
+	}
+	// If we're only executing or nothing was selected
+	// we try the catchall dataType if not done already
+	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+		selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected );
+	}
+	// unnecessary when only executing (prefilters)
+	// but it'll be ignored by the caller in that case
+	return selection;
+}
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf( " " );
+		if ( off >= 0 ) {
+			var selector = url.slice( off, url.length );
+			url = url.slice( 0, off );
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = undefined;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			// Complete callback (responseText is used internally)
+			complete: function( jqXHR, status, responseText ) {
+				// Store the response as specified by the jqXHR object
+				responseText = jqXHR.responseText;
+				// If successful, inject the HTML into all the matched elements
+				if ( jqXHR.isResolved() ) {
+					// #4825: Get the actual response in case
+					// a dataFilter is present in ajaxSettings
+					jqXHR.done(function( r ) {
+						responseText = r;
+					});
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [ responseText, status, jqXHR ] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+
+	serializeArray: function() {
+		return this.map(function(){
+			return this.elements ? jQuery.makeArray( this.elements ) : this;
+		})
+		.filter(function(){
+			return this.name && !this.disabled &&
+				( this.checked || rselectTextarea.test( this.nodeName ) ||
+					rinput.test( this.type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val, i ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+	jQuery.fn[ o ] = function( f ){
+		return this.bind( o, f );
+	};
+} );
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			type: method,
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	};
+} );
+
+jQuery.extend({
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function ( target, settings ) {
+		if ( !settings ) {
+			// Only one parameter, we extend ajaxSettings
+			settings = target;
+			target = jQuery.extend( true, jQuery.ajaxSettings, settings );
+		} else {
+			// target was provided, we extend into it
+			jQuery.extend( true, target, jQuery.ajaxSettings, settings );
+		}
+		// Flatten fields we don't want deep extended
+		for( var field in { context: 1, url: 1 } ) {
+			if ( field in settings ) {
+				target[ field ] = settings[ field ];
+			} else if( field in jQuery.ajaxSettings ) {
+				target[ field ] = jQuery.ajaxSettings[ field ];
+			}
+		}
+		return target;
+	},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		traditional: false,
+		headers: {},
+		crossDomain: null,
+		*/
+
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			text: "text/plain",
+			json: "application/json, text/javascript",
+			"*": "*/*"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// List of data converters
+		// 1) key format is "source_type destination_type" (a single space in-between)
+		// 2) the catchall symbol "*" can be used for source_type
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		}
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events
+			// It's the callbackContext if one was provided in the options
+			// and if it's a DOM node or a jQuery collection
+			globalEventContext = callbackContext !== s &&
+				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+						jQuery( callbackContext ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery._Deferred(),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// ifModified key
+			ifModifiedKey,
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// The jqXHR state
+			state = 0,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Fake xhr
+			jqXHR = {
+
+				readyState: 0,
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( !state ) {
+						requestHeaders[ name.toLowerCase().replace( rucHeaders, rucHeadersFunc ) ] = value;
+					}
+					return this;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match === undefined ? null : match;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					statusText = statusText || "abort";
+					if ( transport ) {
+						transport.abort( statusText );
+					}
+					done( 0, statusText );
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status, statusText, responses, headers ) {
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status ? 4 : 0;
+
+			var isSuccess,
+				success,
+				error,
+				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
+				lastModified,
+				etag;
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+
+					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
+						jQuery.lastModified[ ifModifiedKey ] = lastModified;
+					}
+					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
+						jQuery.etag[ ifModifiedKey ] = etag;
+					}
+				}
+
+				// If not modified
+				if ( status === 304 ) {
+
+					statusText = "notmodified";
+					isSuccess = true;
+
+				// If we have data
+				} else {
+
+					try {
+						success = ajaxConvert( s, response );
+						statusText = "success";
+						isSuccess = true;
+					} catch(e) {
+						// We have a parsererror
+						statusText = "parsererror";
+						error = e;
+					}
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if( !statusText || status ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = statusText;
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+						[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		// Attach deferreds
+		deferred.promise( jqXHR );
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+		jqXHR.complete = completeDeferred.done;
+
+		// Status-dependent callbacks
+		jqXHR.statusCode = function( map ) {
+			if ( map ) {
+				var tmp;
+				if ( state < 2 ) {
+					for( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+					}
+				} else {
+					tmp = map[ jqXHR.status ];
+					jqXHR.then( tmp, tmp );
+				}
+			}
+			return this;
+		};
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
+
+		// Determine if a cross-domain request is in order
+		if ( !s.crossDomain ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefiler, stop there
+		if ( state === 2 ) {
+			return false;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+			}
+
+			// Get ifModifiedKey before adding the anti-cache parameter
+			ifModifiedKey = s.url;
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts, "$1_=" + ts );
+
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			requestHeaders[ "Content-Type" ] = s.contentType;
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			ifModifiedKey = ifModifiedKey || s.url;
+			if ( jQuery.lastModified[ ifModifiedKey ] ) {
+				requestHeaders[ "If-Modified-Since" ] = jQuery.lastModified[ ifModifiedKey ];
+			}
+			if ( jQuery.etag[ ifModifiedKey ] ) {
+				requestHeaders[ "If-None-Match" ] = jQuery.etag[ ifModifiedKey ];
+			}
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		requestHeaders.Accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+			s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
+			s.accepts[ "*" ];
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+				// Abort if not done already
+				jqXHR.abort();
+				return false;
+
+		}
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout( function(){
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch (e) {
+				// Propagate exception as error if not done
+				if ( status < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					jQuery.error( e );
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction( value ) ? value() : value;
+				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+			};
+
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			} );
+
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[ prefix ], traditional, add );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join( "&" ).replace( r20, "+" );
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray( obj ) && obj.length ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && obj != null && typeof obj === "object" ) {
+		// If we see an array here, it is empty and should be treated as an empty
+		// object
+		if ( jQuery.isArray( obj ) || jQuery.isEmptyObject( obj ) ) {
+			add( prefix, "" );
+
+		// Serialize object item.
+		} else {
+			for ( var name in obj ) {
+				buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+			}
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields,
+		ct,
+		type,
+		finalDataType,
+		firstDataType;
+
+	// Fill responseXXX fields
+	for( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	var dataTypes = s.dataTypes,
+		converters = {},
+		i,
+		key,
+		length = dataTypes.length,
+		tmp,
+		// Current and previous dataTypes
+		current = dataTypes[ 0 ],
+		prev,
+		// Conversion expression
+		conversion,
+		// Conversion function
+		conv,
+		// Conversion functions (transitive conversion)
+		conv1,
+		conv2;
+
+	// For each dataType in the chain
+	for( i = 1; i < length; i++ ) {
+
+		// Create converters map
+		// with lowercased keys
+		if ( i === 1 ) {
+			for( key in s.converters ) {
+				if( typeof key === "string" ) {
+					converters[ key.toLowerCase() ] = s.converters[ key ];
+				}
+			}
+		}
+
+		// Get the dataTypes
+		prev = current;
+		current = dataTypes[ i ];
+
+		// If current is auto dataType, update it to prev
+		if( current === "*" ) {
+			current = prev;
+		// If no auto and dataTypes are actually different
+		} else if ( prev !== "*" && prev !== current ) {
+
+			// Get the converter
+			conversion = prev + " " + current;
+			conv = converters[ conversion ] || converters[ "* " + current ];
+
+			// If there is no direct converter, search transitively
+			if ( !conv ) {
+				conv2 = undefined;
+				for( conv1 in converters ) {
+					tmp = conv1.split( " " );
+					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
+						conv2 = converters[ tmp[1] + " " + current ];
+						if ( conv2 ) {
+							conv1 = converters[ conv1 ];
+							if ( conv1 === true ) {
+								conv = conv2;
+							} else if ( conv2 === true ) {
+								conv = conv1;
+							}
+							break;
+						}
+					}
+				}
+			}
+			// If we found no converter, dispatch an error
+			if ( !( conv || conv2 ) ) {
+				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
+			}
+			// If found converter is not an equivalence
+			if ( conv !== true ) {
+				// Convert with 1 or 2 converters accordingly
+				response = conv ? conv( response ) : conv2( conv1(response) );
+			}
+		}
+	}
+	return response;
+}
+
+
+
+
+var jsc = jQuery.now(),
+	jsre = /(\=)\?(&|$)|()\?\?()/i;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		return jQuery.expando + "_" + ( jsc++ );
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var dataIsString = ( typeof s.data === "string" );
+
+	if ( s.dataTypes[ 0 ] === "jsonp" ||
+		originalSettings.jsonpCallback ||
+		originalSettings.jsonp != null ||
+		s.jsonp !== false && ( jsre.test( s.url ) ||
+				dataIsString && jsre.test( s.data ) ) ) {
+
+		var responseContainer,
+			jsonpCallback = s.jsonpCallback =
+				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
+			previous = window[ jsonpCallback ],
+			url = s.url,
+			data = s.data,
+			replace = "$1" + jsonpCallback + "$2",
+			cleanUp = function() {
+				// Set callback back to previous value
+				window[ jsonpCallback ] = previous;
+				// Call if it was a function and we have a response
+				if ( responseContainer && jQuery.isFunction( previous ) ) {
+					window[ jsonpCallback ]( responseContainer[ 0 ] );
+				}
+			};
+
+		if ( s.jsonp !== false ) {
+			url = url.replace( jsre, replace );
+			if ( s.url === url ) {
+				if ( dataIsString ) {
+					data = data.replace( jsre, replace );
+				}
+				if ( s.data === data ) {
+					// Add callback manually
+					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+				}
+			}
+		}
+
+		s.url = url;
+		s.data = data;
+
+		// Install callback
+		window[ jsonpCallback ] = function( response ) {
+			responseContainer = [ response ];
+		};
+
+		// Install cleanUp function
+		jqXHR.then( cleanUp, cleanUp );
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( jsonpCallback + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Delegate to script
+		return "script";
+	}
+} );
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /javascript|ecmascript/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+} );
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = "async";
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+
+						// Dereference the script
+						script = undefined;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// This arises when a base node is used (#2709 and #4378).
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( 0, 1 );
+				}
+			}
+		};
+	}
+} );
+
+
+
+
+var // #5280: next active xhr id and list of active xhrs' callbacks
+	xhrId = jQuery.now(),
+	xhrCallbacks,
+
+	// XHR used to determine supports properties
+	testXHR;
+
+// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+function xhrOnUnloadAbort() {
+	jQuery( window ).unload(function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	});
+}
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Test if we can create an xhr object
+testXHR = jQuery.ajaxSettings.xhr();
+jQuery.support.ajax = !!testXHR;
+
+// Does this browser support crossDomain XHR requests
+jQuery.support.cors = testXHR && ( "withCredentials" in testXHR );
+
+// No need for the temporary xhr anymore
+testXHR = undefined;
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var xhr = s.xhr(),
+						handle,
+						i;
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// Requested-With header
+					// Not set for crossDomain requests with no content
+					// (see why at http://trac.dojotoolkit.org/ticket/9486)
+					// Won't change header if already provided
+					if ( !( s.crossDomain && !s.hasContent ) && !headers["X-Requested-With"] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( _ ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+
+						var status,
+							statusText,
+							responseHeaders,
+							responses,
+							xml;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occured
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									delete xhrCallbacks[ handle ];
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+									responses = {};
+									xml = xhr.responseXML;
+
+									// Construct response list
+									if ( xml && xml.documentElement /* #4958 */ ) {
+										responses.xml = xml;
+									}
+									responses.text = xhr.responseText;
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					// if we're in sync mode or it's in cache
+					// and has been retrieved directly (IE6 & IE7)
+					// we need to manually fire the callback
+					if ( !s.async || xhr.readyState === 4 ) {
+						callback();
+					} else {
+						// Create the active xhrs callbacks list if needed
+						// and attach the unload handler
+						if ( !xhrCallbacks ) {
+							xhrCallbacks = {};
+							xhrOnUnloadAbort();
+						}
+						// Add to list of active xhrs callbacks
+						handle = xhrId++;
+						xhr.onreadystatechange = xhrCallbacks[ handle ] = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback(0,1);
+					}
+				}
+			};
+		}
+	});
+}
+
+
+
+
+var elemdisplay = {},
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	];
+
+jQuery.fn.extend({
+	show: function( speed, easing, callback ) {
+		var elem, display;
+
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				// Reset the inline display of this element to learn if it is
+				// being hidden by cascaded rules or not
+				if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
+					display = elem.style.display = "";
+				}
+
+				// Set elements which have been overridden with display: none
+				// in a stylesheet to whatever the default browser style is
+				// for such an element
+				if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+					jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+				}
+			}
+
+			// Set the display of most of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				if ( display === "" || display === "none" ) {
+					elem.style.display = jQuery._data(elem, "olddisplay") || "";
+				}
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, easing, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				var display = jQuery.css( this[i], "display" );
+
+				if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+					jQuery._data( this[i], "olddisplay", display );
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				this[i].style.display = "none";
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2, callback ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, easing, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, easing, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed(speed, easing, callback);
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete );
+		}
+
+		return this[ optall.queue === false ? "each" : "queue" ](function() {
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			var opt = jQuery.extend({}, optall), p,
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				self = this;
+
+			for ( p in prop ) {
+				var name = jQuery.camelCase( p );
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
+				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
+					return opt.complete.call(this);
+				}
+
+				if ( isElement && ( p === "height" || p === "width" ) ) {
+					// Make sure that nothing sneaks out
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height
+					// animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+						if ( !jQuery.support.inlineBlockNeedsLayout ) {
+							this.style.display = "inline-block";
+
+						} else {
+							var display = defaultDisplay(this.nodeName);
+
+							// inline-level elements accept inline-block;
+							// block-level elements need to be inline with layout
+							if ( display === "inline" ) {
+								this.style.display = "inline-block";
+
+							} else {
+								this.style.display = "inline";
+								this.style.zoom = 1;
+							}
+						}
+					}
+				}
+
+				if ( jQuery.isArray( prop[p] ) ) {
+					// Create (if needed) and add to specialEasing
+					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+					prop[p] = prop[p][0];
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			opt.curAnim = jQuery.extend({}, prop);
+
+			jQuery.each( prop, function( name, val ) {
+				var e = new jQuery.fx( self, opt, name );
+
+				if ( rfxtypes.test(val) ) {
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
+				} else {
+					var parts = rfxnum.exec(val),
+						start = e.cur();
+
+					if ( parts ) {
+						var end = parseFloat( parts[2] ),
+							unit = parts[3] || ( jQuery.cssNumber[ name ] ? "" : "px" );
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							jQuery.style( self, name, (end || 1) + unit);
+							start = ((end || 1) / e.cur()) * start;
+							jQuery.style( self, name, start + unit);
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			});
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+
+	stop: function( clearQueue, gotoEnd ) {
+		var timers = jQuery.timers;
+
+		if ( clearQueue ) {
+			this.queue([]);
+		}
+
+		this.each(function() {
+			// go in reverse order so anything added to the queue during the loop is ignored
+			for ( var i = timers.length - 1; i >= 0; i-- ) {
+				if ( timers[i].elem === this ) {
+					if (gotoEnd) {
+						// force the next step to be the last
+						timers[i](true);
+					}
+
+					timers.splice(i, 1);
+				}
+			}
+		});
+
+		// start the next in the queue if the last step wasn't forced
+		if ( !gotoEnd ) {
+			this.dequeue();
+		}
+
+		return this;
+	}
+
+});
+
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
+
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function() {
+			if ( opt.queue !== false ) {
+				jQuery(this).dequeue();
+			}
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		if ( !options.orig ) {
+			options.orig = {};
+		}
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+	},
+
+	// Get the current size
+	cur: function() {
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var parsed,
+			r = jQuery.css( this.elem, this.prop );
+		// Empty strings, null, undefined and "auto" are converted to 0,
+		// complex values such as "rotate(1rad)" are returned as is,
+		// simple values such as "10px" are parsed to Float.
+		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx;
+
+		this.startTime = jQuery.now();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
+		this.now = this.start;
+		this.pos = this.state = 0;
+
+		function t( gotoEnd ) {
+			return self.step(gotoEnd);
+		}
+
+		t.elem = this.elem;
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval(fx.tick, fx.interval);
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var t = jQuery.now(), done = true;
+
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			this.options.curAnim[ this.prop ] = true;
+
+			for ( var i in this.options.curAnim ) {
+				if ( this.options.curAnim[i] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				// Reset the overflow
+				if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+					var elem = this.elem,
+						options = this.options;
+
+					jQuery.each( [ "", "X", "Y" ], function (index, value) {
+						elem.style[ "overflow" + value ] = options.overflow[index];
+					} );
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( this.options.hide ) {
+					jQuery(this.elem).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( this.options.hide || this.options.show ) {
+					for ( var p in this.options.curAnim ) {
+						jQuery.style( this.elem, p, this.options.orig[p] );
+					}
+				}
+
+				// Execute the complete function
+				this.options.complete.call( this.elem );
+			}
+
+			return false;
+
+		} else {
+			var n = t - this.startTime;
+			this.state = n / this.options.duration;
+
+			// Perform the easing function, defaults to swing
+			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
+			this.now = this.start + ((this.end - this.start) * this.pos);
+
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timers = jQuery.timers;
+
+		for ( var i = 0; i < timers.length; i++ ) {
+			if ( !timers[i]() ) {
+				timers.splice(i--, 1);
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+
+	interval: 13,
+
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+
+	speeds: {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style( fx.elem, "opacity", fx.now );
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+function defaultDisplay( nodeName ) {
+	if ( !elemdisplay[ nodeName ] ) {
+		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
+			display = elem.css("display");
+
+		elem.remove();
+
+		if ( display === "none" || display === "" ) {
+			display = "block";
+		}
+
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
+
+
+
+var rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0], box;
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		var doc = elem.ownerDocument,
+			docElem = doc.documentElement;
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow(doc),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ),
+			scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft),
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		jQuery.offset.initialize();
+
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.offset = {
+	initialize: function() {
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
+			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+
+		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+		container.innerHTML = html;
+		body.insertBefore( container, body.firstChild );
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		checkDiv.style.position = "fixed";
+		checkDiv.style.top = "20px";
+
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = "";
+
+		innerDiv.style.overflow = "hidden";
+		innerDiv.style.position = "relative";
+
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+		body.removeChild( container );
+		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = jQuery.noop;
+	},
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is absolute
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+		}
+
+		curTop  = calculatePosition ? curPosition.top  : parseFloat( curCSSTop,  10 ) || 0;
+		curLeft = calculatePosition ? curPosition.left : parseFloat( curCSSLeft, 10 ) || 0;
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if (options.top != null) {
+			props.top = (options.top - curOffset.top) + curTop;
+		}
+		if (options.left != null) {
+			props.left = (options.left - curOffset.left) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function(val) {
+		var elem = this[0], win;
+
+		if ( !elem ) {
+			return null;
+		}
+
+		if ( val !== undefined ) {
+			// Set the scroll offset
+			return this.each(function() {
+				win = getWindow( this );
+
+				if ( win ) {
+					win.scrollTo(
+						!i ? val : jQuery(win).scrollLeft(),
+						i ? val : jQuery(win).scrollTop()
+					);
+
+				} else {
+					this[ method ] = val;
+				}
+			});
+		} else {
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+
+
+
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function() {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, "padding" ) ) :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function( margin ) {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		if ( jQuery.isWindow( elem ) ) {
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+			var docElemProp = elem.document.documentElement[ "client" + name ];
+			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
+				elem.document.body[ "client" + name ] || docElemProp;
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNaN( ret ) ? orig : ret;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
+	};
+
+});
+
+
+window.jQuery = window.$ = jQuery;
+})(window);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/archimedes.json	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1050 @@
+{
+"comment" : [
+  "Angaben nach:",
+  "Klimpert, Richard: Lexikon der Münzen, Maße, Gewichte, Zählarten und Zeitgrößen aller Länder der Erde 2) Berlin 1896 (Reprint Graz 1972)",
+  "Doursther, Horace: Dictionnaire universel des poids et mesures anciens et modernes. Paris 1840 (Reprint Amsterdam 1965)"
+  ],
+"section" : [
+  {
+    "name"  : "Längenmaße: metrisch",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "m",
+      "factor" : "1"
+      },
+      {
+      "name" : "mm",
+      "factor" : "0.001"
+      },
+      {
+      "name" : "cm",
+      "factor" : "0.01"
+      },
+      {
+      "name" : "dm",
+      "factor" : "0.1"
+      },
+      {
+      "name" : "km",
+      "factor" : "1000"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: nautisch",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "geographische Meile",
+      "factor" : "7420"
+      },
+      {
+      "name" : "Seemeile",
+      "factor" : "1854.965"
+      },
+      {
+      "name" : "fathom",
+      "factor" : "1.828782"
+      },
+      {
+      "name" : "cable",
+      "factor" : "182.8782"
+      },
+      {
+      "name" : "league",
+      "factor" : "5564.895"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: England",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "foot",
+      "factor" : "0.304797",
+      "subunits" : "12"
+      },
+      {
+      "name" : "inch",
+      "factor" : "0.02539975"
+      },
+      {
+      "name" : "yard",
+      "factor" : "0.914391",
+      "subunits" : "3"
+      },
+      {
+      "name" : "pole",
+      "factor" : "5.0291505",
+      "subunits" : "11"
+      },
+      {
+      "name" : "chain",
+      "factor" : "20.116602",
+      "subunits" : "4"
+      },
+      {
+      "name" : "furlong",
+      "factor" : "201.16602"
+      },
+      {
+      "name" : "mile",
+      "factor" : "1609.32816",
+      "subunits" : "8"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: Italien",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "palmo d'architetto (Rom)",
+      "factor" : "0.223425",
+      "subunits" : "12"
+      },
+      {
+      "name" : "braccio (Florenz)",
+      "factor" : "0.5836"
+      },
+      {
+      "name" : "braccio (Mailand)",
+      "factor" : "0.5949"
+      },
+      {
+      "name" : "canna d'architetto (Rom)",
+      "factor" : "2.23425"
+      },
+      {
+      "name" : "canna di commercio (Rom)",
+      "factor" : "1.9920"
+      },
+      {
+      "name" : "canna d'architetto (Florenz)",
+      "factor" : "2.9180"
+      },
+      {
+      "name" : "canna di commercio (Florenz)",
+      "factor" : "2.3344"
+      },
+      {
+      "name" : "canna (Neapel)",
+      "factor" : "2.0961"
+      },
+      {
+      "name" : "miglio (Lombardei)",
+      "factor" : "1784.808"
+      },
+      {
+      "name" : "miglio (Neapel)",
+      "factor" : "1855.110"
+      },
+      {
+      "name" : "miglio (Rom)",
+      "factor" : "1489.50"
+      },
+      {
+      "name" : "minuta (Rom)",
+      "factor" : "0.00372375"
+      },
+      {
+      "name" : "oncia (Rom)",
+      "factor" : "0.01861875"
+      },
+      {
+      "name" : "oncia (Mailand)",
+      "factor" : "0.49575"
+      },
+      {
+      "name" : "palmo di commercio (Rom)",
+      "factor" : "0.249"
+      },
+      {
+      "name" : "palmo (Florenz)",
+      "factor" : "0.2918"
+      },
+      {
+      "name" : "piede (Brescia)",
+      "factor" : "0.471"
+      },
+      {
+      "name" : "piede (Carrara)",
+      "factor" : "0.2933"
+      },
+      {
+      "name" : "piede (Como)",
+      "factor" : "0.4512"
+      },
+      {
+      "name" : "piede (Modena)",
+      "factor" : "0.523048"
+      },
+      {
+      "name" : "piede (Reggio Em.)",
+      "factor" : "0.530898"
+      },
+      {
+      "name" : "piede (Venedig)",
+      "factor" : "0.347735"
+      },
+      {
+      "name" : "piede (Vicenza)",
+      "factor" : "0.3574"
+      },
+      {
+      "name" : "piede (Verona)",
+      "factor" : "0.3429"
+      },
+      {
+      "name" : "piede (Rom)",
+      "factor" : "0.297587"
+      },
+      {
+      "name" : "piede Lombardo",
+      "factor" : "0.435185"
+      },
+      {
+      "name" : "piede liprando (Turin)",
+      "factor" : "0.51377"
+      },
+      {
+      "name" : "piede manuale (Turin)",
+      "factor" : "0.342511"
+      },
+      {
+      "name" : "piede (Neapel, 'palmo')",
+      "factor" : "0.26455"
+      },
+      {
+      "name" : "soldo (Florenz)",
+      "factor" : "0.2918"
+      },
+      {
+      "name" : "trabucco piemontese (Turin)",
+      "factor" : "3.08259"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: Niederlande",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "voet (Amsterdam)",
+      "factor" : "0.283113"
+      },
+      {
+      "name" : "voet (Antwerpen)",
+      "factor" : "0.2868"
+      },
+      {
+      "name" : "voet (Aelst)",
+      "factor" : "0.2772"
+      },
+      {
+      "name" : "voet (Breda)",
+      "factor" : "0.28413"
+      },
+      {
+      "name" : "voet (Brügge)",
+      "factor" : "0.27439"
+      },
+      {
+      "name" : "voet (Brüssel)",
+      "factor" : "0.2757503"
+      },
+      {
+      "name" : "voet (Groningen)",
+      "factor" : "0.2922"
+      },
+      {
+      "name" : "voet (Haarlem)",
+      "factor" : "0.2858"
+      },
+      {
+      "name" : "voet (Kortrijk)",
+      "factor" : "0.2977"
+      },
+      {
+      "name" : "voet (Tournai)",
+      "factor" : "0.2977"
+      },
+      {
+      "name" : "voet (Utrecht)",
+      "factor" : "0.2683"
+      },
+      {
+      "name" : "voet (Ypern)",
+      "factor" : "0.2739"
+      },
+      {
+      "name" : "pied (Hainaut)",
+      "factor" : "0.2934"
+      },
+      {
+      "name" : "pied St. Hubert (Lüttich)",
+      "factor" : "0.294698"
+      },
+      {
+      "name" : "pied St. Lambert (Lüttich)",
+      "factor" : "0.291796"
+      },
+      {
+      "name" : "pied Ste. Gertrude (Nivelles)",
+      "factor" : "0.27709"
+      },
+      {
+      "name" : "steenvoet (Oudenaerde)",
+      "factor" : "0.2977"
+      },
+      {
+      "name" : "houtvoet (Oudenaerde)",
+      "factor" : "0.292"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: Frankreich",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "pied du Roi (Paris)",
+      "factor" : "0.32483938497"
+      },
+      {
+      "name" : "pied (Arras)",
+      "factor" : "0.29777"
+      },
+      {
+      "name" : "pied (Cambrai)",
+      "factor" : "0.29777"
+      },
+      {
+      "name" : "Burgundischer Fuß",
+      "factor" : "0.33212"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: Südeuropa",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "pié de Burgos (Spanien)",
+      "factor" : "0.278635"
+      },
+      {
+      "name" : "pé (Portugal)",
+      "factor" : "0.33"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: deutschspr. Länder",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "Fuß (Basel)",
+      "factor" : "0.29820"
+      },
+      {
+      "name" : "Fuß (Bayern)",
+      "factor" : "0.2918592"
+      },
+      {
+      "name" : "Fuß (Braunschweig)",
+      "factor" : "0.2853624"
+      },
+      {
+      "name" : "Fuß (Gotha)",
+      "factor" : "0.287622"
+      },
+      {
+      "name" : "Fuß (Hamburg)",
+      "factor" : "0.286575"
+      },
+      {
+      "name" : "Fuß (Hessen)",
+      "factor" : "0.287669"
+      },
+      {
+      "name" : "Fuß (Köln)",
+      "factor" : "0.2876"
+      },
+      {
+      "name" : "Fuß (Mecklenburg)",
+      "factor" : "0.291006"
+      },
+      {
+      "name" : "Fuß (Münster)",
+      "factor" : "0.2908"
+      },
+      {
+      "name" : "Fuß (Pommern)",
+      "factor" : "0.2921"
+      },
+      {
+      "name" : "Fuß (rheinisch)",
+      "factor" : "0.3138535"
+      },
+      {
+      "name" : "Fuß (Sachsen)",
+      "factor" : "0.2831901"
+      },
+      {
+      "name" : "Fuß (Preußen)",
+      "factor" : "0.3138535"
+      },
+      {
+      "name" : "Fuß (Wien)",
+      "factor" : "0.3180807"
+      },
+      {
+      "name" : "Fuß (Württemberg)",
+      "factor" : "0.2864903"
+      },
+      {
+      "name" : "Werkschuh (Frankfurt)",
+      "factor" : "0.2846143"
+      },
+      {
+      "name" : "Meile (Preußen)",
+      "factor" : "7532.485"
+      },
+      {
+      "name" : "Postmeile (Österreich)",
+      "factor" : "7585.937"
+      },
+      {
+      "name" : "Dezimalfuß (Preußen)",
+      "factor" : "0.3766242"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: Osteuropa",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "Fuß (Böhmen)",
+      "factor" : "0.2964"
+      },
+      {
+      "name" : "Fuß (Mähren)",
+      "factor" : "0.29596"
+      },
+      {
+      "name" : "stopa (Krakauer Fuß)",
+      "factor" : "0.3564"
+      },
+      {
+      "name" : "stopa (Warschauer Fuß)",
+      "factor" : "0.288"
+      },
+      {
+      "name" : "Fuß (Rußland)",
+      "factor" : "0.3556"
+      },
+      {
+      "name" : "arschin",
+      "factor" : "0.7112"
+      },
+      {
+      "name" : "saschen (Faden)",
+      "factor" : "2.133"
+      },
+      {
+      "name" : "werst",
+      "factor" : "1066.8"
+      },
+      {
+      "name" : "milja",
+      "factor" : "7468"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Längenmaße: Antike",
+    "group" : "1",
+    "unit" : [
+      {
+      "name" : "pes romanus",
+      "factor" : "0.2945"
+      },
+      {
+      "name" : "pollex (Zoll)",
+      "factor" : "0.0245416667"
+      },
+      {
+      "name" : "digitus (Fingerbreite)",
+      "factor" : "0.01840625"
+      },
+      {
+      "name" : "palmus (Handbreite)",
+      "factor" : "0.073625"
+      },
+      {
+      "name" : "cubitus (Elle)",
+      "factor" : "0.44175"
+      },
+      {
+      "name" : "passus (Doppelschritt)",
+      "factor" : "1.4725"
+      },
+      {
+      "name" : "pertica",
+      "factor" : "2.945"
+      },
+      {
+      "name" : "actus",
+      "factor" : "35.34"
+      },
+      {
+      "name" : "mille passus (Meile)",
+      "factor" : "1472.5"
+      },
+      {
+      "name" : "stadium (600 Fuß)",
+      "factor" : "176.7"
+      },
+      {
+      "name" : "stadium (1/8 Meile)",
+      "factor" : "184.0625"
+      },
+      {
+      "name" : "stadion (Olympia)",
+      "factor" : "192.25"
+      },
+      {
+      "name" : "Fuß (attisch)",
+      "factor" : "0.308"
+      },
+      {
+      "name" : "Fuß (Babylon)",
+      "factor" : "0.35"
+      },
+      {
+      "name" : "Fuß (Delphi)",
+      "factor" : "0.1848"
+      },
+      {
+      "name" : "Fuß (Olympia)",
+      "factor" : "0.32041667"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Zeitrechnung",
+    "group" : "3",
+    "unit" : [
+      {
+      "name" : "Anno Domini",
+      "factor" : "1",
+      "add" : "-1",
+      "subunits" : "x"
+      },
+      {
+      "name" : "ab urbe condita",
+      "factor" : "1",
+      "add" : "-753"
+      },
+      {
+      "name" : "jüdische Ära",
+      "factor" : "1",
+      "add" : "-3761"
+      },
+      {
+      "name" : "Olympiade",
+      "factor" : "4",
+      "add" : "-776"
+      },
+      {
+      "name" : "Indiktion",
+      "factor" : "15",
+      "add" : "3"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Münzen: Kirchenstaat",
+    "group" : "3",
+    "unit" : [
+      {
+      "name" : "Scudo",
+      "factor" : "1"
+      },
+      {
+      "name" : "Baiocco",
+      "factor" : "0.01"
+      },
+      {
+      "name" : "Paolo",
+      "factor" : "0.1"
+      },
+      {
+      "name" : "Quattrino",
+      "factor" : "0.2"
+      },
+      {
+      "name" : "Giulio",
+      "factor" : "0.1"
+      },
+      {
+      "name" : "Luitpold d'Or",
+      "factor" : "1.234"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Temperatur",
+    "group" : "5",
+    "unit" : [
+      {
+      "name" : "° Celsius",
+      "factor" : "1"
+      },
+      {
+      "name" : "° Fahrenheit",
+      "factor" : "0.5555555555556",
+      "add" : "-17.77777777778"
+      },
+      {
+      "name" : "° Reaumur",
+      "factor" : "1.25"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Gewichte: dezimal",
+    "group" : "6",
+    "unit" : [
+      {
+      "name" : "Gramm",
+      "factor" : "1"
+      },
+      {
+      "name" : "Milligramm",
+      "factor" : "0.001"
+      },
+      {
+      "name" : "Centigramm",
+      "factor" : "0.01"
+      },
+      {
+      "name" : "Pfund",
+      "factor" : "500"
+      },
+      {
+      "name" : "Kilogramm",
+      "factor" : "1000"
+      },
+      {
+      "name" : "Zentner",
+      "factor" : "50000"
+      },
+      {
+      "name" : "Doppelzentner",
+      "factor" : "100000"
+      },
+      {
+      "name" : "Tonne",
+      "factor" : "1000000"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Gewichte: England",
+    "group" : "6",
+    "unit" : [
+      {
+      "name" : "ounce",
+      "factor" : "31.104",
+      "subunits" : "8"
+      },
+      {
+      "name" : "grain",
+      "factor" : "0.065"
+      },
+      {
+      "name" : "scruple",
+      "factor" : "1.296",
+      "subunits" : "20"
+      },
+      {
+      "name" : "pennyweight",
+      "factor" : "1.555",
+      "subunits" : "24"
+      },
+      {
+      "name" : "dram",
+      "factor" : "3.888",
+      "subunits" : "3"
+      },
+      {
+      "name" : "pound",
+      "factor" : "373.24",
+      "subunits" : "12"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Gewichte: engl. Handel",
+    "group" : "6",
+    "unit" : [
+      {
+      "name" : "ounce",
+      "factor" : "28.349609375",
+      "subunits" : "16"
+      },
+      {
+      "name" : "dram",
+      "factor" : "1.771850585938"
+      },
+      {
+      "name" : "pound",
+      "factor" : "453.59375",
+      "subunits" : "16"
+      },
+      {
+      "name" : "stone",
+      "factor" : "6350.3125",
+      "subunits" : "14"
+      },
+      {
+      "name" : "quarter",
+      "factor" : "12700.625",
+      "subunits" : "28"
+      },
+      {
+      "name" : "hundredweight",
+      "factor" : "50802.5",
+      "subunits" : "4"
+      },
+      {
+      "name" : "long ton",
+      "factor" : "101604.16",
+      "subunits" : "20"
+      },
+      {
+      "name" : "cental",
+      "factor" : "45359.375"
+      },
+      {
+      "name" : "short ton",
+      "factor" : "907187.5",
+      "subunits" : "20"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Fläche",
+    "group" : "4",
+    "unit" : [
+      {
+      "name" : "qm",
+      "factor" : "1"
+      },
+      {
+      "name" : "qmm",
+      "factor" : "0.000001"
+      },
+      {
+      "name" : "qcm",
+      "factor" : "0.0001"
+      },
+      {
+      "name" : "qdm",
+      "factor" : "0.01"
+      },
+      {
+      "name" : "Ar",
+      "factor" : "100"
+      },
+      {
+      "name" : "Morgen",
+      "factor" : "2500"
+      },
+      {
+      "name" : "Hektar",
+      "factor" : "10000"
+      },
+      {
+      "name" : "qkm",
+      "factor" : "1000000"
+      },
+      {
+      "name" : "square inch",
+      "factor" : "0.0006452"
+      },
+      {
+      "name" : "square foot",
+      "factor" : "0.09288"
+      },
+      {
+      "name" : "square yard",
+      "factor" : "0.836",
+      "subunits" : "9"
+      },
+      {
+      "name" : "pole (rod, perch)",
+      "factor" : "25.289"
+      },
+      {
+      "name" : "rood",
+      "factor" : "1012",
+      "subunits" : "40"
+      },
+      {
+      "name" : "acre",
+      "factor" : "4048",
+      "subunits" : "4"
+      },
+      {
+      "name" : "square mile",
+      "factor" : "2590000"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Hohlmaße",
+    "group" : "2",
+    "unit" : [
+      {
+      "name" : "cbm",
+      "factor" : "1"
+      },
+      {
+      "name" : "cmm",
+      "factor" : "0.000000001"
+      },
+      {
+      "name" : "ccm",
+      "factor" : "0.000001"
+      },
+      {
+      "name" : "cdm (Liter)",
+      "factor" : "0.001"
+      },
+      {
+      "name" : "Hektoliter",
+      "factor" : "0.1"
+      },
+      {
+      "name" : "cubic inch",
+      "factor" : "0.000016387"
+      },
+      {
+      "name" : "cubic foot",
+      "factor" : "0.028317"
+      },
+      {
+      "name" : "cubic yard",
+      "factor" : "0.7646"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Flüssigkeit: England",
+    "group" : "2",
+    "unit" : [
+      {
+      "name" : "Liter",
+      "factor" : "1"
+      },
+      {
+      "name" : "gill",
+      "factor" : "0.142"
+      },
+      {
+      "name" : "pint",
+      "factor" : "0.568",
+      "subunits" : "4"
+      },
+      {
+      "name" : "quart",
+      "factor" : "1.136",
+      "subunits" : "8"
+      },
+      {
+      "name" : "gallon",
+      "factor" : "4.546",
+      "subunits" : "8"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Flüssigkeit: USA",
+    "group" : "2",
+    "unit" : [
+      {
+      "name" : "gill",
+      "factor" : "0.118"
+      },
+      {
+      "name" : "pint",
+      "factor" : "0.473",
+      "subunits" : "4"
+      },
+      {
+      "name" : "quart",
+      "factor" : "0.946",
+      "subunits" : "8"
+      },
+      {
+      "name" : "gallon",
+      "factor" : "3.787",
+      "subunits" : "8"
+      },
+      {
+      "name" : "barrel",
+      "factor" : "119.2"
+      },
+      {
+      "name" : "barrel of oil",
+      "factor" : "158.8",
+      "subunits" : "42"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Leistung",
+    "group" : "3",
+    "unit" : [
+      {
+      "name" : "Watt",
+      "factor" : "1"
+      },
+      {
+      "name" : "Milliwatt",
+      "factor" : "0.001"
+      },
+      {
+      "name" : "Kilowatt",
+      "factor" : "1000"
+      },
+      {
+      "name" : "Megawatt",
+      "factor" : "1000000"
+      },
+      {
+      "name" : "PS",
+      "factor" : "735.5"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Speicherplatz",
+    "group" : "3",
+    "unit" : [
+      {
+      "name" : "byte",
+      "factor" : "1"
+      },
+      {
+      "name" : "bit",
+      "factor" : "0.125"
+      },
+      {
+      "name" : "$100 byte",
+      "factor" : "256"
+      },
+      {
+      "name" : "kilobyte",
+      "factor" : "1000"
+      },
+      {
+      "name" : "KiloByte (Kb)",
+      "factor" : "1024"
+      },
+      {
+      "name" : "megabyte",
+      "factor" : "1000000"
+      },
+      {
+      "name" : "Megabyte (Mb)",
+      "factor" : "1048576"
+      },
+      {
+      "name" : "gigabyte",
+      "factor" : "1000000000"
+      },
+      {
+      "name" : "Gigabyte (Gb)",
+      "factor" : "1073741824"
+      }
+    ]
+  },
+
+  {
+    "name"  : "Sonstige",
+    "group" : "0",
+    "unit" : [
+      {
+      "name" : "Maßstab 1:200",
+      "factor" : "200"
+      },
+      {
+      "name" : "Maßstab",
+      "factor" : "1:100",
+      "add" : "100"
+      },
+      {
+      "name" : "Maßstab 1:75",
+      "factor" : "75"
+      },
+      {
+      "name" : "Maßstab 1:60",
+      "factor" : "60"
+      },
+      {
+      "name" : "Maßstab",
+      "factor" : "1:50",
+      "add" : "50"
+      },
+      {
+      "name" : "Maßstab 1:25",
+      "factor" : "25"
+      },
+      {
+      "name" : "Maßstab 1:20",
+      "factor" : "20"
+      },
+      {
+      "name" : "Maßstab 1:10",
+      "factor" : "10"
+      },
+      {
+      "name" : "Maßstab 1:5",
+      "factor" : "5"
+      },
+      {
+      "name" : "Maßstab 1:3",
+      "factor" : "3"
+      }
+    ]
+  }
+  ]
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/archimedes.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<units>
+<comment>
+  <p>Data for measurement units taken from:</p>
+  <p>Klimpert, Richard: Lexikon der Münzen, Maße, Gewichte, Zählarten und Zeitgrößen aller Länder der Erde 2) Berlin 1896 (Reprint Graz 1972)</p>
+  <p>Doursther, Horace: Dictionnaire universel des poids et mesures anciens et modernes. Paris 1840 (Reprint Amsterdam 1965)</p>
+</comment>
+<section icon="ruler" name="length: metrical">
+  <unit name="m" factor="1"/>
+  <unit name="mm" factor="0.001"/>
+  <unit name="cm" factor="0.01"/>
+  <unit name="dm" factor="0.1"/>
+  <unit name="km" factor="1000"/>
+</section>
+<section icon="ruler" name="length: nautical">
+  <unit name="geographic mile" factor="7420"/>
+  <unit name="nautical mile" factor="1854.965"/>
+  <unit name="fathom" factor="1.828782"/>
+  <unit name="cable" factor="182.8782"/>
+  <unit name="league" factor="5564.895"/>
+</section>
+<section icon="ruler" name="length: England">
+  <unit name="foot" factor="0.304797" subunits="12"/>
+  <unit name="inch" factor="0.02539975"/>
+  <unit name="yard" factor="0.914391" subunits="3"/>
+  <unit name="pole" factor="5.0291505" subunits="11"/>
+  <unit name="chain" factor="20.116602" subunits="4"/>
+  <unit name="furlong" factor="201.16602"/>
+  <unit name="mile" factor="1609.32816" subunits="8"/>
+</section>
+<section icon="ruler" name="length: Italy">
+  <unit name="palmo d'architetto (Roma)" factor="0.223425" subunits="12"/>
+  <unit name="braccio (Firenze)" factor="0.5836"/>
+  <unit name="braccio (Milano)" factor="0.5949"/>
+  <unit name="canna d'architetto (Roma)" factor="2.23425"/>
+  <unit name="canna di commercio (Roma)" factor="1.9920"/>
+  <unit name="canna d'architetto (Firenze)" factor="2.9180"/>
+  <unit name="canna di commercio (Firenze)" factor="2.3344"/>
+  <unit name="canna (Napoli)" factor="2.0961"/>
+  <unit name="miglio (Lombardia)" factor="1784.808"/>
+  <unit name="miglio (Napoli)" factor="1855.110"/>
+  <unit name="miglio (Roma)" factor="1489.50"/>
+  <unit name="minuta (Roma)" factor="0.00372375"/>
+  <unit name="oncia (Roma)" factor="0.01861875"/>
+  <unit name="oncia (Mailand)" factor="0.49575"/>
+  <unit name="palmo di commercio (Roma)" factor="0.249"/>
+  <unit name="palmo (Firenze)" factor="0.2918"/>
+  <unit name="piede (Brescia)" factor="0.471"/>
+  <unit name="piede (Carrara)" factor="0.2933"/>
+  <unit name="piede (Como)" factor="0.4512"/>
+  <unit name="piede (Modena)" factor="0.523048"/>
+  <unit name="piede (Reggio Em.)" factor="0.530898"/>
+  <unit name="piede (Venezia)" factor="0.347735"/>
+  <unit name="piede (Vicenza)" factor="0.3574"/>
+  <unit name="piede (Verona)" factor="0.3429"/>
+  <unit name="piede (Roma)" factor="0.297587"/>
+  <unit name="piede Lombardo" factor="0.435185"/>
+  <unit name="piede liprando (Torino)" factor="0.51377"/>
+  <unit name="piede manuale (Torino)" factor="0.342511"/>
+  <unit name="piede (Napoli, 'palmo')" factor="0.26455"/>
+  <unit name="soldo (Firenze)" factor="0.2918"/>
+  <unit name="trabucco piemontese (Torino)" factor="3.08259"/>
+</section>
+<section icon="ruler" name="length: Netherlands">
+  <unit name="voet (Amsterdam)" factor="0.283113"/>
+  <unit name="voet (Antwerpen)" factor="0.2868"/>
+  <unit name="voet (Aelst)" factor="0.2772"/>
+  <unit name="voet (Breda)" factor="0.28413"/>
+  <unit name="voet (Brügge)" factor="0.27439"/>
+  <unit name="voet (Brüssel)" factor="0.2757503"/>
+  <unit name="voet (Groningen)" factor="0.2922"/>
+  <unit name="voet (Haarlem)" factor="0.2858"/>
+  <unit name="voet (Kortrijk)" factor="0.2977"/>
+  <unit name="voet (Tournai)" factor="0.2977"/>
+  <unit name="voet (Utrecht)" factor="0.2683"/>
+  <unit name="voet (Ypern)" factor="0.2739"/>
+  <unit name="pied (Hainaut)" factor="0.2934"/>
+  <unit name="pied St. Hubert (Lüttich)" factor="0.294698"/>
+  <unit name="pied St. Lambert (Lüttich)" factor="0.291796"/>
+  <unit name="pied Ste. Gertrude (Nivelles)" factor="0.27709"/>
+  <unit name="steenvoet (Oudenaerde)" factor="0.2977"/>
+  <unit name="houtvoet (Oudenaerde)" factor="0.292"/>
+</section>
+<section icon="ruler" name="length: France">
+  <unit name="pied du Roi (Paris)" factor="0.32483938497"/>
+  <unit name="pied (Arras)" factor="0.29777"/>
+  <unit name="pied (Cambrai)" factor="0.29777"/>
+  <unit name="pied de Bourgogne" factor="0.33212"/>
+</section>
+<section icon="ruler" name="length: Southern Europe">
+  <unit name="pié de Burgos (Spain)" factor="0.278635"/>
+  <unit name="pé (Portugal)" factor="0.33"/>
+</section>
+<section icon="ruler" name="length: German speaking countries">
+  <unit name="Fuß (Basel)" factor="0.29820"/>
+  <unit name="Fuß (Bayern)" factor="0.2918592"/>
+  <unit name="Fuß (Braunschweig)" factor="0.2853624"/>
+  <unit name="Fuß (Gotha)" factor="0.287622"/>
+  <unit name="Fuß (Hamburg)" factor="0.286575"/>
+  <unit name="Fuß (Hessen)" factor="0.287669"/>
+  <unit name="Fuß (Köln)" factor="0.2876"/>
+  <unit name="Fuß (Mecklenburg)" factor="0.291006"/>
+  <unit name="Fuß (Münster)" factor="0.2908"/>
+  <unit name="Fuß (Pommern)" factor="0.2921"/>
+  <unit name="Fuß (rheinisch)" factor="0.3138535"/>
+  <unit name="Fuß (Sachsen)" factor="0.2831901"/>
+  <unit name="Fuß (Preußen)" factor="0.3138535"/>
+  <unit name="Fuß (Wien)" factor="0.3180807"/>
+  <unit name="Fuß (Württemberg)" factor="0.2864903"/>
+  <unit name="Werkschuh (Frankfurt)" factor="0.2846143"/>
+  <unit name="Meile (Preußen)" factor="7532.485"/>
+  <unit name="Postmeile (Österreich)" factor="7585.937"/>
+  <unit name="Dezimalfuß (Preußen)" factor="0.3766242"/>
+</section>
+<section icon="ruler" name="length: Eastern Europe">
+  <unit name="foot (Bohemia)" factor="0.2964"/>
+  <unit name="foot (Moravia)" factor="0.29596"/>
+  <unit name="stopa (foot of Krakow)" factor="0.3564"/>
+  <unit name="stopa (foot of Warsaw)" factor="0.288"/>
+  <unit name="foot (Russia)" factor="0.3556"/>
+  <unit name="arshin" factor="0.7112"/>
+  <unit name="sashen (fathom)" factor="2.133"/>
+  <unit name="werst" factor="1066.8"/>
+  <unit name="milja" factor="7468"/>
+</section>
+<section icon="ruler" name="length: Antiquity">
+  <unit name="pes romanus (foot)" factor="0.2945"/>
+  <unit name="pollex (inch)" factor="0.0245416667"/>
+  <unit name="digitus (width of a finger)" factor="0.01840625"/>
+  <unit name="palmus (palm)" factor="0.073625"/>
+  <unit name="cubitus (cubit)" factor="0.44175"/>
+  <unit name="passus (double step)" factor="1.4725"/>
+  <unit name="pertica" factor="2.945"/>
+  <unit name="actus" factor="35.34"/>
+  <unit name="mille passus (mile)" factor="1472.5"/>
+  <unit name="stadium (600 feet)" factor="176.7"/>
+  <unit name="stadium (1/8 mile)" factor="184.0625"/>
+  <unit name="stadion (Olympia)" factor="192.25"/>
+  <unit name="foot (Attic)" factor="0.308"/>
+  <unit name="foot (Babylon)" factor="0.35"/>
+  <unit name="foot (Delphi)" factor="0.1848"/>
+  <unit name="foot (Olympia)" factor="0.32041667"/>
+</section>
+<section icon="other" name="other">
+  <unit name="scale 1:1000" factor="1000"/>
+  <unit name="scale 1:200" factor="200"/>
+  <unit name="scale 1:100" factor="100"/>
+  <unit name="scale 1:75" factor="75"/>
+  <unit name="scale 1:60" factor="60"/>
+  <unit name="scale 1:50" factor="50"/>
+  <unit name="scale 1:25" factor="25"/>
+  <unit name="scale 1:20" factor="20"/>
+  <unit name="scale 1:10" factor="10"/>
+  <unit name="scale 1:5" factor="5"/>
+  <unit name="scale 1:3" factor="3"/>
+</section>
+</units>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/blank.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg onload="(window.parent || window).jQuery.svg._registerSVG();" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+</svg>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.digilibSVG.css	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,112 @@
+/* 
+ * CSS style file for digilib SVG measuring tool
+ *
+ * Martin Raspe, Robert Casties, 11.1.2011
+ */
+body {
+    background: silver;
+    font-family: Tahoma, Helvetica, Arial;
+    }
+ 
+div#svg-toolbar {
+    color: grey;
+    background-color: grey;
+    position: fixed;
+    left: 8px;
+    bottom: 8px;
+    border: 1px solid black;
+    z-index: 1000;
+    }
+
+span.svg-label {
+    font-size: 12px;
+    padding: 0px 3px;
+    color: silver;
+    background-color: grey;
+    }
+
+span.svg-number {
+    font-size: 12px;
+    padding: 0px 3px;
+    display: inline-block;
+    width: 50px;
+    background-color: grey;
+    color: white;
+    text-align: right;
+    }
+
+select {
+    font-size: 12px;
+    padding: 0px 3px;
+    margin: 0px;
+    display: inline-block;
+    background-color: grey;
+    color: lightgreen;
+    border: none;
+    }
+
+option.section {
+    border-bottom: 1px dotted grey;
+    padding-left: 10px;
+}
+
+input.svg-input {
+    width: 50px;
+    font-size: 12px;
+    padding: 0px 3px;
+    margin: 0px;
+    display: inline-block;
+    background-color: grey;
+    color: lightgreen;
+    border: none;
+    text-align: right;
+    }
+
+select:hover, select:active, select:focus,
+input.svg-input:hover, input.svg-input:active, input.svg-input:focus {
+    background-color: white;
+    color: black;
+    }
+
+div.digilib {
+    margin: 0px;
+}
+
+div.svg {
+    position: absolute;
+    background: transparent;
+}
+
+td {
+    vertical-align: top;
+    }
+
+div#test:hover {
+    background-color: cornsilk;
+    }
+
+#debug {
+    background-color: beige;
+    position: absolute;
+    opacity: 50%;
+    top: 4px;
+    left: 300px;
+    width: 500px;
+    padding: 0px 5px;
+    font-family: Arial;
+    font-size: 9px;
+    display: none;
+    }
+
+div._log {
+    color: grey;
+    }
+
+div._debug {
+    color: darkgreen;
+    }
+
+div._error {
+    color: red;
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.digilibSVG.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,245 @@
+/* Copyright (c) 2011 Martin Raspe, Robert Casties
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+Authors:
+  Martin Raspe, Robert Casties, 9.2.2011
+*/
+
+/**
+ * digilib SVG plugin (measuring tool for use within the digilib jQuery plugin)
+**/ 
+
+
+/* jslint browser: true, debug: true, forin: true
+*/
+
+// fallback for console.log calls
+if (typeof(console) === 'undefined') {
+    var console = {
+        log : function(){}, 
+        debug : function(){}, 
+        error : function(){}
+        };
+    var customConsole = true;
+}
+
+(function($) {
+    console.debug('installing jquery.digilibSVG');
+
+    var pluginName = 'digilibSVG';
+    var geom;
+
+    var defaults = {
+        // choice of colors offered by toolbar
+        lineColors : ['white', 'red', 'yellow', 'green', 'blue', 'black'],
+        // default color
+        lineColor : 'white',
+        // color while the line is drawn
+        drawColor : 'green',
+        // color of selected objects
+        selectColor : 'red',
+        // drawing shapes
+        shapes : ['line', 'polyline', 'rectangle', 'square', 'circle', 'arch',
+            'ratio', 'intercolumn', 'line grid'],
+        // default shape
+        shape : 'line',
+        // measuring unit (index into list)
+        unit : 1,
+        // converted unit (index into list)
+        converted : 2,
+        // last measured distance 
+        lastDistance : 0,
+        // last measured angle 
+        lastAngle : 0,
+        // maximal denominator for mixed fractions
+        maxDenominator : 20,
+        // number of decimal places for convert results
+        maxDecimals : 3,
+        // show convert result as mixed fraction?
+        showMixedFraction : false,
+        // show angle relative to last line?
+        showRelativeAngle : false,
+        // show distance numbers?
+        showDistanceNumbers : true,
+        // show ratio of rectangle sides?
+        showRectangleRatios : false,
+        // draw line ends as small crosses
+        drawEndPoints : true,
+        // draw mid points of lines
+        drawMidPoints : false,
+        // draw circle centers
+        drawCenters : false,
+        // draw rectangles from the diagonal and one point
+        drawFromDiagonal : false,
+        // draw circles from center
+        drawFromCenter : false,
+        // snap to endpoints
+        snapEndPoints : false,
+        // snap to mid points of lines
+        snapMidPoints : false,
+        // snap to circle centers
+        snapCenters : false,
+        // snap distance (in screen pixels)
+        snapDistance : 5,
+        // keep original object when moving/scaling/rotating
+        keepOriginal : false,
+        // number of copies when drawing grids
+        gridCopies : 10
+        };
+
+    // setup a div for accessing the main SVG functionality
+    var setupToolBar = function(settings) {
+        var $toolBar = $('<div id="svg-toolbar"/>');
+        // shapes select
+        var $shape = $('<select id="svg-shapes"/>');
+        for (var i = 0; i < settings.shapes.length; i++) {
+            var name = settings.shapes[i];
+            var $opt = $('<option value="' + i + '">' + name + '</option>');
+            $shape.append($opt);
+            }
+        // console.debug($xml);
+        var $xml = $(settings.xml);
+        // unit selects
+        var $unit1 = $('<select id="svg-convert1"/>');
+        var $unit2 = $('<select id="svg-convert2"/>');
+
+        $xml.find("section").each(function() {
+            var $section = $(this);
+            var name = $section.attr("name");
+            // append section name as option
+            var $opt = $('<option class="section" disabled="disabled">' + name + '</option>');
+            $unit1.append($opt);
+            $unit2.append($opt.clone());
+            $section.find("unit").each(function() {
+                var $unit = $(this);
+                var name = $unit.attr("name");
+                var factor = $unit.attr("factor"); 
+                var $opt = $('<option class="unit" value="' + factor + '">' + name + '</option>');
+                $opt.data(pluginName, {
+                    'name' : name,
+                    'factor' : factor, 
+                    'add' : $unit.attr("add"), 
+                    'subunits' : $unit.attr("subunits")
+                    });
+                $unit1.append($opt);
+                $unit2.append($opt.clone());
+                });
+            });
+        // settings.units = units;
+        // other elements
+        var $la1 = $('<span class="svg-label">pixel</span>');
+        var $la2 = $('<span class="svg-label">factor</span>');
+        var $la3 = $('<span class="svg-label">=</span>');
+        var $la4 = $('<span class="svg-label">=</span>');
+        var $px = $('<span id="svg-pixel" class="svg-number">0.0</span>');
+        var $factor = $('<span id="svg-factor" class="svg-number">0.0</span>');
+        var $result1 = $('<input id="svg-unit1" class="svg-input" value="0.0"/>');
+        var $result2 = $('<input id="svg-unit2" class="svg-input" value="0.0"/>');
+        var $angle = $('<span id="svg-angle" class="svg-number">0.0</span>');
+        $('body').append($toolBar);
+        $toolBar.append($shape);
+        $toolBar.append($la1);
+        $toolBar.append($px);
+        $toolBar.append($la2);
+        $toolBar.append($factor);
+        $toolBar.append($la3);
+        $toolBar.append($result1);
+        $toolBar.append($unit1);
+        $toolBar.append($la4);
+        $toolBar.append($result2);
+        $toolBar.append($unit2);
+        $toolBar.append($angle);
+        return $toolBar;
+        };
+
+    var drawInitial = function ($svg) {
+        console.debug('SVG is ready');
+        var $svgDiv = $(this);
+        var rect = geom.rectangle($svgDiv);
+        $svg.line(0, 0, rect.width, rect.height,
+            {stroke: 'white', strokeWidth: 2});
+        $svg.line(0, rect.height, rect.width, 0,
+            {stroke: 'red', strokeWidth: 2});
+        };
+
+    var actions = {
+        "init" : function(options) {
+            var $digilib = this;
+            var data = $digilib.data('digilib');
+            var plugins = data.plugins;
+            geom = plugins.geometry.init();
+            var settings = $.extend({}, defaults, options);
+            // prepare the AJAX callback
+            // TODO: return unless interactiveMode === 'fullscreen'?
+            var onLoadXML = function (xml) {
+                settings.xml = xml;
+                settings.$toolBar = setupToolBar(settings);
+                $digilib.each(function() {
+                    var $elem = $(this);
+                    $elem.data(pluginName, settings);
+                    });
+                };
+            var onLoadScalerImg = function () {
+                var $svgDiv = $('<div id="svg" />');
+                $('body').append($svgDiv);
+                // size SVG div like scaler img
+                var $scalerImg = $digilib.find('img.pic');
+                var scalerImgRect = geom.rectangle($scalerImg);
+                scalerImgRect.adjustDiv($svgDiv);
+                console.debug('$svgDiv', scalerImgRect);
+                var $svg = $svgDiv.svg({
+                        'onLoad' : drawInitial
+                    });
+                settings.$elem = $digilib;
+                settings.$svgDiv = $svgDiv;
+                settings.$svg = $svg;
+                // set SVG data 
+                $svg.data('digilib', data);
+                $svg.data(pluginName, settings);
+                };
+            // fetch the XML measuring unit list
+            $.ajax({
+                type : "GET",
+                url : "svg/archimedes.xml",
+                dataType : "xml",
+                success : onLoadXML
+                });
+            data.$img.load(onLoadScalerImg);
+            return this;
+            }
+        };
+
+ // hook plugin into jquery
+    $.fn[pluginName] = function(action) {
+        if (actions[action]) {
+            // call action on this with the remaining arguments (inserting data as first argument)
+            var $elem = $(this);
+            var data = $elem.data('digilib');
+            if (!data) {
+                return $.error(pluginName + ' action ' + action + ' needs a digilib element');
+                }
+            var args = Array.prototype.slice.call(arguments, 1);
+            args.unshift(data);
+            return actions[action].apply(this, args);
+        } else if (typeof(action) === 'object' || !action) {
+            // call init on this
+            return actions.init.apply(this, arguments);
+        } else {
+            $.error('action ' + action + ' does not exist on jQuery.' + pluginName);
+        }
+    };
+
+})(jQuery);
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svg.compat-1.0.1.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,69 @@
+/* http://keith-wood.name/svg.html
+   SVG for jQuery compatibility from v1.0.1 to v1.4.0.
+   Written by Keith Wood (kbwood{at}iinet.com.au) May 2008.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and 
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. 
+   Please attribute the author if you use it. */
+
+var svgManager = null;
+var svgGraphing = null;
+
+(function($) { // Hide scope, no $ conflict
+
+svgManager = $.svg;
+svgGraphing = $.svg.graphing;
+$.svg._rootClass = $.svg._wrapperClass;
+
+$.extend($.svg, {
+	/* Retrieve the SVG wrapper for a given division.
+	   @param  input     element - division to look for or
+						 jQuery - jQuery collection containing the division or
+						 string - jQuery selector for the division
+	   @return  SVGRoot - the associated SVG wrapper */
+	getSVGFor: function(input) {
+		input = (input.jquery ? input : $(input));
+		return $.svg._getSVG(input);
+	}
+});
+
+$.extend($.svg._rootClass.prototype, {
+	/* Draw a rounded rectangle.
+	   @param  parent    element - the parent node for the new shape
+	   @param  x         number - the x-coordinate for the left edge of the rectangle
+	   @param  y         number - the y-coordinate for the top edge of the rectangle
+	   @param  width     number - the width of the rectangle
+	   @param  height    number - the height of the rectangle
+	   @param  rx        number - the x-radius of the ellipse for the rounded corners
+	   @param  ry        number - the y-radius of the ellipse for the rounded corners
+	   @param  settings  object - additional settings for the shape (optional)
+	   @return  the new shape node */
+	roundrect: function(parent, x, y, width, height, rx, ry, settings) {
+		return this.rect(parent, x, y, width, height, rx, ry, settings);
+	},
+});
+
+/* Attach the SVG functionality to a jQuery selection.
+   @param  loadURL   string - the URL of the initial document to load (optional)
+   @param  onLoad    function - a callback functional invoked following loading (optional)
+   @param  settings  object - the new settings to use for this SVG instance (optional)
+   @return jQuery object - for chaining further calls */
+$.fn.svg = function(loadURL, onLoad, settings) {
+	if (typeof loadURL == 'function') {
+		settings = onLoad;
+		onLoad = loadURL;
+		loadURL = null;
+	}
+	if (loadURL && typeof loadURL == 'object') {
+		settings = loadURL;
+		loadURL = onLoad = null;
+	}
+	if (onLoad && typeof onLoad == 'object') {
+		settings = onLoad;
+		onLoad = null;
+	}
+	return this.each(function() {
+		$.svg._attachSVG(this, {loadURL: loadURL, onLoad: onLoad, settings: settings});
+	});
+};
+
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svg.css	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,15 @@
+/* http://keith-wood.name/svg.html
+   SVG for jQuery v1.4.2.
+   Written by Keith Wood (kbwood{at}iinet.com.au) August 2007.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and 
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. 
+   Please attribute the author if you use it. */
+
+svg\:svg {
+	display: none;
+}
+
+.svg_error {
+	color: red;
+	font-weight: bold;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svg.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1339 @@
+/* http://keith-wood.name/svg.html
+   SVG for jQuery v1.4.3.
+   Written by Keith Wood (kbwood{at}iinet.com.au) August 2007.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and 
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. 
+   Please attribute the author if you use it. */
+
+(function($) { // Hide scope, no $ conflict
+
+/* SVG manager.
+   Use the singleton instance of this class, $.svg, 
+   to interact with the SVG functionality. */
+function SVGManager() {
+	this._settings = []; // Settings to be remembered per SVG object
+	this._extensions = []; // List of SVG extensions added to SVGWrapper
+		// for each entry [0] is extension name, [1] is extension class (function)
+		// the function takes one parameter - the SVGWrapper instance
+	this.regional = []; // Localisations, indexed by language, '' for default (English)
+	this.regional[''] = {errorLoadingText: 'Error loading',
+		notSupportedText: 'This browser does not support SVG'};
+	this.local = this.regional['']; // Current localisation
+	this._uuid = new Date().getTime();
+	this._renesis = detectActiveX('RenesisX.RenesisCtrl');
+}
+
+/* Determine whether a given ActiveX control is available.
+   @param  classId  (string) the ID for the ActiveX control
+   @return  (boolean) true if found, false if not */
+function detectActiveX(classId) {
+	try {
+		return !!(window.ActiveXObject && new ActiveXObject(classId));
+	}
+	catch (e) {
+		return false;
+	}
+}
+
+var PROP_NAME = 'svgwrapper';
+
+$.extend(SVGManager.prototype, {
+	/* Class name added to elements to indicate already configured with SVG. */
+	markerClassName: 'hasSVG',
+
+	/* SVG namespace. */
+	svgNS: 'http://www.w3.org/2000/svg',
+	/* XLink namespace. */
+	xlinkNS: 'http://www.w3.org/1999/xlink',
+
+	/* SVG wrapper class. */
+	_wrapperClass: SVGWrapper,
+
+	/* Camel-case versions of attribute names containing dashes or are reserved words. */
+	_attrNames: {class_: 'class', in_: 'in',
+		alignmentBaseline: 'alignment-baseline', baselineShift: 'baseline-shift',
+		clipPath: 'clip-path', clipRule: 'clip-rule',
+		colorInterpolation: 'color-interpolation',
+		colorInterpolationFilters: 'color-interpolation-filters',
+		colorRendering: 'color-rendering', dominantBaseline: 'dominant-baseline',
+		enableBackground: 'enable-background', fillOpacity: 'fill-opacity',
+		fillRule: 'fill-rule', floodColor: 'flood-color',
+		floodOpacity: 'flood-opacity', fontFamily: 'font-family',
+		fontSize: 'font-size', fontSizeAdjust: 'font-size-adjust',
+		fontStretch: 'font-stretch', fontStyle: 'font-style',
+		fontVariant: 'font-variant', fontWeight: 'font-weight',
+		glyphOrientationHorizontal: 'glyph-orientation-horizontal',
+		glyphOrientationVertical: 'glyph-orientation-vertical',
+		horizAdvX: 'horiz-adv-x', horizOriginX: 'horiz-origin-x',
+		imageRendering: 'image-rendering', letterSpacing: 'letter-spacing',
+		lightingColor: 'lighting-color', markerEnd: 'marker-end',
+		markerMid: 'marker-mid', markerStart: 'marker-start',
+		stopColor: 'stop-color', stopOpacity: 'stop-opacity',
+		strikethroughPosition: 'strikethrough-position',
+		strikethroughThickness: 'strikethrough-thickness',
+		strokeDashArray: 'stroke-dasharray', strokeDashOffset: 'stroke-dashoffset',
+		strokeLineCap: 'stroke-linecap', strokeLineJoin: 'stroke-linejoin',
+		strokeMiterLimit: 'stroke-miterlimit', strokeOpacity: 'stroke-opacity',
+		strokeWidth: 'stroke-width', textAnchor: 'text-anchor',
+		textDecoration: 'text-decoration', textRendering: 'text-rendering',
+		underlinePosition: 'underline-position', underlineThickness: 'underline-thickness',
+		vertAdvY: 'vert-adv-y', vertOriginY: 'vert-origin-y',
+		wordSpacing: 'word-spacing', writingMode: 'writing-mode'},
+
+	/* Add the SVG object to its container. */
+	_attachSVG: function(container, settings) {
+		var svg = (container.namespaceURI == this.svgNS ? container : null);
+		var container = (svg ? null : container);
+		if ($(container || svg).hasClass(this.markerClassName)) {
+			return;
+		}
+		if (typeof settings == 'string') {
+			settings = {loadURL: settings};
+		}
+		else if (typeof settings == 'function') {
+			settings = {onLoad: settings};
+		}
+		$(container || svg).addClass(this.markerClassName);
+		try {
+			if (!svg) {
+				svg = document.createElementNS(this.svgNS, 'svg');
+				svg.setAttribute('version', '1.1');
+				svg.setAttribute('width', container.clientWidth);
+				svg.setAttribute('height', container.clientHeight);
+				container.appendChild(svg);
+			}
+			this._afterLoad(container, svg, settings || {});
+		}
+		catch (e) {
+			if ($.browser.msie) {
+				if (!container.id) {
+					container.id = 'svg' + (this._uuid++);
+				}
+				this._settings[container.id] = settings;
+				container.innerHTML = '<embed type="image/svg+xml" width="100%" ' +
+					'height="100%" src="' + (settings.initPath || '') + 'blank.svg"/>';
+			}
+			else {
+				container.innerHTML = '<p class="svg_error">' +
+					this.local.notSupportedText + '</p>';
+			}
+		}
+	},
+
+	/* SVG callback after loading - register SVG root. */
+	_registerSVG: function() {
+		for (var i = 0; i < document.embeds.length; i++) { // Check all
+			var container = document.embeds[i].parentNode;
+			if (!$(container).hasClass($.svg.markerClassName) || // Not SVG
+					$.data(container, PROP_NAME)) { // Already done
+				continue;
+			}
+			var svg = null;
+			try {
+				svg = document.embeds[i].getSVGDocument();
+			}
+			catch(e) {
+				setTimeout($.svg._registerSVG, 250); // Renesis takes longer to load
+				return;
+			}
+			svg = (svg ? svg.documentElement : null);
+			if (svg) {
+				$.svg._afterLoad(container, svg);
+			}
+		}
+	},
+
+	/* Post-processing once loaded. */
+	_afterLoad: function(container, svg, settings) {
+		var settings = settings || this._settings[container.id];
+		this._settings[container ? container.id : ''] = null;
+		var wrapper = new this._wrapperClass(svg, container);
+		$.data(container || svg, PROP_NAME, wrapper);
+		try {
+			if (settings.loadURL) { // Load URL
+				wrapper.load(settings.loadURL, settings);
+			}
+			if (settings.settings) { // Additional settings
+				wrapper.configure(settings.settings);
+			}
+			if (settings.onLoad && !settings.loadURL) { // Onload callback
+				settings.onLoad.apply(container || svg, [wrapper]);
+			}
+		}
+		catch (e) {
+			alert(e);
+		}
+	},
+
+	/* Return the SVG wrapper created for a given container.
+	   @param  container  (string) selector for the container or
+	                      (element) the container for the SVG object or
+	                      jQuery collection - first entry is the container
+	   @return  (SVGWrapper) the corresponding SVG wrapper element, or null if not attached */
+	_getSVG: function(container) {
+		container = (typeof container == 'string' ? $(container)[0] :
+			(container.jquery ? container[0] : container));
+		return $.data(container, PROP_NAME);
+	},
+
+	/* Remove the SVG functionality from a div.
+	   @param  container  (element) the container for the SVG object */
+	_destroySVG: function(container) {
+		var $container = $(container);
+		if (!$container.hasClass(this.markerClassName)) {
+			return;
+		}
+		$container.removeClass(this.markerClassName);
+		if (container.namespaceURI != this.svgNS) {
+			$container.empty();
+		}
+		$.removeData(container, PROP_NAME);
+	},
+
+	/* Extend the SVGWrapper object with an embedded class.
+	   The constructor function must take a single parameter that is
+	   a reference to the owning SVG root object. This allows the 
+	   extension to access the basic SVG functionality.
+	   @param  name      (string) the name of the SVGWrapper attribute to access the new class
+	   @param  extClass  (function) the extension class constructor */
+	addExtension: function(name, extClass) {
+		this._extensions.push([name, extClass]);
+	}
+});
+
+/* The main SVG interface, which encapsulates the SVG element.
+   Obtain a reference from $().svg('get') */
+function SVGWrapper(svg, container) {
+	this._svg = svg; // The SVG root node
+	this._container = container; // The containing div
+	for (var i = 0; i < $.svg._extensions.length; i++) {
+		var extension = $.svg._extensions[i];
+		this[extension[0]] = new extension[1](this);
+	}
+}
+
+$.extend(SVGWrapper.prototype, {
+
+	/* Retrieve the width of the SVG object. */
+	_width: function() {
+		return (this._container ? this._container.clientWidth : this._svg.width);
+	},
+
+	/* Retrieve the height of the SVG object. */
+	_height: function() {
+		return (this._container ? this._container.clientHeight : this._svg.height);
+	},
+
+	/* Retrieve the root SVG element.
+	   @return  the top-level SVG element */
+	root: function() {
+		return this._svg;
+	},
+
+	/* Configure the SVG root.
+	   @param  settings  (object) additional settings for the root
+	   @param  clear     (boolean) true to remove existing attributes first,
+	                     false to add to what is already there (optional)
+	   @return  (SVGWrapper) this root */
+	configure: function(settings, clear) {
+		if (clear) {
+			for (var i = this._svg.attributes.length - 1; i >= 0; i--) {
+				var attr = this._svg.attributes.item(i);
+				if (!(attr.nodeName == 'onload' || attr.nodeName == 'version' || 
+						attr.nodeName.substring(0, 5) == 'xmlns')) {
+					this._svg.attributes.removeNamedItem(attr.nodeName);
+				}
+			}
+		}
+		for (var attrName in settings) {
+			this._svg.setAttribute(attrName, settings[attrName]);
+		}
+		return this;
+	},
+
+	/* Locate a specific element in the SVG document.
+	   @param  id  (string) the element's identifier
+	   @return  (element) the element reference, or null if not found */
+	getElementById: function(id) {
+		return this._svg.ownerDocument.getElementById(id);
+	},
+
+	/* Change the attributes for a SVG node.
+	   @param  element   (SVG element) the node to change
+	   @param  settings  (object) the new settings
+	   @return  (SVGWrapper) this root */
+	change: function(element, settings) {
+		if (element) {
+			for (var name in settings) {
+				if (settings[name] == null) {
+					element.removeAttribute(name);
+				}
+				else {
+					element.setAttribute(name, settings[name]);
+				}
+			}
+		}
+		return this;
+	},
+
+	/* Check for parent being absent and adjust arguments accordingly. */
+	_args: function(values, names, optSettings) {
+		names.splice(0, 0, 'parent');
+		names.splice(names.length, 0, 'settings');
+		var args = {};
+		var offset = 0;
+		if (values[0] != null && values[0].jquery) {
+			values[0] = values[0][0];
+		}
+		if (values[0] != null && !(typeof values[0] == 'object' && values[0].nodeName)) {
+			args['parent'] = null;
+			offset = 1;
+		}
+		for (var i = 0; i < values.length; i++) {
+			args[names[i + offset]] = values[i];
+		}
+		if (optSettings) {
+			$.each(optSettings, function(i, value) {
+				if (typeof args[value] == 'object') {
+					args.settings = args[value];
+					args[value] = null;
+				}
+			});
+		}
+		return args;
+	},
+
+	/* Add a title.
+	   @param  parent    (element or jQuery) the parent node for the new title (optional)
+	   @param  text      (string) the text of the title
+	   @param  settings  (object) additional settings for the title (optional)
+	   @return  (element) the new title node */
+	title: function(parent, text, settings) {
+		var args = this._args(arguments, ['text']);
+		var node = this._makeNode(args.parent, 'title', args.settings || {});
+		node.appendChild(this._svg.ownerDocument.createTextNode(args.text));
+		return node;
+	},
+
+	/* Add a description.
+	   @param  parent    (element or jQuery) the parent node for the new description (optional)
+	   @param  text      (string) the text of the description
+	   @param  settings  (object) additional settings for the description (optional)
+	   @return  (element) the new description node */
+	describe: function(parent, text, settings) {
+		var args = this._args(arguments, ['text']);
+		var node = this._makeNode(args.parent, 'desc', args.settings || {});
+		node.appendChild(this._svg.ownerDocument.createTextNode(args.text));
+		return node;
+	},
+
+	/* Add a definitions node.
+	   @param  parent    (element or jQuery) the parent node for the new definitions (optional)
+	   @param  id        (string) the ID of this definitions (optional)
+	   @param  settings  (object) additional settings for the definitions (optional)
+	   @return  (element) the new definitions node */
+	defs: function(parent, id, settings) {
+		var args = this._args(arguments, ['id'], ['id']);
+		return this._makeNode(args.parent, 'defs', $.extend(
+			(args.id ? {id: args.id} : {}), args.settings || {}));
+	},
+
+	/* Add a symbol definition.
+	   @param  parent    (element or jQuery) the parent node for the new symbol (optional)
+	   @param  id        (string) the ID of this symbol
+	   @param  x1        (number) the left coordinate for this symbol
+	   @param  y1        (number) the top coordinate for this symbol
+	   @param  width     (number) the width of this symbol
+	   @param  height    (number) the height of this symbol
+	   @param  settings  (object) additional settings for the symbol (optional)
+	   @return  (element) the new symbol node */
+	symbol: function(parent, id, x1, y1, width, height, settings) {
+		var args = this._args(arguments, ['id', 'x1', 'y1', 'width', 'height']);
+		return this._makeNode(args.parent, 'symbol', $.extend({id: args.id,
+			viewBox: args.x1 + ' ' + args.y1 + ' ' + args.width + ' ' + args.height},
+			args.settings || {}));
+	},
+
+	/* Add a marker definition.
+	   @param  parent    (element or jQuery) the parent node for the new marker (optional)
+	   @param  id        (string) the ID of this marker
+	   @param  refX      (number) the x-coordinate for the reference point
+	   @param  refY      (number) the y-coordinate for the reference point
+	   @param  mWidth    (number) the marker viewport width
+	   @param  mHeight   (number) the marker viewport height
+	   @param  orient    (string or int) 'auto' or angle (degrees) (optional)
+	   @param  settings  (object) additional settings for the marker (optional)
+	   @return  (element) the new marker node */
+	marker: function(parent, id, refX, refY, mWidth, mHeight, orient, settings) {
+		var args = this._args(arguments, ['id', 'refX', 'refY',
+			'mWidth', 'mHeight', 'orient'], ['orient']);
+		return this._makeNode(args.parent, 'marker', $.extend(
+			{id: args.id, refX: args.refX, refY: args.refY, markerWidth: args.mWidth, 
+			markerHeight: args.mHeight, orient: args.orient || 'auto'}, args.settings || {}));
+	},
+
+	/* Add a style node.
+	   @param  parent    (element or jQuery) the parent node for the new node (optional)
+	   @param  styles    (string) the CSS styles
+	   @param  settings  (object) additional settings for the node (optional)
+	   @return  (element) the new style node */
+	style: function(parent, styles, settings) {
+		var args = this._args(arguments, ['styles']);
+		var node = this._makeNode(args.parent, 'style', $.extend(
+			{type: 'text/css'}, args.settings || {}));
+		node.appendChild(this._svg.ownerDocument.createTextNode(args.styles));
+		if ($.browser.opera) {
+			$('head').append('<style type="text/css">' + args.styles + '</style>');
+		}
+		return node;
+	},
+
+	/* Add a script node.
+	   @param  parent    (element or jQuery) the parent node for the new node (optional)
+	   @param  script    (string) the JavaScript code
+	   @param  type      (string) the MIME type for the code (optional, default 'text/javascript')
+	   @param  settings  (object) additional settings for the node (optional)
+	   @return  (element) the new script node */
+	script: function(parent, script, type, settings) {
+		var args = this._args(arguments, ['script', 'type'], ['type']);
+		var node = this._makeNode(args.parent, 'script', $.extend(
+			{type: args.type || 'text/javascript'}, args.settings || {}));
+		node.appendChild(this._svg.ownerDocument.createTextNode(this._escapeXML(args.script)));
+		if (!$.browser.mozilla) {
+			$.globalEval(args.script);
+		}
+		return node;
+	},
+
+	/* Add a linear gradient definition.
+	   Specify all of x1, y1, x2, y2 or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new gradient (optional)
+	   @param  id        (string) the ID for this gradient
+	   @param  stops     (string[][]) the gradient stops, each entry is
+	                     [0] is offset (0.0-1.0 or 0%-100%), [1] is colour, 
+						 [2] is opacity (optional)
+	   @param  x1        (number) the x-coordinate of the gradient start (optional)
+	   @param  y1        (number) the y-coordinate of the gradient start (optional)
+	   @param  x2        (number) the x-coordinate of the gradient end (optional)
+	   @param  y2        (number) the y-coordinate of the gradient end (optional)
+	   @param  settings  (object) additional settings for the gradient (optional)
+	   @return  (element) the new gradient node */
+	linearGradient: function(parent, id, stops, x1, y1, x2, y2, settings) {
+		var args = this._args(arguments,
+			['id', 'stops', 'x1', 'y1', 'x2', 'y2'], ['x1']);
+		var sets = $.extend({id: args.id}, 
+			(args.x1 != null ? {x1: args.x1, y1: args.y1, x2: args.x2, y2: args.y2} : {}));
+		return this._gradient(args.parent, 'linearGradient', 
+			$.extend(sets, args.settings || {}), args.stops);
+	},
+
+	/* Add a radial gradient definition.
+	   Specify all of cx, cy, r, fx, fy or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new gradient (optional)
+	   @param  id        (string) the ID for this gradient
+	   @param  stops     (string[][]) the gradient stops, each entry
+	                     [0] is offset, [1] is colour, [2] is opacity (optional)
+	   @param  cx        (number) the x-coordinate of the largest circle centre (optional)
+	   @param  cy        (number) the y-coordinate of the largest circle centre (optional)
+	   @param  r         (number) the radius of the largest circle (optional)
+	   @param  fx        (number) the x-coordinate of the gradient focus (optional)
+	   @param  fy        (number) the y-coordinate of the gradient focus (optional)
+	   @param  settings  (object) additional settings for the gradient (optional)
+	   @return  (element) the new gradient node */
+	radialGradient: function(parent, id, stops, cx, cy, r, fx, fy, settings) {
+		var args = this._args(arguments,
+			['id', 'stops', 'cx', 'cy', 'r', 'fx', 'fy'], ['cx']);
+		var sets = $.extend({id: args.id}, (args.cx != null ?
+			{cx: args.cx, cy: args.cy, r: args.r, fx: args.fx, fy: args.fy} : {}));
+		return this._gradient(args.parent, 'radialGradient', 
+			$.extend(sets, args.settings || {}), args.stops);
+	},
+
+	/* Add a gradient node. */
+	_gradient: function(parent, name, settings, stops) {
+		var node = this._makeNode(parent, name, settings);
+		for (var i = 0; i < stops.length; i++) {
+			var stop = stops[i];
+			this._makeNode(node, 'stop', $.extend(
+				{offset: stop[0], stopColor: stop[1]}, 
+				(stop[2] != null ? {stopOpacity: stop[2]} : {})));
+		}
+		return node;
+	},
+
+	/* Add a pattern definition.
+	   Specify all of vx, vy, xwidth, vheight or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new pattern (optional)
+	   @param  id        (string) the ID for this pattern
+	   @param  x         (number) the x-coordinate for the left edge of the pattern
+	   @param  y         (number) the y-coordinate for the top edge of the pattern
+	   @param  width     (number) the width of the pattern
+	   @param  height    (number) the height of the pattern
+	   @param  vx        (number) the minimum x-coordinate for view box (optional)
+	   @param  vy        (number) the minimum y-coordinate for the view box (optional)
+	   @param  vwidth    (number) the width of the view box (optional)
+	   @param  vheight   (number) the height of the view box (optional)
+	   @param  settings  (object) additional settings for the pattern (optional)
+	   @return  (element) the new pattern node */
+	pattern: function(parent, id, x, y, width, height, vx, vy, vwidth, vheight, settings) {
+		var args = this._args(arguments, ['id', 'x', 'y', 'width', 'height',
+			'vx', 'vy', 'vwidth', 'vheight'], ['vx']);
+		var sets = $.extend({id: args.id, x: args.x, y: args.y,
+			width: args.width, height: args.height}, (args.vx != null ?
+			{viewBox: args.vx + ' ' + args.vy + ' ' + args.vwidth + ' ' + args.vheight} : {}));
+		return this._makeNode(args.parent, 'pattern', $.extend(sets, args.settings || {}));
+	},
+
+	/* Add a mask definition.
+	   @param  parent    (element or jQuery) the parent node for the new mask (optional)
+	   @param  id        (string) the ID for this mask
+	   @param  x         (number) the x-coordinate for the left edge of the mask
+	   @param  y         (number) the y-coordinate for the top edge of the mask
+	   @param  width     (number) the width of the mask
+	   @param  height    (number) the height of the mask
+	   @param  settings  (object) additional settings for the mask (optional)
+	   @return  (element) the new mask node */
+	mask: function(parent, id, x, y, width, height, settings) {
+		var args = this._args(arguments, ['id', 'x', 'y', 'width', 'height']);
+		return this._makeNode(args.parent, 'mask', $.extend(
+			{id: args.id, x: args.x, y: args.y, width: args.width, height: args.height},
+			args.settings || {}));
+	},
+
+	/* Create a new path object.
+	   @return  (SVGPath) a new path object */
+	createPath: function() {
+		return new SVGPath();
+	},
+
+	/* Create a new text object.
+	   @return  (SVGText) a new text object */
+	createText: function() {
+		return new SVGText();
+	},
+
+	/* Add an embedded SVG element.
+	   Specify all of vx, vy, vwidth, vheight or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new node (optional)
+	   @param  x         (number) the x-coordinate for the left edge of the node
+	   @param  y         (number) the y-coordinate for the top edge of the node
+	   @param  width     (number) the width of the node
+	   @param  height    (number) the height of the node
+	   @param  vx        (number) the minimum x-coordinate for view box (optional)
+	   @param  vy        (number) the minimum y-coordinate for the view box (optional)
+	   @param  vwidth    (number) the width of the view box (optional)
+	   @param  vheight   (number) the height of the view box (optional)
+	   @param  settings  (object) additional settings for the node (optional)
+	   @return  (element) the new node */
+	svg: function(parent, x, y, width, height, vx, vy, vwidth, vheight, settings) {
+		var args = this._args(arguments, ['x', 'y', 'width', 'height',
+			'vx', 'vy', 'vwidth', 'vheight'], ['vx']);
+		var sets = $.extend({x: args.x, y: args.y, width: args.width, height: args.height}, 
+			(args.vx != null ? {viewBox: args.vx + ' ' + args.vy + ' ' +
+			args.vwidth + ' ' + args.vheight} : {}));
+		return this._makeNode(args.parent, 'svg', $.extend(sets, args.settings || {}));
+	},
+
+	/* Create a group.
+	   @param  parent    (element or jQuery) the parent node for the new group (optional)
+	   @param  id        (string) the ID of this group (optional)
+	   @param  settings  (object) additional settings for the group (optional)
+	   @return  (element) the new group node */
+	group: function(parent, id, settings) {
+		var args = this._args(arguments, ['id'], ['id']);
+		return this._makeNode(args.parent, 'g', $.extend({id: args.id}, args.settings || {}));
+	},
+
+	/* Add a usage reference.
+	   Specify all of x, y, width, height or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new node (optional)
+	   @param  x         (number) the x-coordinate for the left edge of the node (optional)
+	   @param  y         (number) the y-coordinate for the top edge of the node (optional)
+	   @param  width     (number) the width of the node (optional)
+	   @param  height    (number) the height of the node (optional)
+	   @param  ref       (string) the ID of the definition node
+	   @param  settings  (object) additional settings for the node (optional)
+	   @return  (element) the new node */
+	use: function(parent, x, y, width, height, ref, settings) {
+		var args = this._args(arguments, ['x', 'y', 'width', 'height', 'ref']);
+		if (typeof args.x == 'string') {
+			args.ref = args.x;
+			args.settings = args.y;
+			args.x = args.y = args.width = args.height = null;
+		}
+		var node = this._makeNode(args.parent, 'use', $.extend(
+			{x: args.x, y: args.y, width: args.width, height: args.height},
+			args.settings || {}));
+		node.setAttributeNS($.svg.xlinkNS, 'href', args.ref);
+		return node;
+	},
+
+	/* Add a link, which applies to all child elements.
+	   @param  parent    (element or jQuery) the parent node for the new link (optional)
+	   @param  ref       (string) the target URL
+	   @param  settings  (object) additional settings for the link (optional)
+	   @return  (element) the new link node */
+	link: function(parent, ref, settings) {
+		var args = this._args(arguments, ['ref']);
+		var node = this._makeNode(args.parent, 'a', args.settings);
+		node.setAttributeNS($.svg.xlinkNS, 'href', args.ref);
+		return node;
+	},
+
+	/* Add an image.
+	   @param  parent    (element or jQuery) the parent node for the new image (optional)
+	   @param  x         (number) the x-coordinate for the left edge of the image
+	   @param  y         (number) the y-coordinate for the top edge of the image
+	   @param  width     (number) the width of the image
+	   @param  height    (number) the height of the image
+	   @param  ref       (string) the path to the image
+	   @param  settings  (object) additional settings for the image (optional)
+	   @return  (element) the new image node */
+	image: function(parent, x, y, width, height, ref, settings) {
+		var args = this._args(arguments, ['x', 'y', 'width', 'height', 'ref']);
+		var node = this._makeNode(args.parent, 'image', $.extend(
+			{x: args.x, y: args.y, width: args.width, height: args.height},
+			args.settings || {}));
+		node.setAttributeNS($.svg.xlinkNS, 'href', args.ref);
+		return node;
+	},
+
+	/* Draw a path.
+	   @param  parent    (element or jQuery) the parent node for the new shape (optional)
+	   @param  path      (string or SVGPath) the path to draw
+	   @param  settings  (object) additional settings for the shape (optional)
+	   @return  (element) the new shape node */
+	path: function(parent, path, settings) {
+		var args = this._args(arguments, ['path']);
+		return this._makeNode(args.parent, 'path', $.extend(
+			{d: (args.path.path ? args.path.path() : args.path)}, args.settings || {}));
+	},
+
+	/* Draw a rectangle.
+	   Specify both of rx and ry or neither.
+	   @param  parent    (element or jQuery) the parent node for the new shape (optional)
+	   @param  x         (number) the x-coordinate for the left edge of the rectangle
+	   @param  y         (number) the y-coordinate for the top edge of the rectangle
+	   @param  width     (number) the width of the rectangle
+	   @param  height    (number) the height of the rectangle
+	   @param  rx        (number) the x-radius of the ellipse for the rounded corners (optional)
+	   @param  ry        (number) the y-radius of the ellipse for the rounded corners (optional)
+	   @param  settings  (object) additional settings for the shape (optional)
+	   @return  (element) the new shape node */
+	rect: function(parent, x, y, width, height, rx, ry, settings) {
+		var args = this._args(arguments, ['x', 'y', 'width', 'height', 'rx', 'ry'], ['rx']);
+		return this._makeNode(args.parent, 'rect', $.extend(
+			{x: args.x, y: args.y, width: args.width, height: args.height},
+			(args.rx ? {rx: args.rx, ry: args.ry} : {}), args.settings || {}));
+	},
+
+	/* Draw a circle.
+	   @param  parent    (element or jQuery) the parent node for the new shape (optional)
+	   @param  cx        (number) the x-coordinate for the centre of the circle
+	   @param  cy        (number) the y-coordinate for the centre of the circle
+	   @param  r         (number) the radius of the circle
+	   @param  settings  (object) additional settings for the shape (optional)
+	   @return  (element) the new shape node */
+	circle: function(parent, cx, cy, r, settings) {
+		var args = this._args(arguments, ['cx', 'cy', 'r']);
+		return this._makeNode(args.parent, 'circle', $.extend(
+			{cx: args.cx, cy: args.cy, r: args.r}, args.settings || {}));
+	},
+
+	/* Draw an ellipse.
+	   @param  parent    (element or jQuery) the parent node for the new shape (optional)
+	   @param  cx        (number) the x-coordinate for the centre of the ellipse
+	   @param  cy        (number) the y-coordinate for the centre of the ellipse
+	   @param  rx        (number) the x-radius of the ellipse
+	   @param  ry        (number) the y-radius of the ellipse
+	   @param  settings  (object) additional settings for the shape (optional)
+	   @return  (element) the new shape node */
+	ellipse: function(parent, cx, cy, rx, ry, settings) {
+		var args = this._args(arguments, ['cx', 'cy', 'rx', 'ry']);
+		return this._makeNode(args.parent, 'ellipse', $.extend(
+			{cx: args.cx, cy: args.cy, rx: args.rx, ry: args.ry}, args.settings || {}));
+	},
+
+	/* Draw a line.
+	   @param  parent    (element or jQuery) the parent node for the new shape (optional)
+	   @param  x1        (number) the x-coordinate for the start of the line
+	   @param  y1        (number) the y-coordinate for the start of the line
+	   @param  x2        (number) the x-coordinate for the end of the line
+	   @param  y2        (number) the y-coordinate for the end of the line
+	   @param  settings  (object) additional settings for the shape (optional)
+	   @return  (element) the new shape node */
+	line: function(parent, x1, y1, x2, y2, settings) {
+		var args = this._args(arguments, ['x1', 'y1', 'x2', 'y2']);
+		return this._makeNode(args.parent, 'line', $.extend(
+			{x1: args.x1, y1: args.y1, x2: args.x2, y2: args.y2}, args.settings || {}));
+	},
+
+	/* Draw a polygonal line.
+	   @param  parent    (element or jQuery) the parent node for the new shape (optional)
+	   @param  points    (number[][]) the x-/y-coordinates for the points on the line
+	   @param  settings  (object) additional settings for the shape (optional)
+	   @return  (element) the new shape node */
+	polyline: function(parent, points, settings) {
+		var args = this._args(arguments, ['points']);
+		return this._poly(args.parent, 'polyline', args.points, args.settings);
+	},
+
+	/* Draw a polygonal shape.
+	   @param  parent    (element or jQuery) the parent node for the new shape (optional)
+	   @param  points    (number[][]) the x-/y-coordinates for the points on the shape
+	   @param  settings  (object) additional settings for the shape (optional)
+	   @return  (element) the new shape node */
+	polygon: function(parent, points, settings) {
+		var args = this._args(arguments, ['points']);
+		return this._poly(args.parent, 'polygon', args.points, args.settings);
+	},
+
+	/* Draw a polygonal line or shape. */
+	_poly: function(parent, name, points, settings) {
+		var ps = '';
+		for (var i = 0; i < points.length; i++) {
+			ps += points[i].join() + ' ';
+		}
+		return this._makeNode(parent, name, $.extend(
+			{points: $.trim(ps)}, settings || {}));
+	},
+
+	/* Draw text.
+	   Specify both of x and y or neither of them.
+	   @param  parent    (element or jQuery) the parent node for the text (optional)
+	   @param  x         (number or number[]) the x-coordinate(s) for the text (optional)
+	   @param  y         (number or number[]) the y-coordinate(s) for the text (optional)
+	   @param  value     (string) the text content or
+	                     (SVGText) text with spans and references
+	   @param  settings  (object) additional settings for the text (optional)
+	   @return  (element) the new text node */
+	text: function(parent, x, y, value, settings) {
+		var args = this._args(arguments, ['x', 'y', 'value']);
+		if (typeof args.x == 'string' && arguments.length < 4) {
+			args.value = args.x;
+			args.settings = args.y;
+			args.x = args.y = null;
+		}
+		return this._text(args.parent, 'text', args.value, $.extend(
+			{x: (args.x && isArray(args.x) ? args.x.join(' ') : args.x),
+			y: (args.y && isArray(args.y) ? args.y.join(' ') : args.y)}, 
+			args.settings || {}));
+	},
+
+	/* Draw text along a path.
+	   @param  parent    (element or jQuery) the parent node for the text (optional)
+	   @param  path      (string) the ID of the path
+	   @param  value     (string) the text content or
+	                     (SVGText) text with spans and references
+	   @param  settings  (object) additional settings for the text (optional)
+	   @return  (element) the new text node */
+	textpath: function(parent, path, value, settings) {
+		var args = this._args(arguments, ['path', 'value']);
+		var node = this._text(args.parent, 'textPath', args.value, args.settings || {});
+		node.setAttributeNS($.svg.xlinkNS, 'href', args.path);
+		return node;
+	},
+
+	/* Draw text. */
+	_text: function(parent, name, value, settings) {
+		var node = this._makeNode(parent, name, settings);
+		if (typeof value == 'string') {
+			node.appendChild(node.ownerDocument.createTextNode(value));
+		}
+		else {
+			for (var i = 0; i < value._parts.length; i++) {
+				var part = value._parts[i];
+				if (part[0] == 'tspan') {
+					var child = this._makeNode(node, part[0], part[2]);
+					child.appendChild(node.ownerDocument.createTextNode(part[1]));
+					node.appendChild(child);
+				}
+				else if (part[0] == 'tref') {
+					var child = this._makeNode(node, part[0], part[2]);
+					child.setAttributeNS($.svg.xlinkNS, 'href', part[1]);
+					node.appendChild(child);
+				}
+				else if (part[0] == 'textpath') {
+					var set = $.extend({}, part[2]);
+					set.href = null;
+					var child = this._makeNode(node, part[0], set);
+					child.setAttributeNS($.svg.xlinkNS, 'href', part[2].href);
+					child.appendChild(node.ownerDocument.createTextNode(part[1]));
+					node.appendChild(child);
+				}
+				else { // straight text
+					node.appendChild(node.ownerDocument.createTextNode(part[1]));
+				}
+			}
+		}
+		return node;
+	},
+
+	/* Add a custom SVG element.
+	   @param  parent    (element or jQuery) the parent node for the new element (optional)
+	   @param  name      (string) the name of the element
+	   @param  settings  (object) additional settings for the element (optional)
+	   @return  (element) the new custom node */
+	other: function(parent, name, settings) {
+		var args = this._args(arguments, ['name']);
+		return this._makeNode(args.parent, args.name, args.settings || {});
+	},
+
+	/* Create a shape node with the given settings. */
+	_makeNode: function(parent, name, settings) {
+		parent = parent || this._svg;
+		var node = this._svg.ownerDocument.createElementNS($.svg.svgNS, name);
+		for (var name in settings) {
+			var value = settings[name];
+			if (value != null && value != null && 
+					(typeof value != 'string' || value != '')) {
+				node.setAttribute($.svg._attrNames[name] || name, value);
+			}
+		}
+		parent.appendChild(node);
+		return node;
+	},
+
+	/* Add an existing SVG node to the diagram.
+	   @param  parent  (element or jQuery) the parent node for the new node (optional)
+	   @param  node    (element) the new node to add or
+	                   (string) the jQuery selector for the node or
+	                   (jQuery collection) set of nodes to add
+	   @return  (SVGWrapper) this wrapper */
+	add: function(parent, node) {
+		var args = this._args((arguments.length == 1 ? [null, parent] : arguments), ['node']);
+		var svg = this;
+		args.parent = args.parent || this._svg;
+		try {
+			if ($.svg._renesis) {
+				throw 'Force traversal';
+			}
+			args.parent.appendChild(args.node.cloneNode(true));
+		}
+		catch (e) {
+			args.node = (args.node.jquery ? args.node : $(args.node));
+			args.node.each(function() {
+				var child = svg._cloneAsSVG(this);
+				if (child) {
+					args.parent.appendChild(child);
+				}
+			});
+		}
+		return this;
+	},
+
+	/* SVG nodes must belong to the SVG namespace, so clone and ensure this is so. */
+	_cloneAsSVG: function(node) {
+		var newNode = null;
+		if (node.nodeType == 1) { // element
+			newNode = this._svg.ownerDocument.createElementNS(
+				$.svg.svgNS, this._checkName(node.nodeName));
+			for (var i = 0; i < node.attributes.length; i++) {
+				var attr = node.attributes.item(i);
+				if (attr.nodeName != 'xmlns' && attr.nodeValue) {
+					if (attr.prefix == 'xlink') {
+						newNode.setAttributeNS($.svg.xlinkNS, attr.localName, attr.nodeValue);
+					}
+					else {
+						newNode.setAttribute(this._checkName(attr.nodeName), attr.nodeValue);
+					}
+				}
+			}
+			for (var i = 0; i < node.childNodes.length; i++) {
+				var child = this._cloneAsSVG(node.childNodes[i]);
+				if (child) {
+					newNode.appendChild(child);
+				}
+			}
+		}
+		else if (node.nodeType == 3) { // text
+			if ($.trim(node.nodeValue)) {
+				newNode = this._svg.ownerDocument.createTextNode(node.nodeValue);
+			}
+		}
+		else if (node.nodeType == 4) { // CDATA
+			if ($.trim(node.nodeValue)) {
+				try {
+					newNode = this._svg.ownerDocument.createCDATASection(node.nodeValue);
+				}
+				catch (e) {
+					newNode = this._svg.ownerDocument.createTextNode(
+						node.nodeValue.replace(/&/g, '&amp;').
+						replace(/</g, '&lt;').replace(/>/g, '&gt;'));
+				}
+			}
+		}
+		return newNode;
+	},
+
+	/* Node names must be lower case and without SVG namespace prefix. */
+	_checkName: function(name) {
+		name = (name.substring(0, 1) >= 'A' && name.substring(0, 1) <= 'Z' ?
+			name.toLowerCase() : name);
+		return (name.substring(0, 4) == 'svg:' ? name.substring(4) : name);
+	},
+
+	/* Load an external SVG document.
+	   @param  url       (string) the location of the SVG document or
+	                     the actual SVG content
+	   @param  settings  (boolean) see addTo below or
+	                     (function) see onLoad below or
+	                     (object) additional settings for the load with attributes below:
+	                       addTo       (boolean) true to add to what's already there,
+	                                   or false to clear the canvas first
+						   changeSize  (boolean) true to allow the canvas size to change,
+	                                   or false to retain the original
+	                       onLoad      (function) callback after the document has loaded,
+	                                   'this' is the container, receives SVG object and
+	                                   optional error message as a parameter
+	   @return  (SVGWrapper) this root */
+	load: function(url, settings) {
+		settings = (typeof settings == 'boolean'? {addTo: settings} :
+			(typeof settings == 'function'? {onLoad: settings} : settings || {}));
+		if (!settings.addTo) {
+			this.clear(false);
+		}
+		var size = [this._svg.getAttribute('width'), this._svg.getAttribute('height')];
+		var wrapper = this;
+		// Report a problem with the load
+		var reportError = function(message) {
+			message = $.svg.local.errorLoadingText + ': ' + message;
+			if (settings.onLoad) {
+				settings.onLoad.apply(wrapper._container || wrapper._svg, [wrapper, message]);
+			}
+			else {
+				wrapper.text(null, 10, 20, message);
+			}
+		};
+		// Create a DOM from SVG content
+		var loadXML4IE = function(data) {
+			var xml = new ActiveXObject('Microsoft.XMLDOM');
+			xml.validateOnParse = false;
+			xml.resolveExternals = false;
+			xml.async = false;
+			xml.loadXML(data);
+			if (xml.parseError.errorCode != 0) {
+				reportError(xml.parseError.reason);
+				return null;
+			}
+			return xml;
+		};
+		// Load the SVG DOM
+		var loadSVG = function(data) {
+			if (!data) {
+				return;
+			}
+			if (data.documentElement.nodeName != 'svg') {
+				var errors = data.getElementsByTagName('parsererror');
+				var messages = (errors.length ? errors[0].getElementsByTagName('div') : []); // Safari
+				reportError(!errors.length ? '???' :
+					(messages.length ? messages[0] : errors[0]).firstChild.nodeValue);
+				return;
+			}
+			var attrs = {};
+			for (var i = 0; i < data.documentElement.attributes.length; i++) {
+				var attr = data.documentElement.attributes.item(i);
+				if (!(attr.nodeName == 'version' || attr.nodeName.substring(0, 5) == 'xmlns')) {
+					attrs[attr.nodeName] = attr.nodeValue;
+				}
+			}
+			wrapper.configure(attrs, true);
+			var nodes = data.documentElement.childNodes;
+			for (var i = 0; i < nodes.length; i++) {
+				try {
+					if ($.svg._renesis) {
+						throw 'Force traversal';
+					}
+					wrapper._svg.appendChild(nodes[i].cloneNode(true));
+					if (nodes[i].nodeName == 'script') {
+						$.globalEval(nodes[i].textContent);
+					}
+				}
+				catch (e) {
+					wrapper.add(null, nodes[i]);
+				}
+			}
+			if (!settings.changeSize) {
+				wrapper.configure({width: size[0], height: size[1]});
+			}
+			if (settings.onLoad) {
+				settings.onLoad.apply(wrapper._container || wrapper._svg, [wrapper]);
+			}
+		};
+		if (url.match('<svg')) { // Inline SVG
+			loadSVG($.browser.msie ? loadXML4IE(url) :
+				new DOMParser().parseFromString(url, 'text/xml'));
+		}
+		else { // Remote SVG
+			$.ajax({url: url, dataType: ($.browser.msie ? 'text' : 'xml'),
+				success: function(xml) {
+					loadSVG($.browser.msie ? loadXML4IE(xml) : xml);
+				}, error: function(http, message, exc) {
+					reportError(message + (exc ? ' ' + exc.message : ''));
+				}});
+		}
+		return this;
+	},
+
+	/* Delete a specified node.
+	   @param  node  (element or jQuery) the drawing node to remove
+	   @return  (SVGWrapper) this root */
+	remove: function(node) {
+		node = (node.jquery ? node[0] : node);
+		node.parentNode.removeChild(node);
+		return this;
+	},
+
+	/* Delete everything in the current document.
+	   @param  attrsToo  (boolean) true to clear any root attributes as well,
+	                     false to leave them (optional)
+	   @return  (SVGWrapper) this root */
+	clear: function(attrsToo) {
+		if (attrsToo) {
+			this.configure({}, true);
+		}
+		while (this._svg.firstChild) {
+			this._svg.removeChild(this._svg.firstChild);
+		}
+		return this;
+	},
+
+	/* Serialise the current diagram into an SVG text document.
+	   @param  node  (SVG element) the starting node (optional)
+	   @return  (string) the SVG as text */
+	toSVG: function(node) {
+		node = node || this._svg;
+		return (typeof XMLSerializer == 'undefined' ? this._toSVG(node) :
+			new XMLSerializer().serializeToString(node));
+	},
+
+	/* Serialise one node in the SVG hierarchy. */
+	_toSVG: function(node) {
+		var svgDoc = '';
+		if (!node) {
+			return svgDoc;
+		}
+		if (node.nodeType == 3) { // Text
+			svgDoc = node.nodeValue;
+		}
+		else if (node.nodeType == 4) { // CDATA
+			svgDoc = '<![CDATA[' + node.nodeValue + ']]>';
+		}
+		else { // Element
+			svgDoc = '<' + node.nodeName;
+			if (node.attributes) {
+				for (var i = 0; i < node.attributes.length; i++) {
+					var attr = node.attributes.item(i);
+					if (!($.trim(attr.nodeValue) == '' || attr.nodeValue.match(/^\[object/) ||
+							attr.nodeValue.match(/^function/))) {
+						svgDoc += ' ' + (attr.namespaceURI == $.svg.xlinkNS ? 'xlink:' : '') + 
+							attr.nodeName + '="' + attr.nodeValue + '"';
+					}
+				}
+			}	
+			if (node.firstChild) {
+				svgDoc += '>';
+				var child = node.firstChild;
+				while (child) {
+					svgDoc += this._toSVG(child);
+					child = child.nextSibling;
+				}
+				svgDoc += '</' + node.nodeName + '>';
+			}
+				else {
+				svgDoc += '/>';
+			}
+		}
+		return svgDoc;
+	},
+	
+	/* Escape reserved characters in XML. */
+	_escapeXML: function(text) {
+		text = text.replace(/&/g, '&amp;');
+		text = text.replace(/</g, '&lt;');
+		text = text.replace(/>/g, '&gt;');
+		return text;
+	}
+});
+
+/* Helper to generate an SVG path.
+   Obtain an instance from the SVGWrapper object.
+   String calls together to generate the path and use its value:
+   var path = root.createPath();
+   root.path(null, path.move(100, 100).line(300, 100).line(200, 300).close(), {fill: 'red'});
+   or
+   root.path(null, path.move(100, 100).line([[300, 100], [200, 300]]).close(), {fill: 'red'}); */
+function SVGPath() {
+	this._path = '';
+}
+
+$.extend(SVGPath.prototype, {
+	/* Prepare to create a new path.
+	   @return  (SVGPath) this path */
+	reset: function() {
+		this._path = '';
+		return this;
+	},
+
+	/* Move the pointer to a position.
+	   @param  x         (number) x-coordinate to move to or
+	                     (number[][]) x-/y-coordinates to move to
+	   @param  y         (number) y-coordinate to move to (omitted if x is array)
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	move: function(x, y, relative) {
+		relative = (isArray(x) ? y : relative);
+		return this._coords((relative ? 'm' : 'M'), x, y);
+	},
+
+	/* Draw a line to a position.
+	   @param  x         (number) x-coordinate to move to or
+	                     (number[][]) x-/y-coordinates to move to
+	   @param  y         (number) y-coordinate to move to (omitted if x is array)
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	line: function(x, y, relative) {
+		relative = (isArray(x) ? y : relative);
+		return this._coords((relative ? 'l' : 'L'), x, y);
+	},
+
+	/* Draw a horizontal line to a position.
+	   @param  x         (number) x-coordinate to draw to or
+	                     (number[]) x-coordinates to draw to
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	horiz: function(x, relative) {
+		this._path += (relative ? 'h' : 'H') + (isArray(x) ? x.join(' ') : x);
+		return this;
+	},
+
+	/* Draw a vertical line to a position.
+	   @param  y         (number) y-coordinate to draw to or
+	                     (number[]) y-coordinates to draw to
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	vert: function(y, relative) {
+		this._path += (relative ? 'v' : 'V') + (isArray(y) ? y.join(' ') : y);
+		return this;
+	},
+
+	/* Draw a cubic Bézier curve.
+	   @param  x1        (number) x-coordinate of beginning control point or
+	                     (number[][]) x-/y-coordinates of control and end points to draw to
+	   @param  y1        (number) y-coordinate of beginning control point (omitted if x1 is array)
+	   @param  x2        (number) x-coordinate of ending control point (omitted if x1 is array)
+	   @param  y2        (number) y-coordinate of ending control point (omitted if x1 is array)
+	   @param  x         (number) x-coordinate of curve end (omitted if x1 is array)
+	   @param  y         (number) y-coordinate of curve end (omitted if x1 is array)
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	curveC: function(x1, y1, x2, y2, x, y, relative) {
+		relative = (isArray(x1) ? y1 : relative);
+		return this._coords((relative ? 'c' : 'C'), x1, y1, x2, y2, x, y);
+	},
+
+	/* Continue a cubic Bézier curve.
+	   Starting control point is the reflection of the previous end control point.
+	   @param  x2        (number) x-coordinate of ending control point or
+	                     (number[][]) x-/y-coordinates of control and end points to draw to
+	   @param  y2        (number) y-coordinate of ending control point (omitted if x2 is array)
+	   @param  x         (number) x-coordinate of curve end (omitted if x2 is array)
+	   @param  y         (number) y-coordinate of curve end (omitted if x2 is array)
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	smoothC: function(x2, y2, x, y, relative) {
+		relative = (isArray(x2) ? y2 : relative);
+		return this._coords((relative ? 's' : 'S'), x2, y2, x, y);
+	},
+
+	/* Draw a quadratic Bézier curve.
+	   @param  x1        (number) x-coordinate of control point or
+	                     (number[][]) x-/y-coordinates of control and end points to draw to
+	   @param  y1        (number) y-coordinate of control point (omitted if x1 is array)
+	   @param  x         (number) x-coordinate of curve end (omitted if x1 is array)
+	   @param  y         (number) y-coordinate of curve end (omitted if x1 is array)
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	curveQ: function(x1, y1, x, y, relative) {
+		relative = (isArray(x1) ? y1 : relative);
+		return this._coords((relative ? 'q' : 'Q'), x1, y1, x, y);
+	},
+
+	/* Continue a quadratic Bézier curve.
+	   Control point is the reflection of the previous control point.
+	   @param  x         (number) x-coordinate of curve end or
+	                     (number[][]) x-/y-coordinates of points to draw to
+	   @param  y         (number) y-coordinate of curve end (omitted if x is array)
+	   @param  relative  (boolean) true for coordinates relative to the current point,
+	                     false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	smoothQ: function(x, y, relative) {
+		relative = (isArray(x) ? y : relative);
+		return this._coords((relative ? 't' : 'T'), x, y);
+	},
+
+	/* Generate a path command with (a list of) coordinates. */
+	_coords: function(cmd, x1, y1, x2, y2, x3, y3) {
+		if (isArray(x1)) {
+			for (var i = 0; i < x1.length; i++) {
+				var cs = x1[i];
+				this._path += (i == 0 ? cmd : ' ') + cs[0] + ',' + cs[1] +
+					(cs.length < 4 ? '' : ' ' + cs[2] + ',' + cs[3] +
+					(cs.length < 6 ? '': ' ' + cs[4] + ',' + cs[5]));
+			}
+		}
+		else {
+			this._path += cmd + x1 + ',' + y1 + 
+				(x2 == null ? '' : ' ' + x2 + ',' + y2 +
+				(x3 == null ? '' : ' ' + x3 + ',' + y3));
+		}
+		return this;
+	},
+
+	/* Draw an arc to a position.
+	   @param  rx         (number) x-radius of arc or
+	                      (number/boolean[][]) x-/y-coordinates and flags for points to draw to
+	   @param  ry         (number) y-radius of arc (omitted if rx is array)
+	   @param  xRotate    (number) x-axis rotation (degrees, clockwise) (omitted if rx is array)
+	   @param  large      (boolean) true to draw the large part of the arc,
+	                      false to draw the small part (omitted if rx is array)
+	   @param  clockwise  (boolean) true to draw the clockwise arc,
+	                      false to draw the anti-clockwise arc (omitted if rx is array)
+	   @param  x          (number) x-coordinate of arc end (omitted if rx is array)
+	   @param  y          (number) y-coordinate of arc end (omitted if rx is array)
+	   @param  relative   (boolean) true for coordinates relative to the current point,
+	                      false for coordinates being absolute
+	   @return  (SVGPath) this path */
+	arc: function(rx, ry, xRotate, large, clockwise, x, y, relative) {
+		relative = (isArray(rx) ? ry : relative);
+		this._path += (relative ? 'a' : 'A');
+		if (isArray(rx)) {
+			for (var i = 0; i < rx.length; i++) {
+				var cs = rx[i];
+				this._path += (i == 0 ? '' : ' ') + cs[0] + ',' + cs[1] + ' ' +
+					cs[2] + ' ' + (cs[3] ? '1' : '0') + ',' +
+					(cs[4] ? '1' : '0') + ' ' + cs[5] + ',' + cs[6];
+			}
+		}
+		else {
+			this._path += rx + ',' + ry + ' ' + xRotate + ' ' +
+				(large ? '1' : '0') + ',' + (clockwise ? '1' : '0') + ' ' + x + ',' + y;
+		}
+		return this;
+	},
+
+	/* Close the current path.
+	   @return  (SVGPath) this path */
+	close: function() {
+		this._path += 'z';
+		return this;
+	},
+
+	/* Return the string rendering of the specified path.
+	   @return  (string) stringified path */
+	path: function() {
+		return this._path;
+	}
+});
+
+SVGPath.prototype.moveTo = SVGPath.prototype.move;
+SVGPath.prototype.lineTo = SVGPath.prototype.line;
+SVGPath.prototype.horizTo = SVGPath.prototype.horiz;
+SVGPath.prototype.vertTo = SVGPath.prototype.vert;
+SVGPath.prototype.curveCTo = SVGPath.prototype.curveC;
+SVGPath.prototype.smoothCTo = SVGPath.prototype.smoothC;
+SVGPath.prototype.curveQTo = SVGPath.prototype.curveQ;
+SVGPath.prototype.smoothQTo = SVGPath.prototype.smoothQ;
+SVGPath.prototype.arcTo = SVGPath.prototype.arc;
+
+/* Helper to generate an SVG text object.
+   Obtain an instance from the SVGWrapper object.
+   String calls together to generate the text and use its value:
+   var text = root.createText();
+   root.text(null, x, y, text.string('This is ').
+     span('red', {fill: 'red'}).string('!'), {fill: 'blue'}); */
+function SVGText() {
+	this._parts = []; // The components of the text object
+}
+
+$.extend(SVGText.prototype, {
+	/* Prepare to create a new text object.
+	   @return  (SVGText) this text */
+	reset: function() {
+		this._parts = [];
+		return this;
+	},
+
+	/* Add a straight string value.
+	   @param  value  (string) the actual text
+	   @return  (SVGText) this text object */
+	string: function(value) {
+		this._parts[this._parts.length] = ['text', value];
+		return this;
+	},
+
+	/* Add a separate text span that has its own settings.
+	   @param  value     (string) the actual text
+	   @param  settings  (object) the settings for this text
+	   @return  (SVGText) this text object */
+	span: function(value, settings) {
+		this._parts[this._parts.length] = ['tspan', value, settings];
+		return this;
+	},
+
+	/* Add a reference to a previously defined text string.
+	   @param  id        (string) the ID of the actual text
+	   @param  settings  (object) the settings for this text
+	   @return  (SVGText) this text object */
+	ref: function(id, settings) {
+		this._parts[this._parts.length] = ['tref', id, settings];
+		return this;
+	},
+
+	/* Add text drawn along a path.
+	   @param  id        (string) the ID of the path
+	   @param  value     (string) the actual text
+	   @param  settings  (object) the settings for this text
+	   @return  (SVGText) this text object */
+	path: function(id, value, settings) {
+		this._parts[this._parts.length] = ['textpath', value, 
+			$.extend({href: id}, settings || {})];
+		return this;
+	}
+});
+
+/* Attach the SVG functionality to a jQuery selection.
+   @param  command  (string) the command to run (optional, default 'attach')
+   @param  options  (object) the new settings to use for these SVG instances
+   @return jQuery (object) for chaining further calls */
+$.fn.svg = function(options) {
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options == 'string' && options == 'get') {
+		return $.svg['_' + options + 'SVG'].apply($.svg, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		if (typeof options == 'string') {
+			$.svg['_' + options + 'SVG'].apply($.svg, [this].concat(otherArgs));
+		}
+		else {
+			$.svg._attachSVG(this, options || {});
+		} 
+	});
+};
+
+/* Determine whether an object is an array. */
+function isArray(a) {
+	return (a && a.constructor == Array);
+}
+
+// Singleton primary SVG interface
+$.svg = new SVGManager();
+
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svganim.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,405 @@
+/* http://keith-wood.name/svg.html
+   SVG attribute animations for jQuery v1.4.3.
+   Written by Keith Wood (kbwood{at}iinet.com.au) June 2008.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and 
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. 
+   Please attribute the author if you use it. */
+
+(function($) { // Hide scope, no $ conflict
+
+// Enable animation for all of these SVG numeric attributes -
+// named as svg-* or svg* (with first character upper case)
+$.each(['x', 'y', 'width', 'height', 'rx', 'ry', 'cx', 'cy', 'r', 'x1', 'y1', 'x2', 'y2',
+		'stroke-width', 'strokeWidth', 'opacity', 'fill-opacity', 'fillOpacity',
+		'stroke-opacity', 'strokeOpacity', 'font-size', 'fontSize'],
+	function(i, attrName) {
+		var ccName = attrName.charAt(0).toUpperCase() + attrName.substr(1);
+		$.fx.step['svg' + ccName] = $.fx.step['svg-' + attrName] = function(fx) {
+			var realAttrName = $.svg._attrNames[attrName] || attrName;
+			var attr = fx.elem.attributes.getNamedItem(realAttrName);
+			if (!fx.set) {
+				fx.start = (attr ? parseFloat(attr.nodeValue) : 0);
+				var offset = fx.options.curAnim['svg-' + attrName] ||
+					fx.options.curAnim['svg' + ccName];
+				if (/^[+-]=/.exec(offset)) {
+					fx.end = fx.start + parseFloat(offset.replace(/=/, ''));
+				}
+				$(fx.elem).css(realAttrName, '');
+				fx.set = true;
+			}
+			var value = (fx.pos * (fx.end - fx.start) + fx.start) + (fx.unit == '%' ? '%' : '');
+			(attr ? attr.nodeValue = value : fx.elem.setAttribute(realAttrName, value));
+		};
+	}
+);
+
+// Enable animation for the SVG viewBox attribute
+$.fx.step['svgViewBox'] = $.fx.step['svg-viewBox'] = function(fx) {
+	var attr = fx.elem.attributes.getNamedItem('viewBox');
+	if (!fx.set) {
+		fx.start = parseViewBox(attr ? attr.nodeValue : '');
+		var offset = fx.options.curAnim['svg-viewBox'] || fx.options.curAnim['svgViewBox'];
+		fx.end = parseViewBox(offset);
+		if (/^[+-]=/.exec(offset)) {
+			offset = offset.split(' ');
+			while (offset.length < 4) {
+				offset.push('0');
+			}
+			for (var i = 0; i < 4; i++) {
+				if (/^[+-]=/.exec(offset[i])) {
+					fx.end[i] = fx.start[i] + parseFloat(offset[i].replace(/=/, ''));
+				}
+			}
+		}
+		fx.set = true;
+	}
+	var value = $.map(fx.start, function(n, i) {
+		return (fx.pos * (fx.end[i] - n) + n);
+	}).join(' ');
+	(attr ? attr.nodeValue = value : fx.elem.setAttribute('viewBox', value));
+};
+
+/* Parse a viewBox definition: x, y, width, height.
+   @param  value  (string) the definition
+   @return  (number[4]) the extracted values */
+function parseViewBox(value) {
+	var viewBox = value.split(' ');
+	for (var i = 0; i < viewBox.length; i++) {
+		viewBox[i] = parseFloat(viewBox[i]);
+		if (isNaN(viewBox[i])) {
+			viewBox[i] = 0;
+		}
+	}
+	while (viewBox.length < 4) {
+		viewBox.push(0);
+	}
+	return viewBox;
+}
+
+// Enable animation for the SVG transform attribute
+$.fx.step['svgTransform'] = $.fx.step['svg-transform'] = function(fx) {
+	var attr = fx.elem.attributes.getNamedItem('transform');
+	if (!fx.set) {
+		fx.start = parseTransform(attr ? attr.nodeValue : '');
+		fx.end = parseTransform(fx.end, fx.start);
+		fx.set = true;
+	}
+	var transform = '';
+	for (var i = 0; i < fx.end.order.length; i++) {
+		switch (fx.end.order.charAt(i)) {
+			case 't':
+				transform += (fx.start.translateX != fx.end.translateX || fx.start.translateY != fx.end.translateY ?
+					' translate(' + (fx.pos * (fx.end.translateX - fx.start.translateX) + fx.start.translateX) + ',' +
+					(fx.pos * (fx.end.translateY - fx.start.translateY) + fx.start.translateY) + ')' : '');
+				break;
+			case 's':
+				transform += (fx.start.scaleX != fx.end.scaleX || fx.start.scaleY != fx.end.scaleY ? 
+					' scale(' + (fx.pos * (fx.end.scaleX - fx.start.scaleX) + fx.start.scaleX) + ',' +
+					(fx.pos * (fx.end.scaleY - fx.start.scaleY) + fx.start.scaleY) + ')' : '');
+				break;
+			case 'r':
+				transform += (fx.start.rotateA != fx.end.rotateA ||
+					fx.start.rotateX != fx.end.rotateX || fx.start.rotateY != fx.end.rotateY ?
+					' rotate(' + (fx.pos * (fx.end.rotateA - fx.start.rotateA) + fx.start.rotateA) + ',' +
+					(fx.pos * (fx.end.rotateX - fx.start.rotateX) + fx.start.rotateX) + ',' +
+					(fx.pos * (fx.end.rotateY - fx.start.rotateY) + fx.start.rotateY) + ')' : '');
+				break;
+			case 'x':
+				transform += (fx.start.skewX != fx.end.skewX ?
+					' skewX(' + (fx.pos * (fx.end.skewX - fx.start.skewX) + fx.start.skewX) + ')' : '');
+			case 'y':
+				transform += (fx.start.skewY != fx.end.skewY ?
+					' skewY(' + (fx.pos * (fx.end.skewY - fx.start.skewY) + fx.start.skewY) + ')' : '');
+				break;
+			case 'm':
+				var matrix = '';
+				for (var j = 0; j < 6; j++) {
+					matrix += ',' + (fx.pos * (fx.end.matrix[j] - fx.start.matrix[j]) + fx.start.matrix[j]);
+				}				
+				transform += ' matrix(' + matrix.substr(1) + ')';
+				break;
+		}
+	}
+	(attr ? attr.nodeValue = transform : fx.elem.setAttribute('transform', transform));
+};
+
+/* Decode a transform string and extract component values.
+   @param  value     (string) the transform string to parse
+   @param  original  (object) the settings from the original node
+   @return  (object) the combined transformation attributes */
+function parseTransform(value, original) {
+	value = value || '';
+	if (typeof value == 'object') {
+		value = value.nodeValue;
+	}
+	var transform = $.extend({translateX: 0, translateY: 0, scaleX: 0, scaleY: 0,
+		rotateA: 0, rotateX: 0, rotateY: 0, skewX: 0, skewY: 0,
+		matrix: [0, 0, 0, 0, 0, 0]}, original || {});
+	transform.order = '';
+	var pattern = /([a-zA-Z]+)\(\s*([+-]?[\d\.]+)\s*(?:[\s,]\s*([+-]?[\d\.]+)\s*(?:[\s,]\s*([+-]?[\d\.]+)\s*(?:[\s,]\s*([+-]?[\d\.]+)\s*[\s,]\s*([+-]?[\d\.]+)\s*[\s,]\s*([+-]?[\d\.]+)\s*)?)?)?\)/g;
+	var result = pattern.exec(value);
+	while (result) {
+		switch (result[1]) {
+			case 'translate':
+				transform.order += 't';
+				transform.translateX = parseFloat(result[2]);
+				transform.translateY = (result[3] ? parseFloat(result[3]) : 0);
+				break;
+			case 'scale':
+				transform.order += 's';
+				transform.scaleX = parseFloat(result[2]);
+				transform.scaleY = (result[3] ? parseFloat(result[3]) : transform.scaleX);
+				break;
+			case 'rotate':
+				transform.order += 'r';
+				transform.rotateA = parseFloat(result[2]);
+				transform.rotateX = (result[3] ? parseFloat(result[3]) : 0);
+				transform.rotateY = (result[4] ? parseFloat(result[4]) : 0);
+				break;
+			case 'skewX':
+				transform.order += 'x';
+				transform.skewX = parseFloat(result[2]);
+				break;
+			case 'skewY':
+				transform.order += 'y';
+				transform.skewY = parseFloat(result[2]);
+				break;
+			case 'matrix':
+				transform.order += 'm';
+				transform.matrix = [parseFloat(result[2]), parseFloat(result[3]),
+					parseFloat(result[4]), parseFloat(result[5]),
+					parseFloat(result[6]), parseFloat(result[7])];
+				break;
+		}
+		result = pattern.exec(value);
+	}
+	return transform;
+}
+
+// Enable animation for all of these SVG colour properties - based on jquery.color.js
+$.each(['fill', 'stroke'],
+	function(i, attrName) {
+		var ccName = attrName.charAt(0).toUpperCase() + attrName.substr(1);
+		$.fx.step['svg' + ccName] = $.fx.step['svg-' + attrName] = function(fx) {
+			if (!fx.set) {
+				fx.start = getColour(fx.elem, attrName);
+				var toNone = (fx.end == 'none');
+				fx.end = (toNone ? getColour(fx.elem.parentNode, attrName) : getRGB(fx.end));
+				fx.end[3] = toNone;
+				$(fx.elem).css(attrName, '');
+				fx.set = true;
+			}
+			var attr = fx.elem.attributes.getNamedItem(attrName);
+			var colour = 'rgb(' + [
+				Math.min(Math.max(parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10), 0), 255),
+				Math.min(Math.max(parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10), 0), 255),
+				Math.min(Math.max(parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10), 0), 255)
+			].join(',') + ')';
+			colour = (fx.end[3] && fx.state == 1 ? 'none' : colour);
+			(attr ? attr.nodeValue = colour : fx.elem.setAttribute(attrName, colour));
+		}
+	}
+);
+
+/* Find this attribute value somewhere up the node hierarchy.
+   @param  elem  (element) the starting element to find the attribute
+   @param  attr  (string) the attribute name
+   @return  (number[3]) RGB components for the attribute colour */
+function getColour(elem, attr) {
+	var colour;
+	do {
+		colour = (elem.attributes && elem.attributes.getNamedItem(attr) ?
+			elem.attributes.getNamedItem(attr).nodeValue : '');
+		// Keep going until we find an element that has colour, or exit SVG
+		if ((colour != '' && colour != 'none') || $(elem).hasClass('hasSVG')) {
+			break; 
+		}
+	} while (elem = elem.parentNode);
+	return getRGB(colour);
+}
+
+/* Parse strings looking for common colour formats.
+   @param  colour  (string) colour description to parse
+   @return  (number[3]) RGB components of this colour */
+function getRGB(colour) {
+	var result;
+	// Check if we're already dealing with an array of colors
+	if (colour && colour.constructor == Array && (colour.length == 3 || colour.length == 4)) {
+		return colour;
+	}
+	// Look for rgb(num,num,num)
+	if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(colour)) {
+		return [parseInt(result[1], 10), parseInt(result[2], 10), parseInt(result[3], 10)];
+	}
+	// Look for rgb(num%,num%,num%)
+	if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(colour)) {
+		return [parseFloat(result[1]) * 2.55, parseFloat(result[2]) * 2.55,
+			parseFloat(result[3]) * 2.55];
+	}
+	// Look for #a0b1c2
+	if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(colour)) {
+		return [parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16)];
+	}
+	// Look for #abc
+	if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(colour)) {
+		return [parseInt(result[1] + result[1], 16), parseInt(result[2] + result[2], 16),
+			parseInt(result[3] + result[3], 16)];
+	}
+	// Otherwise, we're most likely dealing with a named color
+	return colours[$.trim(colour).toLowerCase()] || colours['none'];
+}
+
+// The SVG named colours
+var colours = {
+	'':						[255, 255, 255, 1],
+	none:					[255, 255, 255, 1],
+	aliceblue:				[240, 248, 255],
+	antiquewhite:			[250, 235, 215],
+	aqua:					[ 0, 255, 255],
+	aquamarine:				[127, 255, 212],
+	azure:					[240, 255, 255],
+	beige:					[245, 245, 220],
+	bisque:					[255, 228, 196],
+	black:					[ 0, 0, 0],
+	blanchedalmond:			[255, 235, 205],
+	blue:					[ 0, 0, 255],
+	blueviolet:				[138, 43, 226],
+	brown:					[165, 42, 42],
+	burlywood:				[222, 184, 135],
+	cadetblue:				[ 95, 158, 160],
+	chartreuse:				[127, 255, 0],
+	chocolate:				[210, 105, 30],
+	coral:					[255, 127, 80],
+	cornflowerblue:			[100, 149, 237],
+	cornsilk:				[255, 248, 220],
+	crimson:				[220, 20, 60],
+	cyan:					[ 0, 255, 255],
+	darkblue:				[ 0, 0, 139],
+	darkcyan:				[ 0, 139, 139],
+	darkgoldenrod:			[184, 134, 11],
+	darkgray:				[169, 169, 169],
+	darkgreen:				[ 0, 100, 0],
+	darkgrey:				[169, 169, 169],
+	darkkhaki:				[189, 183, 107],
+	darkmagenta:			[139, 0, 139],
+	darkolivegreen:			[ 85, 107, 47],
+	darkorange:				[255, 140, 0],
+	darkorchid:				[153, 50, 204],
+	darkred:				[139, 0, 0],
+	darksalmon:				[233, 150, 122],
+	darkseagreen:			[143, 188, 143],
+	darkslateblue:			[ 72, 61, 139],
+	darkslategray:			[ 47, 79, 79],
+	darkslategrey:			[ 47, 79, 79],
+	darkturquoise:			[ 0, 206, 209],
+	darkviolet:				[148, 0, 211],
+	deeppink:				[255, 20, 147],
+	deepskyblue:			[ 0, 191, 255],
+	dimgray:				[105, 105, 105],
+	dimgrey:				[105, 105, 105],
+	dodgerblue:				[ 30, 144, 255],
+	firebrick:				[178, 34, 34],
+	floralwhite:			[255, 250, 240],
+	forestgreen:			[ 34, 139, 34],
+	fuchsia:				[255, 0, 255],
+	gainsboro:				[220, 220, 220],
+	ghostwhite:				[248, 248, 255],
+	gold:					[255, 215, 0],
+	goldenrod:				[218, 165, 32],
+	gray:					[128, 128, 128],
+	grey:					[128, 128, 128],
+	green:					[ 0, 128, 0],
+	greenyellow:			[173, 255, 47],
+	honeydew:				[240, 255, 240],
+	hotpink:				[255, 105, 180],
+	indianred:				[205, 92, 92],
+	indigo:					[ 75, 0, 130],
+	ivory:					[255, 255, 240],
+	khaki:					[240, 230, 140],
+	lavender:				[230, 230, 250],
+	lavenderblush:			[255, 240, 245],
+	lawngreen:				[124, 252, 0],
+	lemonchiffon:			[255, 250, 205],
+	lightblue:				[173, 216, 230],
+	lightcoral:				[240, 128, 128],
+	lightcyan:				[224, 255, 255],
+	lightgoldenrodyellow:	[250, 250, 210],
+	lightgray:				[211, 211, 211],
+	lightgreen:				[144, 238, 144],
+	lightgrey:				[211, 211, 211],
+	lightpink:				[255, 182, 193],
+	lightsalmon:			[255, 160, 122],
+	lightseagreen:			[ 32, 178, 170],
+	lightskyblue:			[135, 206, 250],
+	lightslategray:			[119, 136, 153],
+	lightslategrey:			[119, 136, 153],
+	lightsteelblue:			[176, 196, 222],
+	lightyellow:			[255, 255, 224],
+	lime:					[ 0, 255, 0],
+	limegreen:				[ 50, 205, 50],
+	linen:					[250, 240, 230],
+	magenta:				[255, 0, 255],
+	maroon:					[128, 0, 0],
+	mediumaquamarine:		[102, 205, 170],
+	mediumblue:				[ 0, 0, 205],
+	mediumorchid:			[186, 85, 211],
+	mediumpurple:			[147, 112, 219],
+	mediumseagreen:			[ 60, 179, 113],
+	mediumslateblue:		[123, 104, 238],
+	mediumspringgreen:		[ 0, 250, 154],
+	mediumturquoise:		[ 72, 209, 204],
+	mediumvioletred:		[199, 21, 133],
+	midnightblue:			[ 25, 25, 112],
+	mintcream:				[245, 255, 250],
+	mistyrose:				[255, 228, 225],
+	moccasin:				[255, 228, 181],
+	navajowhite:			[255, 222, 173],
+	navy:					[ 0, 0, 128],
+	oldlace:				[253, 245, 230],
+	olive:					[128, 128, 0],
+	olivedrab:				[107, 142, 35],
+	orange:					[255, 165, 0],
+	orangered:				[255, 69, 0],
+	orchid:					[218, 112, 214],
+	palegoldenrod:			[238, 232, 170],
+	palegreen:				[152, 251, 152],
+	paleturquoise:			[175, 238, 238],
+	palevioletred:			[219, 112, 147],
+	papayawhip:				[255, 239, 213],
+	peachpuff:				[255, 218, 185],
+	peru:					[205, 133, 63],
+	pink:					[255, 192, 203],
+	plum:					[221, 160, 221],
+	powderblue:				[176, 224, 230],
+	purple:					[128, 0, 128],
+	red:					[255, 0, 0],
+	rosybrown:				[188, 143, 143],
+	royalblue:				[ 65, 105, 225],
+	saddlebrown:			[139, 69, 19],
+	salmon:					[250, 128, 114],
+	sandybrown:				[244, 164, 96],
+	seagreen:				[ 46, 139, 87],
+	seashell:				[255, 245, 238],
+	sienna:					[160, 82, 45],
+	silver:					[192, 192, 192],
+	skyblue:				[135, 206, 235],
+	slateblue:				[106, 90, 205],
+	slategray:				[112, 128, 144],
+	slategrey:				[112, 128, 144],
+	snow:					[255, 250, 250],
+	springgreen:			[ 0, 255, 127],
+	steelblue:				[ 70, 130, 180],
+	tan:					[210, 180, 140],
+	teal:					[ 0, 128, 128],
+	thistle:				[216, 191, 216],
+	tomato:					[255, 99, 71],
+	turquoise:				[ 64, 224, 208],
+	violet:					[238, 130, 238],
+	wheat:					[245, 222, 179],
+	white:					[255, 255, 255],
+	whitesmoke:				[245, 245, 245],
+	yellow:					[255, 255, 0],
+	yellowgreen:			[154, 205, 50]
+};
+
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svgdom.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,332 @@
+/* http://keith-wood.name/svg.html
+   SVG/jQuery DOM compatibility for jQuery v1.4.3.
+   Written by Keith Wood (kbwood{at}iinet.com.au) April 2009.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and 
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. 
+   Please attribute the author if you use it. */
+
+(function($) { // Hide scope, no $ conflict
+
+/* Support adding class names to SVG nodes. */
+$.fn.addClass = function(origAddClass) {
+	return function(classNames) {
+		classNames = classNames || '';
+		return this.each(function() {
+			if (isSVGElem(this)) {
+				var node = this;
+				$.each(classNames.split(/\s+/), function(i, className) {
+					var classes = (node.className ? node.className.baseVal : node.getAttribute('class'));
+					if ($.inArray(className, classes.split(/\s+/)) == -1) {
+						classes += (classes ? ' ' : '') + className;
+						(node.className ? node.className.baseVal = classes :
+							node.setAttribute('class',  classes));
+					}
+				});
+			}
+			else {
+				origAddClass.apply($(this), [classNames]);
+			}
+		});
+	};
+}($.fn.addClass);
+
+/* Support removing class names from SVG nodes. */
+$.fn.removeClass = function(origRemoveClass) {
+	return function(classNames) {
+		classNames = classNames || '';
+		return this.each(function() {
+			if (isSVGElem(this)) {
+				var node = this;
+				$.each(classNames.split(/\s+/), function(i, className) {
+					var classes = (node.className ? node.className.baseVal : node.getAttribute('class'));
+					classes = $.grep(classes.split(/\s+/), function(n, i) { return n != className; }).
+						join(' ');
+					(node.className ? node.className.baseVal = classes :
+						node.setAttribute('class', classes));
+				});
+			}
+			else {
+				origRemoveClass.apply($(this), [classNames]);
+			}
+		});
+	};
+}($.fn.removeClass);
+
+/* Support toggling class names on SVG nodes. */
+$.fn.toggleClass = function(origToggleClass) {
+	return function(className, state) {
+		return this.each(function() {
+			if (isSVGElem(this)) {
+				if (typeof state !== 'boolean') {
+					state = !$(this).hasClass(className);
+				}
+				$(this)[(state ? 'add' : 'remove') + 'Class'](className);
+			}
+			else {
+				origToggleClass.apply($(this), [className, state]);
+			}
+		});
+	};
+}($.fn.toggleClass);
+
+/* Support checking class names on SVG nodes. */
+$.fn.hasClass = function(origHasClass) {
+	return function(className) {
+		className = className || '';
+		var found = false;
+		this.each(function() {
+			if (isSVGElem(this)) {
+				var classes = (this.className ? this.className.baseVal :
+					this.getAttribute('class')).split(/\s+/);
+				found = ($.inArray(className, classes) > -1);
+			}
+			else {
+				found = (origHasClass.apply($(this), [className]));
+			}
+			return !found;
+		});
+		return found;
+	};
+}($.fn.hasClass);
+
+/* Support attributes on SVG nodes. */
+$.fn.attr = function(origAttr) {
+	return function(name, value, type) {
+		if (typeof name === 'string' && value === undefined) {
+			var val = origAttr.apply(this, [name, value, type]);
+			if (val && val.baseVal && val.baseVal.numberOfItems != null) { // Transform
+				value = '';
+				val = val.baseVal;
+				for (var i = 0; i < val.numberOfItems; i++) {
+					var item = val.getItem(i);
+					switch (item.type) {
+						case 1: value += ' matrix(' + item.matrix.a + ',' + item.matrix.b + ',' +
+									item.matrix.c + ',' + item.matrix.d + ',' +
+									item.matrix.e + ',' + item.matrix.f + ')';
+								break;
+						case 2: value += ' translate(' + item.matrix.e + ',' + item.matrix.f + ')'; break;
+						case 3: value += ' scale(' + item.matrix.a + ',' + item.matrix.d + ')'; break;
+						case 4: value += ' rotate(' + item.angle + ')'; break; // Doesn't handle new origin
+						case 5: value += ' skewX(' + item.angle + ')'; break;
+						case 6: value += ' skewY(' + item.angle + ')'; break;
+					}
+				}
+				val = value.substring(1);
+			}
+			return (val && val.baseVal ? val.baseVal.valueAsString : val);
+		}
+		var options = name;
+		if (typeof name === 'string') {
+			options = {};
+			options[name] = value;
+		}
+		return this.each(function() {
+			if (isSVGElem(this)) {
+				for (var n in options) {
+					var val = ($.isFunction(options[n]) ? options[n]() : options[n]);
+					(type ? this.style[n] = val : this.setAttribute(n, val));
+				}
+			}
+			else {
+				origAttr.apply($(this), [name, value, type]);
+			}
+		});
+	};
+}($.fn.attr);
+
+/* Support removing attributes on SVG nodes. */
+$.fn.removeAttr = function(origRemoveAttr) {
+	return function(name) {
+		return this.each(function() {
+			if (isSVGElem(this)) {
+				(this[name] && this[name].baseVal ? this[name].baseVal.value = '' :
+					this.setAttribute(name, ''));
+			}
+			else {
+				origRemoveAttr.apply($(this), [name]);
+			}
+		});
+	};
+}($.fn.removeAttr);
+
+/* Determine if any nodes are SVG nodes. */
+function anySVG(checkSet) {
+	for (var i = 0; i < checkSet.length; i++) {
+		if (checkSet[i].nodeType == 1 && checkSet[i].namespaceURI == $.svg.svgNS) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/* Update Sizzle selectors. */
+
+$.expr.relative['+'] = function(origRelativeNext) {
+	return function(checkSet, part, isXML) {
+		origRelativeNext(checkSet, part, isXML || anySVG(checkSet));
+	};
+}($.expr.relative['+']);
+
+$.expr.relative['>'] = function(origRelativeChild) {
+	return function(checkSet, part, isXML) {
+		origRelativeChild(checkSet, part, isXML || anySVG(checkSet));
+	};
+}($.expr.relative['>']);
+
+$.expr.relative[''] = function(origRelativeDescendant) {
+	return function(checkSet, part, isXML) {
+		origRelativeDescendant(checkSet, part, isXML || anySVG(checkSet));
+	};
+}($.expr.relative['']);
+
+$.expr.relative['~'] = function(origRelativeSiblings) {
+	return function(checkSet, part, isXML) {
+		origRelativeSiblings(checkSet, part, isXML || anySVG(checkSet));
+	};
+}($.expr.relative['~']);
+
+$.expr.find.ID = function(origFindId) {
+	return function(match, context, isXML) {
+		return (isSVGElem(context) ?
+			[context.ownerDocument.getElementById(match[1])] :
+			origFindId(match, context, isXML));
+	};
+}($.expr.find.ID);
+
+var div = document.createElement('div');
+div.appendChild(document.createComment(''));
+if (div.getElementsByTagName('*').length > 0) { // Make sure no comments are found
+	$.expr.find.TAG = function(match, context) {
+		var results = context.getElementsByTagName(match[1]);
+		if (match[1] === '*') { // Filter out possible comments
+			var tmp = [];
+			for (var i = 0; results[i] || results.item(i); i++) {
+				if ((results[i] || results.item(i)).nodeType === 1) {
+					tmp.push(results[i] || results.item(i));
+				}
+			}
+			results = tmp;
+		}
+		return results;
+	};
+}
+
+$.expr.preFilter.CLASS = function(match, curLoop, inplace, result, not, isXML) {
+	match = ' ' + match[1].replace(/\\/g, '') + ' ';
+	if (isXML) {
+		return match;
+	}
+	for (var i = 0, elem = {}; elem != null; i++) {
+		elem = curLoop[i];
+		if (!elem) {
+			try {
+				elem = curLoop.item(i);
+			}
+			catch (e) {
+				// Ignore
+			}
+		}
+		if (elem) {
+			var className = (!isSVGElem(elem) ? elem.className :
+				(elem.className ? elem.className.baseVal : '') || elem.getAttribute('class'));
+			if (not ^ (className && (' ' + className + ' ').indexOf(match) > -1)) {
+				if (!inplace)
+					result.push(elem);
+			}
+			else if (inplace) {
+				curLoop[i] = false;
+			}
+		}
+	}
+	return false;
+};
+
+$.expr.filter.CLASS = function(elem, match) {
+	var className = (!isSVGElem(elem) ? elem.className :
+		(elem.className ? elem.className.baseVal : elem.getAttribute('class')));
+	return (' ' + className + ' ').indexOf(match) > -1;
+};
+
+$.expr.filter.ATTR = function(origFilterAttr) {
+	return function(elem, match) {
+		var handler = null;
+		if (isSVGElem(elem)) {
+			handler = match[1];
+			$.expr.attrHandle[handler] = function(elem){
+				var attr = elem.getAttribute(handler);
+				return attr && attr.baseVal || attr;
+			};
+		}
+		var filter = origFilterAttr(elem, match);
+		if (handler) {
+			$.expr.attrHandle[handler] = null;
+		}
+		return filter;
+	};
+}($.expr.filter.ATTR);
+
+/*
+	Change Sizzle initialisation (line 1425) in jQuery v1.3.2 base code...
+	
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+		} else if ( context.nodeType === 1 ) {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+					results.push( set[i] || set.item(i) ); // Here
+				}
+			}
+		} else {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] || set.item(i) ); // Here
+				}
+			}
+		}
+	}
+	
+	Change fallback makeArray (line 2076) implementation in jQuery Sizzle...
+	
+			if ( typeof array.length === "number" ) {
+				for ( var i = 0, l = array.length; i < l; i++ ) {
+					ret.push( array[i] || array.item(i) ); // Here
+				}
+			}
+*/
+
+/*
+	Events management requires changes to jQuery v1.3.2 base code...
+
+	In $.event.add (line 2437)...
+	
+				if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem, data, namespaces) === false ) {
+					// Bind the global event handler to the element
+					try { // Here
+						elem.addEventListener(type, handle, false);
+					}
+					catch(e) {
+						if (elem.attachEvent)
+							elem.attachEvent("on" + type, handle);
+					}
+				}
+
+	In $.event.remove (line 2521)...
+	
+							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem, namespaces) === false ) {
+								try { // Here
+									elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
+								}
+								catch (e) {
+									if (elem.detachEvent)
+										elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
+								}
+							}
+*/
+
+/* Does this node belong to SVG? */
+function isSVGElem(node) {
+	return (node.nodeType == 1 && node.namespaceURI == $.svg.svgNS);
+}
+
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svgfilter.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,402 @@
+/* http://keith-wood.name/svg.html
+   SVG filters for jQuery v1.4.3.
+   Written by Keith Wood (kbwood{at}iinet.com.au) August 2007.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses.
+   Please attribute the author if you use it. */
+
+(function($) { // Hide scope, no $ conflict
+
+$.svg.addExtension('filters', SVGFilter);
+
+$.extend($.svg._wrapperClass.prototype, {
+
+	/* Add a filter definition.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  id        (string) the ID for this filter
+	   @param  x         (number) the x-coordinate for the left edge of the filter
+	   @param  y         (number) the y-coordinate for the top edge of the filter
+	   @param  width     (number) the width of the filter
+	   @param  height    (number) the height of the filter
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	filter: function(parent, id, x, y, width, height, settings) {
+		var args = this._args(arguments, ['id', 'x', 'y', 'width', 'height']);
+		return this._makeNode(args.parent, 'filter', $.extend(
+			{id: args.id, x: args.x, y: args.y, width: args.width, height: args.height},
+			args.settings || {}));
+	}
+});
+
+/* Extension point for SVG filters.
+   Access through svg.filters. */
+function SVGFilter(wrapper) {
+	this._wrapper = wrapper; // The attached SVG wrapper object
+}
+
+$.extend(SVGFilter.prototype, {
+
+	/* Add a distant light filter.
+	   @param  parent     (element or jQuery) the parent node for the new filter (optional)
+	   @param  result     (string) the ID of this filter
+	   @param  azimuth    (number) the angle (degrees) in the XY plane for the light source
+	   @param  elevation  (number) the angle (degrees) in the YZ plane for the light source
+	   @param  settings   (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	distantLight: function(parent, result, azimuth, elevation, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'azimuth', 'elevation']);
+		return this._wrapper._makeNode(args.parent, 'feDistantLight', $.extend(
+			{result: args.result, azimuth: args.azimuth, elevation: args.elevation},
+			args.settings || {}));
+	},
+
+	/* Add a point light filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  x         (number) the x-coordinate for the light source
+	   @param  y         (number) the y-coordinate for the light source
+	   @param  z         (number) the z-coordinate for the light source
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	pointLight: function(parent, result, x, y, z, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'x', 'y', 'z']);
+		return this._wrapper._makeNode(args.parent, 'fePointLight', $.extend(
+			{result: args.result, x: args.x, y: args.y, z: args.z}, args.settings || {}));
+	},
+
+	/* Add a spot light filter.
+	   Specify all of toX, toY, toZ or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  x         (number) the x-coordinate for the light source
+	   @param  y         (number) the y-coordinate for the light source
+	   @param  z         (number) the z-coordinate for the light source
+	   @param  toX       (number) the x-coordinate for where the light is pointing (optional)
+	   @param  toY       (number) the y-coordinate for where the light is pointing (optional)
+	   @param  toZ       (number) the z-coordinate for where the light is pointing (optional)
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	spotLight: function(parent, result, x, y, z, toX, toY, toZ, settings) {
+		var args = this._wrapper._args(arguments,
+			['result', 'x', 'y', 'z', 'toX', 'toY', 'toZ'], ['toX']);
+		var sets = $.extend({result: args.result, x: args.x, y: args.y, z: args.z},
+			(args.toX != null ? {pointsAtX: args.toX, pointsAtY: args.toY,
+			pointsAtZ: args.toZ} : {}));
+		return this._wrapper._makeNode(args.parent, 'feSpotLight',
+			$.extend(sets, args.settings || {}));
+	},
+
+	/* Add a blend filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  mode      (string) normal | multiply | screen | darken | lighten
+	   @param  in1       (string) the first image to blend
+	   @param  in2       (string) the second image to blend
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	blend: function(parent, result, mode, in1, in2, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'mode', 'in1', 'in2']);
+		return this._wrapper._makeNode(args.parent, 'feBlend', $.extend(
+			{result: args.result, mode: args.mode, in_: args.in1, in2: args.in2},
+			args.settings || {}));
+	},
+
+	/* Add a colour matrix filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  in1       (string) the source to colour
+	   @param  type      (string) matrix | saturate | hueRotate | luminanceToAlpha
+	   @param  values    (number[][]) for 'matrix' the matrix (5x4) values to apply
+	                     (number) for 'saturate' 0.0 to 1.0
+	                     (number) for 'hueRotate' degrees
+	                     (void) for 'luminanceToAlpha'
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	colorMatrix: function(parent, result, in1, type, values, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'in1', 'type', 'values']);
+		if (isArray(args.values)) {
+			var vs = '';
+			for (var i = 0; i < args.values.length; i++) {
+				vs += (i == 0 ? '' : ' ') + args.values[i].join(' ');
+			}
+			args.values = vs;
+		}
+		else if (typeof args.values == 'object') {
+			args.settings = args.values;
+			args.values = null;
+		}
+		var sets = $.extend({result: args.result, in_: args.in1, type: args.type},
+			(args.values != null ? {values: args.values} : {}));
+		return this._wrapper._makeNode(args.parent, 'feColorMatrix',
+			$.extend(sets, args.settings || {}));
+	},
+
+	/* Add a component transfer filter.
+	   @param  parent     (element or jQuery) the parent node for the new filter (optional)
+	   @param  result     (string) the ID of this filter
+	   @param  functions  (object[]) one for each of RGB and A (alpha, optional)
+	                      for each entry:
+	                      [0] is (string) identity | table | discrete | linear | gamma
+	                      [1] is (number[]) for 'table' or 'discrete' the list of
+	                      interpolation or step values OR
+	                      (number) for 'linear' the slope, for 'gamma' the amplitude,
+	                      [2] is (number) for 'linear' the intercept, for 'gamma' the exponent,
+	                      [3] is (number) for 'gamma' the offset
+	   @param  settings   (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	componentTransfer: function(parent, result, functions, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'functions']);
+		var node = this._wrapper._makeNode(args.parent, 'feComponentTransfer',
+			$.extend({result: args.result}, args.settings || {}));
+		var rgba = ['R', 'G', 'B', 'A'];
+		for (var i = 0; i < Math.min(4, args.functions.length); i++) {
+			var props = args.functions[i];
+			var sets = $.extend({type: props[0]},
+				(props[0] == 'table' || props[0] == 'discrete' ? {tableValues: props[1].join(' ')} :
+				(props[0] == 'linear' ? {slope: props[1], intercept: props[2]} :
+				(props[0] == 'gamma' ? {amplitude: props[1],
+				exponent: props[2], offset: props[3]} : {}))));
+			this._wrapper._makeNode(node, 'feFunc' + rgba[i], sets);
+		}
+		return node;
+	},
+
+	/* Add a composite filter.
+	   Specify all of k1, k2, k3, k4 or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  operator  (string) over | in | out | atop | xor | arithmetic
+	   @param  in1       (string) the first filter to compose
+	   @param  in2       (string) the second filter to compose
+	   @param  k1        (number) for 'arithmetic' (optional)
+	   @param  k2        (number) for 'arithmetic' (optional)
+	   @param  k3        (number) for 'arithmetic' (optional)
+	   @param  k4        (number) for 'arithmetic' (optional)
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	composite: function(parent, result, operator, in1, in2, k1, k2, k3, k4, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'operator',
+			'in1', 'in2', 'k1', 'k2', 'k3', 'k4'], ['k1']);
+		var sets = $.extend({result: args.result, operator: args.operator,
+			'in': args.in1, in2: args.in2},
+			(args.k1 != null ? {k1: args.k1, k2: args.k2, k3: args.k3, k4: args.k4} : {}));
+		return this._wrapper._makeNode(args.parent, 'feComposite',
+			$.extend(sets, args.settings || {}));
+	},
+
+	/* Add a convolve matrix filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  order     (int or 'int int') the size(s) of the matrix
+	   @param  matrix    (number[][]) the kernel matrix for the convolution
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	convolveMatrix: function(parent, result, order, matrix, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'order', 'matrix']);
+		var mx = '';
+		for (var i = 0; i < args.matrix.length; i++) {
+			mx += (i == 0 ? '' : ' ') + args.matrix[i].join(' ');
+		}
+		args.matrix = mx;
+		return this._wrapper._makeNode(args.parent, 'feConvolveMatrix', $.extend(
+			{result: args.result, order: args.order, kernelMatrix: args.matrix},
+			args.settings || {}));
+	},
+
+	/* Add a diffuse lighting filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  colour    (string) the lighting colour (optional)
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	diffuseLighting: function(parent, result, colour, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'colour'], ['colour']);
+		return this._wrapper._makeNode(args.parent, 'feDiffuseLighting',
+			$.extend($.extend({result: args.result},
+			(args.colour ? {lightingColor: args.colour} : {})), args.settings || {}));
+	},
+
+	/* Add a displacement map filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  in1       (string) the source image
+	   @param  in2       (string) the displacement image
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	displacementMap: function(parent, result, in1, in2, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'in1', 'in2']);
+		return this._wrapper._makeNode(args.parent, 'feDisplacementMap',
+			$.extend({result: args.result, in_: args.in1, in2: args.in2},
+			args.settings || {}));
+	},
+
+	/* Add a flood filter.
+	   Specify all of x, y, width, height or none of them.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  x         (number) the left coordinate of the rectangle (optional)
+	   @param  y         (number) the top coordinate of the rectangle (optional)
+	   @param  width     (number) the width of the rectangle (optional)
+	   @param  height    (number) the height of the rectangle (optional)
+	   @param  colour    (string) the colour to fill with
+	   @param  opacity   (number) the opacity 0.0-1.0
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	flood: function(parent, result, x, y, width, height, colour, opacity, settings) {
+		var args = this._wrapper._args(arguments,
+			['result', 'x', 'y', 'width', 'height', 'colour', 'opacity']);
+		if (arguments.length < 6) {
+			args.colour = args.x;
+			args.opacity = args.y;
+			args.settings = args.width;
+			args.x = null;
+		}
+		var sets = $.extend({result: args.result, floodColor: args.colour,
+			floodOpacity: args.opacity}, (args.x != null ?
+			{x: args.x, y: args.y, width: args.width, height: args.height} : {}));
+		return this._wrapper._makeNode(args.parent, 'feFlood',
+			$.extend(sets, args.settings || {}));
+	},
+
+	/* Add a Gaussian blur filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  in1       (string) the source filter
+	   @param  stdDevX   (number) the standard deviation along the x-axis
+	   @param  stdDevY   (number) the standard deviation along the y-axis (optional)
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	gaussianBlur: function(parent, result, in1, stdDevX, stdDevY, settings) {
+		var args = this._wrapper._args(arguments,
+			['result', 'in1', 'stdDevX', 'stdDevY'], ['stdDevY']);
+		return this._wrapper._makeNode(args.parent, 'feGaussianBlur', $.extend(
+			{result: args.result, in_: args.in1, stdDeviation: args.stdDevX +
+			(args.stdDevY ? ' ' + args.stdDevY : '')}, args.settings || {}));
+	},
+
+	/* Add an image filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  href      (string) the URL of the image
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	image: function(parent, result, href, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'href']);
+		var node = this._wrapper._makeNode(args.parent, 'feImage', $.extend(
+			{result: args.result}, args.settings || {}));
+		node.setAttributeNS($.svg.xlinkNS, 'href', args.href);
+		return node;
+	},
+
+	/* Add a merge filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  refs      (string[]) the IDs of the filters to merge
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	merge: function(parent, result, refs, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'refs']);
+		var node = this._wrapper._makeNode(args.parent, 'feMerge', $.extend(
+			{result: args.result}, args.settings || {}));
+		for (var i = 0; i < args.refs.length; i++) {
+			this._wrapper._makeNode(node, 'feMergeNode', {in_: args.refs[i]});
+		}
+		return node;
+	},
+
+	/* Add a morphology filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  in1       (string) the source filter
+	   @param  operator  (string) erode | dilate
+	   @param  radiusX   (number) the size of the operation in the x-axis
+	   @param  radiusY   (number) the size of the operation in the y-axis (optional)
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	morphology: function(parent, result, in1, operator, radiusX, radiusY, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'in1',
+			'operator', 'radiusX', 'radiusY'], ['radiusY']);
+		return this._wrapper._makeNode(args.parent, 'feMorphology', $.extend(
+			{result: args.result, in_: args.in1, operator: args.operator,
+			radius: args.radiusX + (args.radiusY ? ' ' + args.radiusY : '')},
+			args.settings || {}));
+	},
+
+	/* Add an offset filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  in1       (string) the source filter
+	   @param  dX        (number) the offset in the x-axis
+	   @param  dY        (number) the offset in the y-axis
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	offset: function(parent, result, in1, dx, dy, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'in1', 'dx', 'dy']);
+		return this._wrapper._makeNode(args.parent, 'feOffset', $.extend(
+			{result: args.result, in_: args.in1, dx: args.dx, dy: args.dy},
+			args.settings || {}));
+	},
+
+	/* Add a specular lighting filter.
+	   Numeric params are only optional if following numeric params are also omitted.
+	   @param  parent            (element or jQuery) the parent node for the new filter (optional)
+	   @param  result            (string) the ID of this filter
+	   @param  in1               (string) the source filter
+	   @param  surfaceScale      (number) the surface height when Ain = 1 (optional)
+	   @param  specularConstant  (number) the ks in Phong lighting model (optional)
+	   @param  specularExponent  (number) the shininess 1.0-128.0 (optional)
+	   @param  settings          (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	specularLighting: function(parent, result, in1, surfaceScale,
+			specularConstant, specularExponent, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'in1',
+			'surfaceScale', 'specularConstant', 'specularExponent'],
+			['surfaceScale', 'specularConstant', 'specularExponent']);
+		return this._wrapper._makeNode(args.parent, 'feSpecularLighting', $.extend(
+			{result: args.result, in_: args.in1, surfaceScale: args.surfaceScale,
+			specularConstant: args.specularConstant, specularExponent: args.specularExponent},
+			args.settings || {}));
+	},
+
+	/* Add a tile filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  in1       (string) the source filter
+	   @param  x         (number) the left coordinate of the rectangle
+	   @param  y         (number) the top coordinate of the rectangle
+	   @param  width     (number) the width of the rectangle
+	   @param  height    (number) the height of the rectangle
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	tile: function(parent, result, in1, x, y, width, height, settings) {
+		var args = this._wrapper._args(arguments,
+			['result', 'in1', 'x', 'y', 'width', 'height']);
+		return this._wrapper._makeNode(args.parent, 'feTile', $.extend(
+			{result: args.result, in_: args.in1, x: args.x, y: args.y,
+			width: args.width, height: args.height}, args.settings || {}));
+	},
+
+	/* Add a turbulence filter.
+	   @param  parent    (element or jQuery) the parent node for the new filter (optional)
+	   @param  result    (string) the ID of this filter
+	   @param  type      (string) fractalNoise | turbulence
+	   @param  baseFreq  (number or 'number number') the base frequency,
+	                     optionally separated into x- and y-components
+	   @param  octaves   (number) the amount of turbulence (optional)
+	   @param  settings  (object) additional settings for the filter (optional)
+	   @return  (element) the new filter node */
+	turbulence: function(parent, result, type, baseFreq, octaves, settings) {
+		var args = this._wrapper._args(arguments, ['result', 'type',
+			'baseFreq', 'octaves'], ['octaves']);
+		return this._wrapper._makeNode(args.parent, 'feTurbulence', $.extend(
+			{result: args.result, type: args.type, baseFrequency: args.baseFreq,
+			numOctaves: args.octaves}, args.settings || {}));
+	}
+});
+
+/* Determine whether an object is an array. */
+function isArray(a) {
+	return (a && a.constructor == Array);
+}
+
+})(jQuery)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svggraph.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1482 @@
+/* http://keith-wood.name/svg.html
+   SVG graphing extension for jQuery v1.4.3.
+   Written by Keith Wood (kbwood{at}iinet.com.au) August 2007.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses.
+   Please attribute the author if you use it. */
+
+(function($) { // Hide scope, no $ conflict
+
+$.svg.addExtension('graph', SVGGraph);
+
+// Singleton primary SVG graphing interface
+$.svg.graphing = new SVGGraphing();
+
+function SVGGraphing() {
+	this.regional = [];
+	this.regional[''] = {percentageText: 'Percentage'};
+	this.region = this.regional[''];
+}
+
+$.extend(SVGGraphing.prototype, {
+	_chartTypes: [],
+
+	/* Add a new chart rendering type to the package.
+	   The rendering object must implement the following functions:
+	   getTitle(), getDescription(), getOptions(), drawChart(graph).
+	   @param  id         (string) the ID of this graph renderer
+	   @param  chartType  (object) the object implementing this chart type */
+	addChartType: function(id, chartType) {
+		this._chartTypes[id] = chartType;
+	},
+
+	/* Retrieve the list of chart types.
+	   @return  (object[string]) the array of chart types indexed by ID */
+	chartTypes: function() {
+		return this._chartTypes;
+	}
+});
+
+/* Extension point for SVG graphing.
+   Access through svg.graph. */
+function SVGGraph(wrapper) {
+	this._wrapper = wrapper; // The attached SVG wrapper object
+	this._drawNow = false; // True for immediate update, false to wait for redraw call
+	for (var id in $.svg.graphing._chartTypes) {
+		this._chartType = $.svg.graphing._chartTypes[id]; // Use first graph renderer
+		break;
+	}
+	this._chartOptions = {}; // Extra options for the graph type
+	// The graph title and settings
+	this._title = {value: '', offset: 25, settings: {textAnchor: 'middle'}};
+	this._area = [0.1, 0.1, 0.8, 0.9]; // The chart area: left, top, right, bottom,
+		// > 1 in pixels, <= 1 as proportion
+	this._chartFormat = {fill: 'none', stroke: 'black'}; // The formatting for the chart area
+	this._gridlines = []; // The formatting of the x- and y-gridlines
+	this._series = []; // The series to be plotted, each is an object
+	this._onstatus = null; // The callback function for status updates
+	this._chartCont = this._wrapper.svg(0, 0, 0, 0, {class_: 'svg-graph'}); // The main container for the graph
+	
+	this.xAxis = new SVGGraphAxis(this); // The main x-axis
+	this.xAxis.title('', 40);
+	this.yAxis = new SVGGraphAxis(this); // The main y-axis
+	this.yAxis.title('', 40);
+	this.x2Axis = null; // The secondary x-axis
+	this.y2Axis = null; // The secondary y-axis
+	this.legend = new SVGGraphLegend(this); // The chart legend
+	this._drawNow = true;
+}
+
+$.extend(SVGGraph.prototype, {
+
+	/* Useful indexes. */
+	X: 0,
+	Y: 1,
+	W: 2,
+	H: 3,
+	L: 0,
+	T: 1,
+	R: 2,
+	B: 3,
+
+	/* Standard percentage axis. */
+	_percentageAxis: new SVGGraphAxis(this, $.svg.graphing.region.percentageText, 0, 100, 10, 0),
+
+	/* Set or retrieve the container for the graph.
+	   @param  cont  (SVG element) the container for the graph
+	   @return  (SVGGraph) this graph object or
+	            (SVG element) the current container (if no parameters) */
+	container: function(cont) {
+		if (arguments.length == 0) {
+			return this._chartCont;
+		}
+		this._chartCont = cont;
+		return this;
+	},
+
+	/* Set or retrieve the type of chart to be rendered.
+	   See $.svg.graphing.getChartTypes() for the list of available types.
+	   @param  id       (string) the ID of the chart type
+	   @param  options  (object) additional settings for this chart type (optional)
+	   @return  (SVGGraph) this graph object or
+	            (string) the chart type (if no parameters)
+	   @deprecated  use type() */
+	chartType: function(id, options) {
+		return (arguments.length == 0 ? this.type() : this.type(id, options));
+	},
+
+	/* Set or retrieve the type of chart to be rendered.
+	   See $.svg.graphing.getChartTypes() for the list of available types.
+	   @param  id       (string) the ID of the chart type
+	   @param  options  (object) additional settings for this chart type (optional)
+	   @return  (SVGGraph) this graph object or
+	            (string) the chart type (if no parameters) */
+	type: function(id, options) {
+		if (arguments.length == 0) {
+			return this._chartType;
+		}
+		var chartType = $.svg.graphing._chartTypes[id];
+		if (chartType) {
+			this._chartType = chartType;
+			this._chartOptions = $.extend({}, options || {});
+		}
+		this._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve additional options for the particular chart type.
+	   @param  options  (object) the extra options
+	   @return  (SVGGraph) this graph object or
+	            (object) the chart options (if no parameters)
+	   @deprecated  use options() */
+	chartOptions: function(options) {
+		return(arguments.length == 0 ? this.options() : this.options(options));
+	},
+
+	/* Set or retrieve additional options for the particular chart type.
+	   @param  options  (object) the extra options
+	   @return  (SVGGraph) this graph object or
+	            (object) the chart options (if no parameters) */
+	options: function(options) {
+		if (arguments.length == 0) {
+			return this._chartOptions;
+		}
+		this._chartOptions = $.extend({}, options);
+		this._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the background of the graph chart.
+	   @param  fill      (string) how to fill the chart background
+	   @param  stroke    (string) the colour of the outline (optional)
+	   @param  settings  (object) additional formatting for the chart background (optional)
+	   @return  (SVGGraph) this graph object or
+	            (object) the chart format (if no parameters)
+	   @deprecated  use format() */
+	chartFormat: function(fill, stroke, settings) {
+		return (arguments.length == 0 ? this.format() : this.format(fill, stroke, settings));
+	},
+
+	/* Set or retrieve the background of the graph chart.
+	   @param  fill      (string) how to fill the chart background
+	   @param  stroke    (string) the colour of the outline (optional)
+	   @param  settings  (object) additional formatting for the chart background (optional)
+	   @return  (SVGGraph) this graph object or
+	            (object) the chart format (if no parameters) */
+	format: function(fill, stroke, settings) {
+		if (arguments.length == 0) {
+			return this._chartFormat;
+		}
+		if (typeof stroke == 'object') {
+			settings = stroke;
+			stroke = null;
+		}
+		this._chartFormat = $.extend({fill: fill},
+			(stroke ? {stroke: stroke} : {}), settings || {});
+		this._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the main chart area.
+	   @param  left    (number) > 1 is pixels, <= 1 is proportion of width or
+	                   (number[4]) for left, top, right, bottom
+	   @param  top     (number) > 1 is pixels, <= 1 is proportion of height
+	   @param  right   (number) > 1 is pixels, <= 1 is proportion of width
+	   @param  bottom  (number) > 1 is pixels, <= 1 is proportion of height
+	   @return  (SVGGraph) this graph object or
+	            (number[4]) the chart area: left, top, right, bottom (if no parameters)
+	   @deprecated use area() */
+	chartArea: function(left, top, right, bottom) {
+		return (arguments.length == 0 ? this.area() : this.area(left, top, right, bottom));
+	},
+
+	/* Set or retrieve the main chart area.
+	   @param  left    (number) > 1 is pixels, <= 1 is proportion of width or
+	                   (number[4]) for left, top, right, bottom
+	   @param  top     (number) > 1 is pixels, <= 1 is proportion of height
+	   @param  right   (number) > 1 is pixels, <= 1 is proportion of width
+	   @param  bottom  (number) > 1 is pixels, <= 1 is proportion of height
+	   @return  (SVGGraph) this graph object or
+	            (number[4]) the chart area: left, top, right, bottom (if no parameters) */
+	area: function(left, top, right, bottom) {
+		if (arguments.length == 0) {
+			return this._area;
+		}
+		this._area = (isArray(left) ? left : [left, top, right, bottom]);
+		this._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the gridlines formatting for the graph chart.
+	   @param  xSettings  (string) the colour of the gridlines along the x-axis, or
+	                      (object) formatting for the gridlines along the x-axis, or
+	                      null for none
+	   @param  ySettings  (string) the colour of the gridlines along the y-axis, or
+	                      (object) formatting for the gridlines along the y-axis, or
+	                      null for none
+	   @return  (SVGGraph) this graph object or
+	            (object[2]) the gridlines formatting (if no parameters) */
+	gridlines: function(xSettings, ySettings) {
+		if (arguments.length == 0) {
+			return this._gridlines;
+		}
+		this._gridlines = [(typeof xSettings == 'string' ? {stroke: xSettings} : xSettings),
+			(typeof ySettings == 'string' ? {stroke: ySettings} : ySettings)];
+		if (this._gridlines[0] == null && this._gridlines[1] == null) {
+			this._gridlines = [];
+		}
+		this._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the title of the graph and its formatting.
+	   @param  value     (string) the title
+	   @param  offset    (number) the vertical positioning of the title
+                          > 1 is pixels, <= 1 is proportion of width (optional)
+	   @param  colour    (string) the colour of the title (optional)
+	   @param  settings  (object) formatting for the title (optional)
+	   @return  (SVGGraph) this graph object or
+	            (object) value, offset, and settings for the title (if no parameters) */
+	title: function(value, offset, colour, settings) {
+		if (arguments.length == 0) {
+			return this._title;
+		}
+		if (typeof offset != 'number') {
+			settings = colour;
+			colour = offset;
+			offset = null;
+		}
+		if (typeof colour != 'string') {
+			settings = colour;
+			colour = null;
+		}
+		this._title = {value: value, offset: offset || this._title.offset,
+			settings: $.extend({textAnchor: 'middle'},
+			(colour ? {fill: colour} : {}), settings || {})};
+		this._drawGraph();
+		return this;
+	},
+
+	/* Add a series of values to be plotted on the graph.
+	   @param  name         (string) the name of this series (optional)
+	   @param  values       (number[]) the values to be plotted
+	   @param  fill         (string) how the plotted values are filled
+	   @param  stroke       (string) the colour of the plotted lines (optional)
+	   @param  strokeWidth  (number) the width of the plotted lines (optional)
+	   @param  settings     (object) additional settings for the plotted values (optional)
+	   @return  (SVGGraph) this graph object */
+	addSeries: function(name, values, fill, stroke, strokeWidth, settings) {
+		this._series.push(new SVGGraphSeries(
+			this, name, values, fill, stroke, strokeWidth, settings));
+		this._drawGraph();
+		return this;
+	},
+
+	/* Retrieve the series wrappers.
+	   @param  i  (number) the series index (optional)
+	   @return  (SVGGraphSeries) the specified series or
+	            (SVGGraphSeries[]) the list of series */
+	series: function(i) {
+		return (arguments.length > 0 ? this._series[i] : null) || this._series;
+	},
+
+	/* Suppress drawing of the graph until redraw() is called.
+	   @return  (SVGGraph) this graph object */
+	noDraw: function() {
+		this._drawNow = false;
+		return this;
+	},
+
+	/* Redraw the entire graph with the current settings and values.
+	   @return  (SVGGraph) this graph object */
+	redraw: function() {
+		this._drawNow = true;
+		this._drawGraph();
+		return this;
+	},
+
+	/* Set the callback function for status updates.
+	   @param  onstatus  (function) the callback function
+	   @return  (SVGGraph) this graph object */
+	status: function(onstatus) {
+		this._onstatus = onstatus;
+		return this;
+	},
+
+	/* Actually draw the graph (if allowed) based on the graph type set. */
+	_drawGraph: function() {
+		if (!this._drawNow) {
+			return;
+		}
+		while (this._chartCont.firstChild) {
+			this._chartCont.removeChild(this._chartCont.firstChild);
+		}
+		if (!this._chartCont.parent) {
+			this._wrapper._svg.appendChild(this._chartCont);
+		}
+		// Set sizes if not already there
+		if (!this._chartCont.width) {
+			this._chartCont.setAttribute('width',
+				parseInt(this._chartCont.getAttribute('width'), 10) || this._wrapper._width());
+		}
+		else if (this._chartCont.width.baseVal) {
+			this._chartCont.width.baseVal.value =
+				this._chartCont.width.baseVal.value || this._wrapper._width();
+		}
+		else {
+			this._chartCont.width = this._chartCont.width || this._wrapper._width();
+		}
+		if (!this._chartCont.height) {
+			this._chartCont.setAttribute('height',
+				parseInt(this._chartCont.getAttribute('height'), 10) || this._wrapper._height());
+		}
+		else if (this._chartCont.height.baseVal) {
+			this._chartCont.height.baseVal.value =
+				this._chartCont.height.baseVal.value || this._wrapper._height();
+		}
+		else {
+			this._chartCont.height = this._chartCont.height || this._wrapper._height();
+		}
+		this._chartType.drawGraph(this);
+	},
+
+	/* Decode an attribute value.
+	   @param  node  the node to examine
+	   @param  name  the attribute name
+	   @return  the actual value */
+	_getValue: function(node, name) {
+		return (!node[name] ? parseInt(node.getAttribute(name), 10) :
+			(node[name].baseVal ? node[name].baseVal.value : node[name]));
+	},
+
+	/* Draw the graph title - centred. */
+	_drawTitle: function() {
+		this._wrapper.text(this._chartCont, this._getValue(this._chartCont, 'width') / 2,
+			this._title.offset, this._title.value, this._title.settings);
+	},
+
+	/* Calculate the actual dimensions of the chart area.
+	   @param  area  (number[4]) the area values to evaluate (optional)
+	   @return  (number[4]) an array of dimension values: left, top, width, height */
+	_getDims: function(area) {
+		area = area || this._area;
+		var availWidth = this._getValue(this._chartCont, 'width');
+		var availHeight = this._getValue(this._chartCont, 'height');
+		var left = (area[this.L] > 1 ? area[this.L] : availWidth * area[this.L]);
+		var top = (area[this.T] > 1 ? area[this.T] : availHeight * area[this.T]);
+		var width = (area[this.R] > 1 ? area[this.R] : availWidth * area[this.R]) - left;
+		var height = (area[this.B] > 1 ? area[this.B] : availHeight * area[this.B]) - top;
+		return [left, top, width, height];
+	},
+
+	/* Draw the chart background, including gridlines.
+	   @param  noXGrid  (boolean) true to suppress the x-gridlines, false to draw them (optional)
+	   @param  noYGrid  (boolean) true to suppress the y-gridlines, false to draw them (optional)
+	   @return  (element) the background group element */
+	_drawChartBackground: function(noXGrid, noYGrid) {
+		var bg = this._wrapper.group(this._chartCont, {class_: 'background'});
+		var dims = this._getDims();
+		this._wrapper.rect(bg, dims[this.X], dims[this.Y], dims[this.W], dims[this.H], this._chartFormat);
+		if (this._gridlines[0] && this.yAxis._ticks.major && !noYGrid) {
+			this._drawGridlines(bg, this.yAxis, true, dims, this._gridlines[0]);
+		}
+		if (this._gridlines[1] && this.xAxis._ticks.major && !noXGrid) {
+			this._drawGridlines(bg, this.xAxis, false, dims, this._gridlines[1]);
+		}
+		return bg;
+	},
+
+	/* Draw one set of gridlines.
+	   @param  bg      (element) the background group element
+	   @param  axis    (SVGGraphAxis) the axis definition
+	   @param  horiz   (boolean) true if horizontal, false if vertical
+	   @param  dims    (number[]) the left, top, width, height of the chart area
+	   @param  format  (object) additional settings for the gridlines */
+	_drawGridlines: function(bg, axis, horiz, dims, format) {
+		var g = this._wrapper.group(bg, format);
+		var scale = (horiz ? dims[this.H] : dims[this.W]) / (axis._scale.max - axis._scale.min);
+		var major = Math.floor(axis._scale.min / axis._ticks.major) * axis._ticks.major;
+		major = (major < axis._scale.min ? major + axis._ticks.major : major);
+		while (major <= axis._scale.max) {
+			var v = (horiz ? axis._scale.max - major : major - axis._scale.min) * scale +
+				(horiz ? dims[this.Y] : dims[this.X]);
+			this._wrapper.line(g, (horiz ? dims[this.X] : v), (horiz ? v : dims[this.Y]),
+				(horiz ? dims[this.X] + dims[this.W] : v), (horiz ? v : dims[this.Y] + dims[this.H]));
+			major += axis._ticks.major;
+		}
+	},
+
+	/* Draw the axes in their standard configuration.
+	   @param  noX  (boolean) true to suppress the x-axes, false to draw it (optional) */
+	_drawAxes: function(noX) {
+		var dims = this._getDims();
+		if (this.xAxis && !noX) {
+			if (this.xAxis._title) {
+				this._wrapper.text(this._chartCont, dims[this.X] + dims[this.W] / 2,
+					dims[this.Y] + dims[this.H] + this.xAxis._titleOffset,
+					this.xAxis._title, this.xAxis._titleFormat);
+			}
+			this._drawAxis(this.xAxis, 'xAxis', dims[this.X], dims[this.Y] + dims[this.H],
+				dims[this.X] + dims[this.W], dims[this.Y] + dims[this.H]);
+		}
+		if (this.yAxis) {
+			if (this.yAxis._title) {
+				this._wrapper.text(this._chartCont, 0, 0, this.yAxis._title, $.extend({textAnchor: 'middle',
+					transform: 'translate(' + (dims[this.X] - this.yAxis._titleOffset) + ',' +
+					(dims[this.Y] + dims[this.H] / 2) + ') rotate(-90)'}, this.yAxis._titleFormat || {}));
+			}
+			this._drawAxis(this.yAxis, 'yAxis', dims[this.X], dims[this.Y],
+				dims[this.X], dims[this.Y] + dims[this.H]);
+		}
+		if (this.x2Axis && !noX) {
+			if (this.x2Axis._title) {
+				this._wrapper.text(this._chartCont, dims[this.X] + dims[this.W] / 2,
+					dims[this.X] - this.x2Axis._titleOffset, this.x2Axis._title, this.x2Axis._titleFormat);
+			}
+			this._drawAxis(this.x2Axis, 'x2Axis', dims[this.X], dims[this.Y],
+				dims[this.X] + dims[this.W], dims[this.Y]);
+		}
+		if (this.y2Axis) {
+			if (this.y2Axis._title) {
+				this._wrapper.text(this._chartCont, 0, 0, this.y2Axis._title, $.extend({textAnchor: 'middle',
+					transform: 'translate(' + (dims[this.X] + dims[this.W] + this.y2Axis._titleOffset) +
+					',' + (dims[this.Y] + dims[this.H] / 2) + ') rotate(-90)'}, this.y2Axis._titleFormat || {}));
+			}
+			this._drawAxis(this.y2Axis, 'y2Axis', dims[this.X] + dims[this.W], dims[this.Y],
+				dims[this.X] + dims[this.W], dims[this.Y] + dims[this.H]);
+		}
+	},
+
+	/* Draw an axis and its tick marks.
+	   @param  axis  (SVGGraphAxis) the axis definition
+	   @param  id    (string) the identifier for the axis group element
+	   @param  x1    (number) starting x-coodinate for the axis
+	   @param  y1    (number) starting y-coodinate for the axis
+	   @param  x2    (number) ending x-coodinate for the axis
+	   @param  y2    (number) ending y-coodinate for the axis */
+	_drawAxis: function(axis, id, x1, y1, x2, y2) {
+		var horiz = (y1 == y2);
+		var gl = this._wrapper.group(this._chartCont, $.extend({class_: id}, axis._lineFormat));
+		var gt = this._wrapper.group(this._chartCont, $.extend({class_: id + 'Labels',
+			textAnchor: (horiz ? 'middle' : 'end')}, axis._labelFormat));
+		this._wrapper.line(gl, x1, y1, x2, y2);
+		if (axis._ticks.major) {
+			var bottomRight = (x2 > (this._getValue(this._chartCont, 'width') / 2) &&
+				y2 > (this._getValue(this._chartCont, 'height') / 2));
+			var scale = (horiz ? x2 - x1 : y2 - y1) / (axis._scale.max - axis._scale.min);
+			var size = axis._ticks.size;
+			var major = Math.floor(axis._scale.min / axis._ticks.major) * axis._ticks.major;
+			major = (major < axis._scale.min ? major + axis._ticks.major : major);
+			var minor = (!axis._ticks.minor ? axis._scale.max + 1 :
+				Math.floor(axis._scale.min / axis._ticks.minor) * axis._ticks.minor);
+			minor = (minor < axis._scale.min ? minor + axis._ticks.minor : minor);
+			var offsets = this._getTickOffsets(axis, bottomRight);
+			var count = 0;
+			while (major <= axis._scale.max || minor <= axis._scale.max) {
+				var cur = Math.min(major, minor);
+				var len = (cur == major ? size : size / 2);
+				var v = (horiz ? x1 : y1) +
+					(horiz ? cur - axis._scale.min : axis._scale.max - cur) * scale;
+				this._wrapper.line(gl, (horiz ? v : x1 + len * offsets[0]),
+					(horiz ? y1 + len * offsets[0] : v),
+					(horiz ? v : x1 + len * offsets[1]),
+					(horiz ? y1 + len * offsets[1] : v));
+				if (cur == major) {
+					this._wrapper.text(gt, (horiz ? v : x1 - size), (horiz ? y1 + 2 * size : v),
+						(axis._labels ? axis._labels[count++] : '' + cur));
+				}
+				major += (cur == major ? axis._ticks.major : 0);
+				minor += (cur == minor ? axis._ticks.minor : 0);
+			}
+		}
+	},
+
+	/* Calculate offsets based on axis and tick positions.
+	   @param  axis         (SVGGraphAxis) the axis definition
+	   @param  bottomRight  (boolean) true if this axis is appearing on the bottom or
+	                        right of the chart area, false if to the top or left
+	   @return  (number[2]) the array of offset multipliers (-1..+1) */
+	_getTickOffsets: function(axis, bottomRight) {
+		return [(axis._ticks.position == (bottomRight ? 'in' : 'out') ||
+			axis._ticks.position == 'both' ? -1 : 0),
+			(axis._ticks.position == (bottomRight ? 'out' : 'in') ||
+			axis._ticks.position == 'both' ? +1 : 0), ];
+	},
+
+	/* Retrieve the standard percentage axis.
+	   @return  (SVGGraphAxis) percentage axis */
+	_getPercentageAxis: function() {
+		this._percentageAxis._title = $.svg.graphing.region.percentageText;
+		return this._percentageAxis;
+	},
+
+	/* Calculate the column totals across all the series. */
+	_getTotals: function() {
+		var totals = [];
+		var numVal = (this._series.length ? this._series[0]._values.length : 0);
+		for (var i = 0; i < numVal; i++) {
+			totals[i] = 0;
+			for (var j = 0; j < this._series.length; j++) {
+				totals[i] += this._series[j]._values[i];
+			}
+		}
+		return totals;
+	},
+
+	/* Draw the chart legend. */
+	_drawLegend: function() {
+		if (!this.legend._show) {
+			return;
+		}
+		var g = this._wrapper.group(this._chartCont, {class_: 'legend'});
+		var dims = this._getDims(this.legend._area);
+		this._wrapper.rect(g, dims[this.X], dims[this.Y], dims[this.W], dims[this.H],
+			this.legend._bgSettings);
+		var horiz =  dims[this.W] > dims[this.H];
+		var numSer = this._series.length;
+		var offset = (horiz ? dims[this.W] : dims[this.H]) / numSer;
+		var xBase = dims[this.X] + 5;
+		var yBase = dims[this.Y] + ((horiz ? dims[this.H] : offset) + this.legend._sampleSize) / 2;
+		for (var i = 0; i < numSer; i++) {
+			var series = this._series[i];
+			this._wrapper.rect(g, xBase + (horiz ? i * offset : 0),
+				yBase + (horiz ? 0 : i * offset) - this.legend._sampleSize,
+				this.legend._sampleSize, this.legend._sampleSize,
+				{fill: series._fill, stroke: series._stroke, strokeWidth: 1});
+			this._wrapper.text(g, xBase + (horiz ? i * offset : 0) + this.legend._sampleSize + 5,
+				yBase + (horiz ? 0 : i * offset), series._name, this.legend._textSettings);
+		}
+	},
+
+	/* Show the current value status on hover. */
+	_showStatus: function(elem, label, value) {
+		var status = this._onstatus;
+		if (this._onstatus) {
+			$(elem).hover(function() { status.apply(this, [label, value]); },
+				function() { status.apply(this, ['', 0]); });
+		}
+	}
+});
+
+/* Details about each graph series.
+   @param  graph        (SVGGraph) the owning graph
+   @param  name         (string) the name of this series (optional)
+   @param  values       (number[]) the list of values to be plotted
+   @param  fill         (string) how the series should be displayed
+   @param  stroke       (string) the colour of the (out)line for the series (optional)
+   @param  strokeWidth  (number) the width of the (out)line for the series (optional)
+   @param  settings     (object) additional formatting settings (optional)
+   @return  (SVGGraphSeries) the new series object */
+function SVGGraphSeries(graph, name, values, fill, stroke, strokeWidth, settings) {
+	if (typeof name != 'string') {
+		settings = strokeWidth;
+		strokeWidth = stroke;
+		stroke = fill;
+		fill = values;
+		values = name;
+		name = null;
+	}
+	if (typeof stroke != 'string') {
+		settings = strokeWidth;
+		strokeWidth = stroke;
+		stroke = null;
+	}
+	if (typeof strokeWidth != 'number') {
+		settings = strokeWidth;
+		strokeWidth = null;
+	}
+	this._graph = graph; // The owning graph
+	this._name = name || ''; // The name of this series
+	this._values = values || []; // The list of values for this series
+	this._axis = 1; // Which axis this series applies to: 1 = primary, 2 = secondary
+	this._fill = fill || 'green'; // How the series is plotted
+	this._stroke = stroke || 'black'; // The colour for the (out)line
+	this._strokeWidth = strokeWidth || 1; // The (out)line width
+	this._settings = settings || {}; // Additional formatting settings for the series
+}
+
+$.extend(SVGGraphSeries.prototype, {
+
+	/* Set or retrieve the name for this series.
+	   @param  name    (string) the series' name
+	   @return  (SVGGraphSeries) this series object or
+	            (string) the series name (if no parameters) */
+	name: function(name) {
+		if (arguments.length == 0) {
+			return this._name;
+		}
+		this._name = name;
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the values for this series.
+	   @param  name    (string) the series' name (optional)
+	   @param  values  (number[]) the values to be graphed
+	   @return  (SVGGraphSeries) this series object or
+	            (number[]) the series values (if no parameters) */
+	values: function(name, values) {
+		if (arguments.length == 0) {
+			return this._values;
+		}
+		if (isArray(name)) {
+			values = name;
+			name = null;
+		}
+		this._name = name || this._name;
+		this._values = values;
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the formatting for this series.
+	   @param  fill         (string) how the values are filled when plotted
+	   @param  stroke       (string) the (out)line colour (optional)
+	   @param  strokeWidth  (number) the line's width (optional)
+	   @param  settings     (object) additional formatting settings for the series (optional)
+	   @return  (SVGGraphSeries) this series object or
+	            (object) formatting settings (if no parameters) */
+	format: function(fill, stroke, strokeWidth, settings) {
+		if (arguments.length == 0) {
+			return $.extend({fill: this._fill, stroke: this._stroke,
+				strokeWidth: this._strokeWidth}, this._settings);
+		}
+		if (typeof stroke != 'string') {
+			settings = strokeWidth;
+			strokeWidth = stroke;
+			stroke = null;
+		}
+		if (typeof strokeWidth != 'number') {
+			settings = strokeWidth;
+			strokeWidth = null;
+		}
+		this._fill = fill || this._fill;
+		this._stroke = stroke || this._stroke;
+		this._strokeWidth = strokeWidth || this._strokeWidth;
+		$.extend(this._settings, settings || {});
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Return to the parent graph. */
+	end: function() {
+		return this._graph;
+	}
+});
+
+/* Details about each graph axis.
+   @param  graph  (SVGGraph) the owning graph
+   @param  title  (string) the title of the axis
+   @param  min    (number) the minimum value displayed on this axis
+   @param  max    (number) the maximum value displayed on this axis
+   @param  major  (number) the distance between major ticks
+   @param  minor  (number) the distance between minor ticks (optional)
+   @return  (SVGGraphAxis) the new axis object */
+function SVGGraphAxis(graph, title, min, max, major, minor) {
+	this._graph = graph; // The owning graph
+	this._title = title || ''; // Title of this axis
+	this._titleFormat = {}; // Formatting settings for the title
+	this._titleOffset = 0; // The offset for positioning the title
+	this._labels = null; // List of labels for this axis - one per possible value across all series
+	this._labelFormat = {}; // Formatting settings for the labels
+	this._lineFormat = {stroke: 'black', strokeWidth: 1}; // Formatting settings for the axis lines
+	this._ticks = {major: major || 10, minor: minor || 0, size: 10, position: 'out'}; // Tick mark options
+	this._scale = {min: min || 0, max: max || 100}; // Axis scale settings
+	this._crossAt = 0; // Where this axis crosses the other one
+}
+
+$.extend(SVGGraphAxis.prototype, {
+
+	/* Set or retrieve the scale for this axis.
+	   @param  min  (number) the minimum value shown
+	   @param  max  (number) the maximum value shown
+	   @return  (SVGGraphAxis) this axis object or
+	            (object) min and max values (if no parameters) */
+	scale: function(min, max) {
+		if (arguments.length == 0) {
+			return this._scale;
+		}
+		this._scale.min = min;
+		this._scale.max = max;
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the ticks for this axis.
+	   @param  major     (number) the distance between major ticks
+	   @param  minor     (number) the distance between minor ticks
+	   @param  size      (number) the length of the major ticks (minor are half) (optional)
+	   @param  position  (string) the location of the ticks:
+	                     'in', 'out', 'both' (optional)
+	   @return  (SVGGraphAxis) this axis object or
+	            (object) major, minor, size, and position values (if no parameters) */
+	ticks: function(major, minor, size, position) {
+		if (arguments.length == 0) {
+			return this._ticks;
+		}
+		if (typeof size == 'string') {
+			position = size;
+			size = null;
+		}
+		this._ticks.major = major;
+		this._ticks.minor = minor;
+		this._ticks.size = size || this._ticks.size;
+		this._ticks.position = position || this._ticks.position;
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the title for this axis.
+	   @param  title   (string) the title text
+	   @param  offset  (number) the distance to offset the title position (optional)
+	   @param  colour  (string) how to colour the title (optional) 
+	   @param  format  (object) formatting settings for the title (optional)
+	   @return  (SVGGraphAxis) this axis object or
+	            (object) title, offset, and format values (if no parameters) */
+	title: function(title, offset, colour, format) {
+		if (arguments.length == 0) {
+			return {title: this._title, offset: this._titleOffset, format: this._titleFormat};
+		}
+		if (typeof offset != 'number') {
+			format = colour;
+			colour = offset;
+			offset = null;
+		}
+		if (typeof colour != 'string') {
+			format = colour;
+			colour = null;
+		}
+		this._title = title;
+		this._titleOffset = (offset != null ? offset : this._titleOffset);
+		if (colour || format) {
+			this._titleFormat = $.extend(format || {}, (colour ? {fill: colour} : {}));
+		}
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the labels for this axis.
+	   @param  labels  (string[]) the text for each entry
+	   @param  colour  (string) how to colour the labels (optional) 
+	   @param  format  (object) formatting settings for the labels (optional)
+	   @return  (SVGGraphAxis) this axis object or
+	            (object) labels and format values (if no parameters) */
+	labels: function(labels, colour, format) {
+		if (arguments.length == 0) {
+			return {labels: this._labels, format: this._labelFormat};
+		}
+		if (typeof colour != 'string') {
+			format = colour;
+			colour = null;
+		}
+		this._labels = labels;
+		if (colour || format) {
+			this._labelFormat = $.extend(format || {}, (colour ? {fill: colour} : {}));
+		}
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the line formatting for this axis.
+	   @param  colour    (string) the line's colour
+	   @param  width     (number) the line's width (optional)
+	   @param  settings  (object) additional formatting settings for the line (optional)
+	   @return  (SVGGraphAxis) this axis object or
+	            (object) line formatting values (if no parameters) */
+	line: function(colour, width, settings) {
+		if (arguments.length == 0) {
+			return this._lineFormat;
+		}
+		if (typeof width == 'object') {
+			settings = width;
+			width = null;
+		}
+		$.extend(this._lineFormat, {stroke: colour},
+			(width ? {strokeWidth: width} : {}), settings || {});
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Return to the parent graph. */
+	end: function() {
+		return this._graph;
+	}
+});
+
+/* Details about the graph legend.
+   @param  graph         (SVGGraph) the owning graph
+   @param  bgSettings    (object) additional formatting settings for the legend background (optional)
+   @param  textSettings  (object) additional formatting settings for the legend text (optional)
+   @return  (SVGGraphLegend) the new legend object */
+function SVGGraphLegend(graph, bgSettings, textSettings) {
+	this._graph = graph; // The owning graph
+	this._show = true; // Show the legend?
+	this._area = [0.9, 0.1, 1.0, 0.9]; // The legend area: left, top, right, bottom,
+		// > 1 in pixels, <= 1 as proportion
+	this._sampleSize = 15; // Size of sample box
+	this._bgSettings = bgSettings || {stroke: 'gray'}; // Additional formatting settings for the legend background
+	this._textSettings = textSettings || {}; // Additional formatting settings for the text
+}
+
+$.extend(SVGGraphLegend.prototype, {
+
+	/* Set or retrieve whether the legend should be shown.
+	   @param  show  (boolean) true to display it, false to hide it
+	   @return  (SVGGraphLegend) this legend object or
+	            (boolean) show the legend? (if no parameters) */
+	show: function(show) {
+		if (arguments.length == 0) {
+			return this._show;
+		}
+		this._show = show;
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve the legend area.
+	   @param  left    (number) > 1 is pixels, <= 1 is proportion of width or
+	                   (number[4]) for left, top, right, bottom
+	   @param  top     (number) > 1 is pixels, <= 1 is proportion of height
+	   @param  right   (number) > 1 is pixels, <= 1 is proportion of width
+	   @param  bottom  (number) > 1 is pixels, <= 1 is proportion of height
+	   @return  (SVGGraphLegend) this legend object or
+	            (number[4]) the legend area: left, top, right, bottom (if no parameters) */
+	area: function(left, top, right, bottom) {
+		if (arguments.length == 0) {
+			return this._area;
+		}
+		this._area = (isArray(left) ? left : [left, top, right, bottom]);
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Set or retrieve additional settings for the legend area.
+	   @param  sampleSize    (number) the size of the sample box to display (optional)
+	   @param  bgSettings    (object) additional formatting settings for the legend background
+	   @param  textSettings  (object) additional formatting settings for the legend text (optional)
+	   @return  (SVGGraphLegend) this legend object or
+	            (object) bgSettings and textSettings for the legend (if no parameters) */
+	settings: function(sampleSize, bgSettings, textSettings) {
+		if (arguments.length == 0) {
+			return {sampleSize: this._sampleSize, bgSettings: this._bgSettings,
+				textSettings: this._textSettings};
+		}
+		if (typeof sampleSize != 'number') {
+			textSettings = bgSettings;
+			bgSettings = sampleSize;
+			sampleSize = null;
+		}
+		this._sampleSize = sampleSize || this._sampleSize;
+		this._bgSettings = bgSettings;
+		this._textSettings = textSettings || this._textSettings;
+		this._graph._drawGraph();
+		return this;
+	},
+
+	/* Return to the parent graph. */
+	end: function() {
+		return this._graph;
+	}
+});
+
+//==============================================================================
+
+/* Round a number to a given number of decimal points. */
+function roundNumber(num, dec) {
+	return Math.round(num * Math.pow(10, dec)) / Math.pow(10, dec);
+}
+
+var barOptions = ['barWidth (number) - the width of each bar',
+	'barGap (number) - the gap between sets of bars'];
+
+//------------------------------------------------------------------------------
+
+/* Draw a standard grouped column bar chart. */
+function SVGColumnChart() {
+}
+
+$.extend(SVGColumnChart.prototype, {
+
+	/* Retrieve the display title for this chart type.
+	   @return  the title */
+	title: function() {
+		return 'Basic column chart';
+	},
+
+	/* Retrieve a description of this chart type.
+	   @return  its description */
+	description: function() {
+		return 'Compare sets of values as vertical bars with grouped categories.';
+	},
+
+	/* Retrieve a list of the options that may be set for this chart type.
+	   @return  options list */
+	options: function() {
+		return barOptions;
+	},
+
+	/* Actually draw the graph in this type's style.
+	   @param  graph  (object) the SVGGraph object */
+	drawGraph: function(graph) {
+		graph._drawChartBackground(true);
+		var barWidth = graph._chartOptions.barWidth || 10;
+		var barGap = graph._chartOptions.barGap || 10;
+		var numSer = graph._series.length;
+		var numVal = (numSer ? (graph._series[0])._values.length : 0);
+		var dims = graph._getDims();
+		var xScale = dims[graph.W] / ((numSer * barWidth + barGap) * numVal + barGap);
+		var yScale = dims[graph.H] / (graph.yAxis._scale.max - graph.yAxis._scale.min);
+		this._chart = graph._wrapper.group(graph._chartCont, {class_: 'chart'});
+		for (var i = 0; i < numSer; i++) {
+			this._drawSeries(graph, i, numSer, barWidth, barGap, dims, xScale, yScale);
+		}
+		graph._drawTitle();
+		graph._drawAxes(true);
+		this._drawXAxis(graph, numSer, numVal, barWidth, barGap, dims, xScale);
+		graph._drawLegend();
+	},
+
+	/* Plot an individual series. */
+	_drawSeries: function(graph, cur, numSer, barWidth, barGap, dims, xScale, yScale) {
+		var series = graph._series[cur];
+		var g = graph._wrapper.group(this._chart,
+			$.extend({class_: 'series' + cur, fill: series._fill, stroke: series._stroke,
+			strokeWidth: series._strokeWidth}, series._settings || {}));
+		for (var i = 0; i < series._values.length; i++) {
+			var r = graph._wrapper.rect(g,
+				dims[graph.X] + xScale * (barGap + i * (numSer * barWidth + barGap) + (cur * barWidth)),
+				dims[graph.Y] + yScale * (graph.yAxis._scale.max - series._values[i]),
+				xScale * barWidth, yScale * series._values[i]);
+			graph._showStatus(r, series._name, series._values[i]);
+		}
+	},
+
+	/* Draw the x-axis and its ticks. */
+	_drawXAxis: function(graph, numSer, numVal, barWidth, barGap, dims, xScale) {
+		var axis = graph.xAxis;
+		if (axis._title) {
+			graph._wrapper.text(graph._chartCont, dims[graph.X] + dims[graph.W] / 2,
+				dims[graph.Y] + dims[graph.H] + axis._titleOffset,
+				axis._title, $.extend({textAnchor: 'middle'}, axis._titleFormat || {}));
+		}
+		var gl = graph._wrapper.group(graph._chartCont, $.extend({class_: 'xAxis'}, axis._lineFormat));
+		var gt = graph._wrapper.group(graph._chartCont, $.extend({class_: 'xAxisLabels',
+			textAnchor: 'middle'}, axis._labelFormat));
+		graph._wrapper.line(gl, dims[graph.X], dims[graph.Y] + dims[graph.H],
+			dims[graph.X] + dims[graph.W], dims[graph.Y] + dims[graph.H]);
+		if (axis._ticks.major) {
+			var offsets = graph._getTickOffsets(axis, true);
+			for (var i = 1; i < numVal; i++) {
+				var x = dims[graph.X] + xScale * (barGap / 2 + i * (numSer * barWidth + barGap));
+				graph._wrapper.line(gl, x, dims[graph.Y] + dims[graph.H] + offsets[0] * axis._ticks.size,
+					x, dims[graph.Y] + dims[graph.H] + offsets[1] * axis._ticks.size);
+			}
+			for (var i = 0; i < numVal; i++) {
+				var x = dims[graph.X] + xScale * (barGap / 2 + (i + 0.5) * (numSer * barWidth + barGap));
+				graph._wrapper.text(gt, x, dims[graph.Y] + dims[graph.H] + 2 * axis._ticks.size,
+					(axis._labels ? axis._labels[i] : '' + i));
+			}
+		}
+	}
+});
+
+//------------------------------------------------------------------------------
+
+/* Draw a stacked column bar chart. */
+function SVGStackedColumnChart() {
+}
+
+$.extend(SVGStackedColumnChart.prototype, {
+
+	/* Retrieve the display title for this chart type.
+	   @return  the title */
+	title: function() {
+		return 'Stacked column chart';
+	},
+
+	/* Retrieve a description of this chart type.
+	   @return  its description */
+	description: function() {
+		return 'Compare sets of values as vertical bars showing ' +
+			'relative contributions to the whole for each category.';
+	},
+
+	/* Retrieve a list of the options that may be set for this chart type.
+	   @return  options list */
+	options: function() {
+		return barOptions;
+	},
+
+	/* Actually draw the graph in this type's style.
+	   @param  graph  (object) the SVGGraph object */
+	drawGraph: function(graph) {
+		var bg = graph._drawChartBackground(true, true);
+		var dims = graph._getDims();
+		if (graph._gridlines[0] && graph.xAxis._ticks.major) {
+			graph._drawGridlines(bg, graph._getPercentageAxis(), true, dims, graph._gridlines[0]);
+		}
+		var barWidth = graph._chartOptions.barWidth || 10;
+		var barGap = graph._chartOptions.barGap || 10;
+		var numSer = graph._series.length;
+		var numVal = (numSer ? (graph._series[0])._values.length : 0);
+		var xScale = dims[graph.W] / ((barWidth + barGap) * numVal + barGap);
+		var yScale = dims[graph.H];
+		this._chart = graph._wrapper.group(graph._chartCont, {class_: 'chart'});
+		this._drawColumns(graph, numSer, numVal, barWidth, barGap, dims, xScale, yScale);
+		graph._drawTitle();
+		graph._wrapper.text(graph._chartCont, 0, 0, $.svg.graphing.region.percentageText,
+			$.extend({textAnchor: 'middle', transform: 'translate(' +
+			(dims[graph.X] - graph.yAxis._titleOffset) + ',' +
+			(dims[graph.Y] + dims[graph.H] / 2) + ') rotate(-90)'}, graph.yAxis._titleFormat || {}));
+		var pAxis = $.extend({}, graph._getPercentageAxis());
+		$.extend(pAxis._labelFormat, graph.yAxis._labelFormat || {});
+		graph._drawAxis(pAxis, 'yAxis', dims[graph.X], dims[graph.Y],
+			dims[graph.X], dims[graph.Y] + dims[graph.H]);
+		this._drawXAxis(graph, numVal, barWidth, barGap, dims, xScale);
+		graph._drawLegend();
+	},
+
+	/* Plot all of the columns. */
+	_drawColumns: function(graph, numSer, numVal, barWidth, barGap, dims, xScale, yScale) {
+		var totals = graph._getTotals();
+		var accum = [];
+		for (var i = 0; i < numVal; i++) {
+			accum[i] = 0;
+		}
+		for (var s = 0; s < numSer; s++) {
+			var series = graph._series[s];
+			var g = graph._wrapper.group(this._chart,
+				$.extend({class_: 'series' + s, fill: series._fill,
+				stroke: series._stroke, strokeWidth: series._strokeWidth},
+				series._settings || {}));
+			for (var i = 0; i < series._values.length; i++) {
+				accum[i] += series._values[i];
+				var r = graph._wrapper.rect(g,
+					dims[graph.X] + xScale * (barGap + i * (barWidth + barGap)),
+					dims[graph.Y] + yScale * (totals[i] - accum[i]) / totals[i],
+					xScale * barWidth, yScale * series._values[i] / totals[i]);
+				graph._showStatus(r, series._name,
+					roundNumber(series._values[i] / totals[i] * 100, 2));
+			}
+		}
+	},
+
+	/* Draw the x-axis and its ticks. */
+	_drawXAxis: function(graph, numVal, barWidth, barGap, dims, xScale) {
+		var axis = graph.xAxis;
+		if (axis._title) {
+			graph._wrapper.text(graph._chartCont, dims[graph.X] + dims[graph.W] / 2,
+				dims[graph.Y] + dims[graph.H] + axis._titleOffset,
+				axis._title, $.extend({textAnchor: 'middle'}, axis._titleFormat || {}));
+		}
+		var gl = graph._wrapper.group(graph._chartCont, $.extend({class_: 'xAxis'}, axis._lineFormat));
+		var gt = graph._wrapper.group(graph._chartCont, $.extend({class_: 'xAxisLabels',
+			textAnchor: 'middle'}, axis._labelFormat));
+		graph._wrapper.line(gl, dims[graph.X], dims[graph.Y] + dims[graph.H],
+		dims[graph.X] + dims[graph.W], dims[graph.Y] + dims[graph.H]);
+		if (axis._ticks.major) {
+			var offsets = graph._getTickOffsets(axis, true);
+			for (var i = 1; i < numVal; i++) {
+				var x = dims[graph.X] + xScale * (barGap / 2 + i * (barWidth + barGap));
+				graph._wrapper.line(gl, x, dims[graph.Y] + dims[graph.H] + offsets[0] * axis._ticks.size,
+					x, dims[graph.Y] + dims[graph.H] + offsets[1] * axis._ticks.size);
+			}
+			for (var i = 0; i < numVal; i++) {
+				var x = dims[graph.X] + xScale * (barGap / 2 + (i + 0.5) * (barWidth + barGap));
+				graph._wrapper.text(gt, x, dims[graph.Y] + dims[graph.H] + 2 * axis._ticks.size,
+					(axis._labels ? axis._labels[i] : '' + i));
+			}
+		}
+	}
+});
+
+//------------------------------------------------------------------------------
+
+/* Draw a standard grouped row bar chart. */
+function SVGRowChart() {
+}
+
+$.extend(SVGRowChart.prototype, {
+
+	/* Retrieve the display title for this chart type.
+	   @return  the title */
+	title: function() {
+		return 'Basic row chart';
+	},
+
+	/* Retrieve a description of this chart type.
+	   @return  its description */
+	description: function() {
+		return 'Compare sets of values as horizontal rows with grouped categories.';
+	},
+
+	/* Retrieve a list of the options that may be set for this chart type.
+	   @return  options list */
+	options: function() {
+		return barOptions;
+	},
+
+	/* Actually draw the graph in this type's style.
+	   @param  graph  (object) the SVGGraph object */
+	drawGraph: function(graph) {
+		var bg = graph._drawChartBackground(true, true);
+		var dims = graph._getDims();
+		graph._drawGridlines(bg, graph.yAxis, false, dims, graph._gridlines[0]);
+		var barWidth = graph._chartOptions.barWidth || 10;
+		var barGap = graph._chartOptions.barGap || 10;
+		var numSer = graph._series.length;
+		var numVal = (numSer ? (graph._series[0])._values.length : 0);
+		var xScale = dims[graph.W] / (graph.yAxis._scale.max - graph.yAxis._scale.min);
+		var yScale = dims[graph.H] / ((numSer * barWidth + barGap) * numVal + barGap);
+		this._chart = graph._wrapper.group(graph._chartCont, {class_: 'chart'});
+		for (var i = 0; i < numSer; i++) {
+			this._drawSeries(graph, i, numSer, barWidth, barGap, dims, xScale, yScale);
+		}
+		graph._drawTitle();
+		this._drawAxes(graph, numSer, numVal, barWidth, barGap, dims, yScale);
+		graph._drawLegend();
+	},
+
+	/* Plot an individual series. */
+	_drawSeries: function(graph, cur, numSer, barWidth, barGap, dims, xScale, yScale) {
+		var series = graph._series[cur];
+		var g = graph._wrapper.group(this._chart,
+			$.extend({class_: 'series' + cur, fill: series._fill,
+			stroke: series._stroke, strokeWidth: series._strokeWidth},
+			series._settings || {}));
+		for (var i = 0; i < series._values.length; i++) {
+			var r = graph._wrapper.rect(g,
+				dims[graph.X] + xScale * (0 - graph.yAxis._scale.min),
+				dims[graph.Y] + yScale * (barGap + i * (numSer * barWidth + barGap) + (cur * barWidth)),
+				xScale * series._values[i], yScale * barWidth);
+			graph._showStatus(r, series._name, series._values[i]);
+		}
+	},
+
+	/* Draw the axes for this graph. */
+	_drawAxes: function(graph, numSer, numVal, barWidth, barGap, dims, yScale) {
+		// X-axis
+		var axis = graph.yAxis;
+		if (axis) {
+			if (axis._title) {
+				graph._wrapper.text(graph._chartCont, dims[graph.X] + dims[graph.W] / 2,
+					dims[graph.Y] + dims[graph.H] + axis._titleOffset, axis._title, axis._titleFormat);
+			}
+			graph._drawAxis(axis, 'xAxis', dims[graph.X], dims[graph.Y] + dims[graph.H],
+				dims[graph.X] + dims[graph.W], dims[graph.Y] + dims[graph.H]);
+		}
+		// Y-axis
+		var axis = graph.xAxis;
+		if (axis._title) {
+			graph._wrapper.text(graph._chartCont, 0, 0, axis._title, $.extend({textAnchor: 'middle',
+				transform: 'translate(' + (dims[graph.X] - axis._titleOffset) + ',' +
+				(dims[graph.Y] + dims[graph.H] / 2) + ') rotate(-90)'}, axis._titleFormat || {}));
+		}
+		var gl = graph._wrapper.group(graph._chartCont, $.extend({class_: 'yAxis'}, axis._lineFormat));
+		var gt = graph._wrapper.group(graph._chartCont, $.extend(
+			{class_: 'yAxisLabels', textAnchor: 'end'}, axis._labelFormat));
+		graph._wrapper.line(gl, dims[graph.X], dims[graph.Y], dims[graph.X], dims[graph.Y] + dims[graph.H]);
+		if (axis._ticks.major) {
+			var offsets = graph._getTickOffsets(axis, false);
+			for (var i = 1; i < numVal; i++) {
+				var y = dims[graph.Y] + yScale * (barGap / 2 + i * (numSer * barWidth + barGap));
+				graph._wrapper.line(gl, dims[graph.X] + offsets[0] * axis._ticks.size, y,
+					dims[graph.X] + offsets[1] * axis._ticks.size, y);
+			}
+			for (var i = 0; i < numVal; i++) {
+				var y = dims[graph.Y] + yScale * (barGap / 2 + (i + 0.5) * (numSer * barWidth + barGap));
+				graph._wrapper.text(gt, dims[graph.X] - axis._ticks.size, y,
+					(axis._labels ? axis._labels[i] : '' + i));
+			}
+		}
+	}
+});
+
+//------------------------------------------------------------------------------
+
+/* Draw a stacked row bar chart. */
+function SVGStackedRowChart() {
+}
+
+$.extend(SVGStackedRowChart.prototype, {
+
+	/* Retrieve the display title for this chart type.
+	   @return  the title */
+	title: function() {
+		return 'Stacked row chart';
+	},
+
+	/* Retrieve a description of this chart type.
+	   @return  its description */
+	description: function() {
+		return 'Compare sets of values as horizontal bars showing ' +
+			'relative contributions to the whole for each category.';
+	},
+
+	/* Retrieve a list of the options that may be set for this chart type.
+	   @return  options list */
+	options: function() {
+		return barOptions;
+	},
+
+	/* Actually draw the graph in this type's style.
+	   @param  graph  (object) the SVGGraph object */
+	drawGraph: function(graph) {
+		var bg = graph._drawChartBackground(true, true);
+		var dims = graph._getDims();
+		if (graph._gridlines[0] && graph.xAxis._ticks.major) {
+			graph._drawGridlines(bg, graph._getPercentageAxis(), false, dims, graph._gridlines[0]);
+		}
+		var barWidth = graph._chartOptions.barWidth || 10;
+		var barGap = graph._chartOptions.barGap || 10;
+		var numSer = graph._series.length;
+		var numVal = (numSer ? (graph._series[0])._values.length : 0);
+		var xScale = dims[graph.W];
+		var yScale = dims[graph.H] / ((barWidth + barGap) * numVal + barGap);
+		this._chart = graph._wrapper.group(graph._chartCont, {class_: 'chart'});
+		this._drawRows(graph, numSer, numVal, barWidth, barGap, dims, xScale, yScale);
+		graph._drawTitle();
+		graph._wrapper.text(graph._chartCont, dims[graph.X] + dims[graph.W] / 2,
+			dims[graph.Y] + dims[graph.H] + graph.xAxis._titleOffset,
+			$.svg.graphing.region.percentageText,
+			$.extend({textAnchor: 'middle'}, graph.yAxis._titleFormat || {}));
+		var pAxis = $.extend({}, graph._getPercentageAxis());
+		$.extend(pAxis._labelFormat, graph.yAxis._labelFormat || {});
+		graph._drawAxis(pAxis, 'xAxis', dims[graph.X], dims[graph.Y] + dims[graph.H],
+			dims[graph.X] + dims[graph.W], dims[graph.Y] + dims[graph.H]);
+		this._drawYAxis(graph, numVal, barWidth, barGap, dims, yScale);
+		graph._drawLegend();
+	},
+
+	/* Plot all of the rows. */
+	_drawRows: function(graph, numSer, numVal, barWidth, barGap, dims, xScale, yScale) {
+		var totals = graph._getTotals();
+		var accum = [];
+		for (var i = 0; i < numVal; i++) {
+			accum[i] = 0;
+		}
+		for (var s = 0; s < numSer; s++) {
+			var series = graph._series[s];
+			var g = graph._wrapper.group(this._chart,
+				$.extend({class_: 'series' + s, fill: series._fill,
+				stroke: series._stroke, strokeWidth: series._strokeWidth},
+				series._settings || {}));
+			for (var i = 0; i < series._values.length; i++) {
+				var r = graph._wrapper.rect(g,
+					dims[graph.X] + xScale * accum[i] / totals[i],
+					dims[graph.Y] + yScale * (barGap + i * (barWidth + barGap)),
+					xScale * series._values[i] / totals[i], yScale * barWidth);
+				graph._showStatus(r, series._name,
+					roundNumber(series._values[i] / totals[i] * 100, 2));
+				accum[i] += series._values[i];
+			}
+		}
+	},
+
+	/* Draw the y-axis and its ticks. */
+	_drawYAxis: function(graph, numVal, barWidth, barGap, dims, yScale) {
+		var axis = graph.xAxis;
+		if (axis._title) {
+			graph._wrapper.text(graph._chartCont, 0, 0, axis._title, $.extend({textAnchor: 'middle',
+				transform: 'translate(' + (dims[graph.X] - axis._titleOffset) + ',' +
+				(dims[graph.Y] + dims[graph.H] / 2) + ') rotate(-90)'}, axis._titleFormat || {}));
+		}
+		var gl = graph._wrapper.group(graph._chartCont,
+			$.extend({class_: 'yAxis'}, axis._lineFormat));
+		var gt = graph._wrapper.group(graph._chartCont,
+			$.extend({class_: 'yAxisLabels', textAnchor: 'end'}, axis._labelFormat));
+		graph._wrapper.line(gl, dims[graph.X], dims[graph.Y],
+			dims[graph.X], dims[graph.Y] + dims[graph.H]);
+		if (axis._ticks.major) {
+			var offsets = graph._getTickOffsets(axis, false);
+			for (var i = 1; i < numVal; i++) {
+				var y = dims[graph.Y] + yScale * (barGap / 2 + i * (barWidth + barGap));
+				graph._wrapper.line(gl, dims[graph.X] + offsets[0] * axis._ticks.size, y,
+					dims[graph.X] + offsets[1] * axis._ticks.size, y);
+			}
+			for (var i = 0; i < numVal; i++) {
+				var y = dims[graph.Y] + yScale * (barGap / 2 + (i + 0.5) * (barWidth + barGap));
+				graph._wrapper.text(gt, dims[graph.X] - axis._ticks.size, y,
+					(axis._labels ? axis._labels[i] : '' + i));
+			}
+		}
+	}
+});
+
+//------------------------------------------------------------------------------
+
+/* Draw a standard line chart. */
+function SVGLineChart() {
+}
+
+$.extend(SVGLineChart.prototype, {
+
+	/* Retrieve the display title for this chart type.
+	   @return  the title */
+	title: function() {
+		return 'Basic line chart';
+	},
+
+	/* Retrieve a description of this chart type.
+	   @return  its description */
+	description: function() {
+		return 'Compare sets of values as continuous lines.';
+	},
+
+	/* Retrieve a list of the options that may be set for this chart type.
+	   @return  options list */
+	options: function() {
+		return [];
+	},
+	
+	/* Actually draw the graph in this type's style.
+	   @param  graph  (object) the SVGGraph object */
+	drawGraph: function(graph) {
+		graph._drawChartBackground();
+		var dims = graph._getDims();
+		var xScale = dims[graph.W] / (graph.xAxis._scale.max - graph.xAxis._scale.min);
+		var yScale = dims[graph.H] / (graph.yAxis._scale.max - graph.yAxis._scale.min);
+		this._chart = graph._wrapper.group(graph._chartCont, {class_: 'chart'});
+		for (var i = 0; i < graph._series.length; i++) {
+			this._drawSeries(graph, i, dims, xScale, yScale);
+		}
+		graph._drawTitle();
+		graph._drawAxes();
+		graph._drawLegend();
+	},
+
+	/* Plot an individual series. */
+	_drawSeries: function(graph, cur, dims, xScale, yScale) {
+		var series = graph._series[cur];
+		var path = graph._wrapper.createPath();
+		for (var i = 0; i < series._values.length; i++) {
+			var x = dims[graph.X] + i * xScale;
+			var y = dims[graph.Y] + (graph.yAxis._scale.max - series._values[i]) * yScale;
+			if (i == 0) {
+				path.move(x, y);
+			}
+			else {
+				path.line(x, y);
+			}
+		}
+		var p = graph._wrapper.path(this._chart, path,
+			$.extend({id: 'series' + cur, fill: 'none', stroke: series._stroke,
+			strokeWidth: series._strokeWidth}, series._settings || {}));
+		graph._showStatus(p, series._name, 0);
+	}
+});
+
+//------------------------------------------------------------------------------
+
+/* Draw a standard pie chart. */
+function SVGPieChart() {
+}
+
+$.extend(SVGPieChart.prototype, {
+
+	_options: ['explode (number or number[]) - indexes of sections to explode out of the pie',
+		'explodeDist (number) - the distance to move an exploded section',
+		'pieGap (number) - the distance between pies for multiple values'],
+
+	/* Retrieve the display title for this chart type.
+	   @return  the title */
+	title: function() {
+		return 'Pie chart';
+	},
+
+	/* Retrieve a description of this chart type.
+	   @return  its description */
+	description: function() {
+		return 'Compare relative sizes of values as contributions to the whole.';
+	},
+
+	/* Retrieve a list of the options that may be set for this chart type.
+	   @return  options list */
+	options: function() {
+		return this._options;
+	},
+
+	/* Actually draw the graph in this type's style.
+	   @param  graph  (object) the SVGGraph object */
+	drawGraph: function(graph) {
+		graph._drawChartBackground(true, true);
+		this._chart = graph._wrapper.group(graph._chartCont, {class_: 'chart'});
+		var dims = graph._getDims();
+		this._drawSeries(graph, dims);
+		graph._drawTitle();
+		graph._drawLegend();
+	},
+
+	/* Plot all the series. */
+	_drawSeries: function(graph, dims) {
+		var totals = graph._getTotals();
+		var numSer = graph._series.length;
+		var numVal = (numSer ? (graph._series[0])._values.length : 0);
+		var path = graph._wrapper.createPath();
+		var explode = graph._chartOptions.explode || [];
+		explode = (isArray(explode) ? explode : [explode]);
+		var explodeDist = graph._chartOptions.explodeDist || 10;
+		var pieGap = (numVal <= 1 ? 0 : graph._chartOptions.pieGap || 10);
+		var xBase = (dims[graph.W] - (numVal * pieGap) - pieGap) / numVal / 2;
+		var yBase = dims[graph.H] / 2;
+		var radius = Math.min(xBase, yBase) - (explode.length > 0 ? explodeDist : 0);
+		var gt = graph._wrapper.group(graph._chartCont, $.extend(
+			{class_: 'xAxisLabels', textAnchor: 'middle'}, graph.xAxis._labelFormat));
+		var gl = [];
+		for (var i = 0; i < numVal; i++) {
+			var cx = dims[graph.X] + xBase + (i * (2 * Math.min(xBase, yBase) + pieGap)) + pieGap;
+			var cy = dims[graph.Y] + yBase;
+			var curTotal = 0;
+			for (var j = 0; j < numSer; j++) {
+				var series = graph._series[j];
+				if (i == 0) {
+					gl[j] = graph._wrapper.group(this._chart, $.extend({class_: 'series' + j,
+						fill: series._fill, stroke: series._stroke,
+						strokeWidth: series._strokeWidth}, series._settings || {}));
+				}
+				if (series._values[i] == 0) {
+					continue;
+				}
+				var start = (curTotal / totals[i]) * 2 * Math.PI;
+				curTotal += series._values[i];
+				var end = (curTotal / totals[i]) * 2 * Math.PI;
+				var exploding = false;
+				for (var k = 0; k < explode.length; k++) {
+					if (explode[k] == j) {
+						exploding = true;
+						break;
+					}
+				}
+				var x = cx + (exploding ? explodeDist * Math.cos((start + end) / 2) : 0);
+				var y = cy + (exploding ? explodeDist * Math.sin((start + end) / 2) : 0);
+				var p = graph._wrapper.path(gl[j], path.reset().move(x, y).
+					line(x + radius * Math.cos(start), y + radius * Math.sin(start)).
+					arc(radius, radius, 0, (end - start < Math.PI ? 0 : 1), 1,
+					x + radius * Math.cos(end), y + radius * Math.sin(end)).close());
+				graph._showStatus(p, series._name,
+					roundNumber((end - start) / 2 / Math.PI * 100, 2));
+			}
+			if (graph.xAxis) {
+				graph._wrapper.text(gt, cx, dims[graph.Y] + dims[graph.H] + graph.xAxis._titleOffset,
+					graph.xAxis._labels[i])
+			}
+		}
+	}
+});
+
+//------------------------------------------------------------------------------
+
+/* Determine whether an object is an array. */
+function isArray(a) {
+	return (a && a.constructor == Array);
+}
+
+// Basic chart types
+$.svg.graphing.addChartType('column', new SVGColumnChart());
+$.svg.graphing.addChartType('stackedColumn', new SVGStackedColumnChart());
+$.svg.graphing.addChartType('row', new SVGRowChart());
+$.svg.graphing.addChartType('stackedRow', new SVGStackedRowChart());
+$.svg.graphing.addChartType('line', new SVGLineChart());
+$.svg.graphing.addChartType('pie', new SVGPieChart());
+
+})(jQuery)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/jquery.svgplot.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,817 @@
+/* http://keith-wood.name/svg.html
+   SVG plotting extension for jQuery v1.4.3.
+   Written by Keith Wood (kbwood{at}iinet.com.au) December 2008.
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses.
+   Please attribute the author if you use it. */
+
+(function($) { // Hide scope, no $ conflict
+
+$.svg.addExtension('plot', SVGPlot);
+
+/* Extension point for SVG plotting.
+   Access through svg.plot. */
+function SVGPlot(wrapper) {
+	this._wrapper = wrapper; // The attached SVG wrapper object
+	this._drawNow = false; // True for immediate update, false to wait for redraw call
+	// The plot title and settings
+	this._title = {value: '', offset: 25, settings: {textAnchor: 'middle'}};
+	this._area = [0.1, 0.1, 0.8, 0.9]; // The chart area: left, top, right, bottom,
+		// > 1 in pixels, <= 1 as proportion
+	this._areaFormat = {fill: 'none', stroke: 'black'}; // The formatting for the plot area
+	this._gridlines = []; // The formatting of the x- and y-gridlines
+	this._equalXY = true; // True for equal-sized x- and y-units, false to fill available space
+	this._functions = []; // The functions to be plotted, each is an object
+	this._onstatus = null; // The callback function for status updates
+	this._uuid = new Date().getTime();
+	this._plotCont = this._wrapper.svg(0, 0, 0, 0, {class_: 'svg-plot'}); // The main container for the plot
+	
+	this.xAxis = new SVGPlotAxis(this); // The main x-axis
+	this.xAxis.title('X', 20);
+	this.yAxis = new SVGPlotAxis(this); // The main y-axis
+	this.yAxis.title('Y', 20);
+	this.legend = new SVGPlotLegend(this); // The plot legend
+	this._drawNow = true;
+}
+
+$.extend(SVGPlot.prototype, {
+
+	/* Useful indexes. */
+	X: 0,
+	Y: 1,
+	W: 2,
+	H: 3,
+	L: 0,
+	T: 1,
+	R: 2,
+	B: 3,
+
+	/* Set or retrieve the container for the plot.
+	   @param  cont  (SVG element) the container for the plot
+	   @return  (SVGPlot) this plot object or
+	            (SVG element) the current container (if no parameters) */
+	container: function(cont) {
+		if (arguments.length == 0) {
+			return this._plotCont;
+		}
+		this._plotCont = cont;
+		return this;
+	},
+
+	/* Set or retrieve the main plotting area.
+	   @param  left    (number) > 1 is pixels, <= 1 is proportion of width or
+	                   (number[4]) for left, top, right, bottom
+	   @param  top     (number) > 1 is pixels, <= 1 is proportion of height
+	   @param  right   (number) > 1 is pixels, <= 1 is proportion of width
+	   @param  bottom  (number) > 1 is pixels, <= 1 is proportion of height
+	   @return  (SVGPlot) this plot object or
+	            (number[4]) the plotting area: left, top, right, bottom (if no parameters) */
+	area: function(left, top, right, bottom) {
+		if (arguments.length == 0) {
+			return this._area;
+		}
+		this._area = (isArray(left) ? left : [left, top, right, bottom]);
+		this._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the background of the plot area.
+	   @param  fill      (string) how to fill the area background
+	   @param  stroke    (string) the colour of the outline (optional)
+	   @param  settings  (object) additional formatting for the area background (optional)
+	   @return  (SVGPlot) this plot object or
+	            (object) the area format (if no parameters) */
+	format: function(fill, stroke, settings) {
+		if (arguments.length == 0) {
+			return this._areaFormat;
+		}
+		if (typeof stroke == 'object') {
+			settings = stroke;
+			stroke = null;
+		}
+		this._areaFormat = $.extend({fill: fill},
+			(stroke ? {stroke: stroke} : {}), settings || {});
+		this._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the gridlines formatting for the plot area.
+	   @param  xSettings  (string) the colour of the gridlines along the x-axis, or
+	                      (object) formatting for the gridlines along the x-axis, or
+						  null for none
+	   @param  ySettings  (string) the colour of the gridlines along the y-axis, or
+	                      (object) formatting for the gridlines along the y-axis, or
+						  null for none
+	   @return  (SVGPlot) this plot object or
+	            (object[2]) the gridlines formatting (if no parameters) */
+	gridlines: function(xSettings, ySettings) {
+		if (arguments.length == 0) {
+			return this._gridlines;
+		}
+		this._gridlines = [(typeof xSettings == 'string' ? {stroke: xSettings} : xSettings),
+			(typeof ySettings == 'string' ? {stroke: ySettings} : ySettings)];
+		if (this._gridlines[0] == null && this._gridlines[1] == null) {
+			this._gridlines = [];
+		}
+		this._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the equality of the x- and y-axes.
+	   @param  value  (boolean) true for equal x- and y-units, false to fill the available space
+	   @return  (SVGPlot) this plot object or
+	            (boolean) the current setting (if no parameters) */
+	equalXY: function(value) {
+		if (arguments.length == 0) {
+			return this._equalXY;
+		}
+		this._equalXY = value;
+		return this;
+	},
+
+	/* Set or retrieve the title of the plot and its formatting.
+	   @param  value     (string) the title
+	   @param  offset    (number) the vertical positioning of the title
+                          > 1 is pixels, <= 1 is proportion of width (optional)
+	   @param  colour    (string) the colour of the title (optional)
+	   @param  settings  (object) formatting for the title (optional)
+	   @return  (SVGPlot) this plot object or
+	            (object) value, offset, and settings for the title (if no parameters) */
+	title: function(value, offset, colour, settings) {
+		if (arguments.length == 0) {
+			return this._title;
+		}
+		if (typeof offset != 'number') {
+			settings = colour;
+			colour = offset;
+			offset = null;
+		}
+		if (typeof colour != 'string') {
+			settings = colour;
+			colour = null;
+		}
+		this._title = {value: value, offset: offset || this._title.offset,
+			settings: $.extend({textAnchor: 'middle'},
+			(colour ? {fill: colour} : {}), settings || {})};
+		this._drawPlot();
+		return this;
+	},
+
+	/* Add a function to be plotted on the plot.
+	   @param  name         (string) the name of this series (optional)
+	   @param  fn           (function) the function to be plotted
+	   @param  range        (number[2]) the range of values to plot (optional)
+	   @param  points       (number) the number of points to plot within this range (optional)
+	   @param  stroke       (string) the colour of the plotted lines (optional)
+	   @param  strokeWidth  (number) the width of the plotted lines (optional)
+	   @param  settings     (object) additional settings for the plotted values (optional)
+	   @return  (SVGPlot) this plot object */
+	addFunction: function(name, fn, range, points, stroke, strokeWidth, settings) {
+		this._functions.push(new SVGPlotFunction(
+			this, name, fn, range, points, stroke, strokeWidth, settings));
+		this._drawPlot();
+		return this;
+	},
+
+	/* Retrieve the function wrappers.
+	   @param  i  (number) the function index (optional)
+	   @return  (SVGPlotFunction) the specified function or
+	            (SVGPlotFunction[]) the list of functions */
+	functions: function(i) {
+		return (arguments.length > 0 ? this._functions[i] : null) || this._functions;
+	},
+
+	/* Suppress drawing of the plot until redraw() is called.
+	   @return  (SVGPlot) this plot object */
+	noDraw: function() {
+		this._drawNow = false;
+		return this;
+	},
+
+	/* Redraw the entire plot with the current settings and values.
+	   @return  (SVGPlot) this plot object */
+	redraw: function() {
+		this._drawNow = true;
+		this._drawPlot();
+		return this;
+	},
+
+	/* Set the callback function for status updates.
+	   @param  onstatus  (function) the callback function
+	   @return  (SVGPlot) this plot object */
+	status: function(onstatus) {
+		this._onstatus = onstatus;
+		return this;
+	},
+
+	/* Actually draw the plot (if allowed). */
+	_drawPlot: function() {
+		if (!this._drawNow) {
+			return;
+		}
+		while (this._plotCont.firstChild) {
+			this._plotCont.removeChild(this._plotCont.firstChild);
+		}
+		if (!this._plotCont.parent) {
+			this._wrapper._svg.appendChild(this._plotCont);
+		}
+		// Set sizes if not already there
+		if (!this._plotCont.width) {
+			this._plotCont.setAttribute('width',
+				parseInt(this._plotCont.getAttribute('width'), 10) || this._wrapper._width());
+		}
+		else if (this._plotCont.width.baseVal) {
+			this._plotCont.width.baseVal.value =
+				this._plotCont.width.baseVal.value || this._wrapper._width();
+		}
+		else {
+			this._plotCont.width = this._plotCont.width || this._wrapper._width();
+		}
+		if (!this._plotCont.height) {
+			this._plotCont.setAttribute('height',
+				parseInt(this._plotCont.getAttribute('height'), 10) || this._wrapper._height());
+		}
+		else if (this._plotCont.height.baseVal) {
+			this._plotCont.height.baseVal.value =
+				this._plotCont.height.baseVal.value || this._wrapper._height();
+		}
+		else {
+			this._plotCont.height = this._plotCont.height || this._wrapper._height();
+		}
+		this._drawChartBackground();
+		var dims = this._getDims();
+		var clip = this._wrapper.other(this._plotCont, 'clipPath', {id: 'clip' + this._uuid});
+		this._wrapper.rect(clip, dims[this.X], dims[this.Y], dims[this.W], dims[this.H]);
+		this._plot = this._wrapper.group(this._plotCont,
+			{class_: 'foreground', clipPath: 'url(#clip' + this._uuid + ')'});
+		this._drawAxis(true);
+		this._drawAxis(false);
+		for (var i = 0; i < this._functions.length; i++) {
+			this._plotFunction(this._functions[i], i);
+		}
+		this._drawTitle();
+		this._drawLegend();
+	},
+
+	/* Decode an attribute value.
+	   @param  node  the node to examine
+	   @param  name  the attribute name
+	   @return  the actual value */
+	_getValue: function(node, name) {
+		return (!node[name] ? parseInt(node.getAttribute(name), 10) :
+			(node[name].baseVal ? node[name].baseVal.value : node[name]));
+	},
+
+	/* Calculate the actual dimensions of the plot area.
+	    @param  area  (number[4]) the area values to evaluate (optional)
+		@return  (number[4]) an array of dimension values: left, top, width, height */
+	_getDims: function(area) {
+		var otherArea = (area != null);
+		area = area || this._area;
+		var availWidth = this._getValue(this._plotCont, 'width');
+		var availHeight = this._getValue(this._plotCont, 'height');
+		var left = (area[this.L] > 1 ? area[this.L] : availWidth * area[this.L]);
+		var top = (area[this.T] > 1 ? area[this.T] : availHeight * area[this.T]);
+		var width = (area[this.R] > 1 ? area[this.R] : availWidth * area[this.R]) - left;
+		var height = (area[this.B] > 1 ? area[this.B] : availHeight * area[this.B]) - top;
+		if (this._equalXY && !otherArea) {
+			var scale = Math.min(width / (this.xAxis._scale.max - this.xAxis._scale.min),
+				height / (this.yAxis._scale.max - this.yAxis._scale.min));
+			width = scale * (this.xAxis._scale.max - this.xAxis._scale.min);
+			height = scale * (this.yAxis._scale.max - this.yAxis._scale.min);
+		}
+		return [left, top, width, height];
+	},
+
+	/* Calculate the scaling factors for the plot area.
+	   @return  (number[2]) the x- and y-scaling factors */
+	_getScales: function() {
+		var dims = this._getDims();
+		return [dims[this.W] / (this.xAxis._scale.max - this.xAxis._scale.min),
+			dims[this.H] / (this.yAxis._scale.max - this.yAxis._scale.min)];
+	},
+
+	/* Draw the chart background, including gridlines.
+	   @param  noXGrid  (boolean) true to suppress the x-gridlines, false to draw them (optional)
+	   @param  noYGrid  (boolean) true to suppress the y-gridlines, false to draw them (optional)
+	   @return  (element) the background group element */
+	_drawChartBackground: function(noXGrid, noYGrid) {
+		var bg = this._wrapper.group(this._plotCont, {class_: 'background'});
+		var dims = this._getDims();
+		this._wrapper.rect(bg, dims[this.X], dims[this.Y], dims[this.W], dims[this.H], this._areaFormat);
+		if (this._gridlines[0] && this.yAxis._ticks.major && !noYGrid) {
+			this._drawGridlines(bg, true, this._gridlines[0], dims);
+		}
+		if (this._gridlines[1] && this.xAxis._ticks.major && !noXGrid) {
+			this._drawGridlines(bg, false, this._gridlines[1], dims);
+		}
+		return bg;
+	},
+
+	/* Draw one set of gridlines.
+	   @param  bg      (element) the background group element
+	   @param  horiz   (boolean) true if horizontal, false if vertical
+	   @param  format  (object) additional settings for the gridlines */
+	_drawGridlines: function(bg, horiz, format, dims) {
+		var g = this._wrapper.group(bg, format);
+		var axis = (horiz ? this.yAxis : this.xAxis);
+		var scales = this._getScales();
+		var major = Math.floor(axis._scale.min / axis._ticks.major) * axis._ticks.major;
+		major += (major <= axis._scale.min ? axis._ticks.major : 0);
+		while (major < axis._scale.max) {
+			var v = (horiz ? axis._scale.max - major : major - axis._scale.min) *
+				scales[horiz ? 1 : 0] + (horiz ? dims[this.Y] : dims[this.X]);
+			this._wrapper.line(g, (horiz ? dims[this.X] : v), (horiz ? v : dims[this.Y]),
+				(horiz ? dims[this.X] + dims[this.W] : v), (horiz ? v : dims[this.Y] + dims[this.H]));
+			major += axis._ticks.major;
+		}
+	},
+
+	/* Draw an axis, its tick marks, and title.
+	   @param  horiz  (boolean) true for x-axis, false for y-axis */
+	_drawAxis: function(horiz) {
+		var id = (horiz ? 'x' : 'y') + 'Axis';
+		var axis = (horiz ? this.xAxis : this.yAxis);
+		var axis2 = (horiz ? this.yAxis : this.xAxis);
+		var dims = this._getDims();
+		var scales = this._getScales();
+		var gl = this._wrapper.group(this._plot, $.extend({class_: id}, axis._lineFormat));
+		var gt = this._wrapper.group(this._plot, $.extend({class_: id + 'Labels',
+			textAnchor: (horiz ? 'middle' : 'end')}, axis._labelFormat));
+		var zero = (horiz ? axis2._scale.max : -axis2._scale.min) *
+			scales[horiz ? 1 : 0] + (horiz ? dims[this.Y] : dims[this.X]);
+		this._wrapper.line(gl, (horiz ? dims[this.X] : zero), (horiz ? zero : dims[this.Y]),
+			(horiz ? dims[this.X] + dims[this.W] : zero),
+			(horiz ? zero : dims[this.Y] + dims[this.H]));
+		if (axis._ticks.major) {
+			var size = axis._ticks.size;
+			var major = Math.floor(axis._scale.min / axis._ticks.major) * axis._ticks.major;
+			major = (major < axis._scale.min ? major + axis._ticks.major : major);
+			var minor = (!axis._ticks.minor ? axis._scale.max + 1 :
+				Math.floor(axis._scale.min / axis._ticks.minor) * axis._ticks.minor);
+			minor = (minor < axis._scale.min ? minor + axis._ticks.minor : minor);
+			var offsets = [(axis._ticks.position == 'nw' || axis._ticks.position == 'both' ? -1 : 0),
+				(axis._ticks.position == 'se' || axis._ticks.position == 'both' ? +1 : 0)];
+			while (major <= axis._scale.max || minor <= axis._scale.max) {
+				var cur = Math.min(major, minor);
+				var len = (cur == major ? size : size / 2);
+				var xy = (horiz ? cur - axis._scale.min : axis._scale.max - cur) *
+					scales[horiz ? 0 : 1] + (horiz ? dims[this.X] : dims[this.Y]);
+				this._wrapper.line(gl, (horiz ? xy : zero + len * offsets[0]),
+					(horiz ? zero + len * offsets[0] : xy),
+					(horiz ? xy : zero + len * offsets[1]),
+					(horiz ? zero + len * offsets[1] : xy));
+				if (cur == major && cur != 0) {
+					this._wrapper.text(gt, (horiz ? xy : zero - size),
+						(horiz ? zero - size : xy), '' + cur);
+				}
+				major += (cur == major ? axis._ticks.major : 0);
+				minor += (cur == minor ? axis._ticks.minor : 0);
+			}
+		}
+		if (axis._title) {
+			if (horiz) {
+				this._wrapper.text(this._plotCont, dims[this.X] - axis._titleOffset,
+					zero, axis._title, $.extend({textAnchor: 'end'}, axis._titleFormat || {}));
+			}
+			else {
+				this._wrapper.text(this._plotCont, zero,
+					dims[this.Y] + dims[this.H] + axis._titleOffset,
+					axis._title, $.extend({textAnchor : 'middle'}, axis._titleFormat || {}));
+			}
+		}
+	},
+
+	/* Plot an individual function. */
+	_plotFunction: function(fn, cur) {
+		var dims = this._getDims();
+		var scales = this._getScales();
+		var path = this._wrapper.createPath();
+		var range = fn._range || [this.xAxis._scale.min, this.xAxis._scale.max];
+		var xScale = (range[1] - range[0]) / fn._points;
+		var first = true;
+		for (var i = 0; i <= fn._points; i++) {
+			var x = range[0] + i * xScale;
+			if (x > this.xAxis._scale.max + xScale) {
+				break;
+			}
+			if (x < this.xAxis._scale.min - xScale) {
+				continue;
+			}
+			var px = (x - this.xAxis._scale.min) * scales[0] + dims[this.X];
+			var py = dims[this.H] - ((fn._fn(x) - this.yAxis._scale.min) * scales[1]) + dims[this.Y];
+			path[(first ? 'move' : 'line') + 'To'](px, py);
+			first = false;
+		}
+		var p = this._wrapper.path(this._plot, path,
+			$.extend({class_: 'fn' + cur, fill: 'none', stroke: fn._stroke,
+			strokeWidth: fn._strokeWidth}, fn._settings || {}));
+		this._showStatus(p, fn._name);
+	},
+
+	/* Draw the plot title - centred. */
+	_drawTitle: function() {
+		this._wrapper.text(this._plotCont, this._getValue(this._plotCont, 'width') / 2,
+			this._title.offset, this._title.value, this._title.settings);
+	},
+
+	/* Draw the chart legend. */
+	_drawLegend: function() {
+		if (!this.legend._show) {
+			return;
+		}
+		var g = this._wrapper.group(this._plotCont, {class_: 'legend'});
+		var dims = this._getDims(this.legend._area);
+		this._wrapper.rect(g, dims[this.X], dims[this.Y], dims[this.W], dims[this.H],
+			this.legend._bgSettings);
+		var horiz =  dims[this.W] > dims[this.H];
+		var numFn = this._functions.length;
+		var offset = (horiz ? dims[this.W] : dims[this.H]) / numFn;
+		var xBase = dims[this.X] + 5;
+		var yBase = dims[this.Y] + ((horiz ? dims[this.H] : offset) + this.legend._sampleSize) / 2;
+		for (var i = 0; i < numFn; i++) {
+			var fn = this._functions[i];
+			this._wrapper.rect(g, xBase + (horiz ? i * offset : 0),
+				yBase + (horiz ? 0 : i * offset) - this.legend._sampleSize,
+				this.legend._sampleSize, this.legend._sampleSize, {fill: fn._stroke});
+			this._wrapper.text(g, xBase + (horiz ? i * offset : 0) + this.legend._sampleSize + 5,
+				yBase + (horiz ? 0 : i * offset), fn._name, this.legend._textSettings);
+		}
+	},
+
+	/* Show the current value status on hover. */
+	_showStatus: function(elem, label) {
+		var status = this._onstatus;
+		if (this._onstatus) {
+			$(elem).hover(function(evt) { status.apply(this, [label]); },
+				function() { status.apply(this, ['']); });
+		}
+	}
+});
+
+/* Details about each plot function.
+   @param  plot         (SVGPlot) the owning plot
+   @param  name         (string) the name of this function (optional)
+   @param  fn           (function) the function to be plotted
+   @param  range        (number[2]) the range of values to be plotted (optional)
+   @param  points       (number) the number of points to plot within this range (optional)
+   @param  stroke       (string) the colour of the (out)line for the plot (optional)
+   @param  strokeWidth  (number) the width of the (out)line for the plot (optional)
+   @param  settings     (object) additional formatting settings (optional)
+   @return  (SVGPlotFunction) the new plot function object */
+function SVGPlotFunction(plot, name, fn, range, points, stroke, strokeWidth, settings) {
+	if (typeof name != 'string') {
+		settings = strokeWidth;
+		strokeWidth = stroke;
+		stroke = points;
+		points = range;
+		range = fn;
+		fn = name;
+		name = null;
+	}
+	if (!isArray(range)) {
+		settings = strokeWidth;
+		strokeWidth = stroke;
+		stroke = points;
+		points = range;
+		range = null;
+	}
+	if (typeof points != 'number') {
+		settings = strokeWidth;
+		strokeWidth = stroke;
+		stroke = points;
+		points = null;
+	}
+	if (typeof stroke != 'string') {
+		settings = strokeWidth;
+		strokeWidth = stroke;
+		stroke = null;
+	}
+	if (typeof strokeWidth != 'number') {
+		settings = strokeWidth;
+		strokeWidth = null;
+	}
+	this._plot = plot; // The owning plot
+	this._name = name || ''; // Display name
+	this._fn = fn || identity; // The actual function: y = fn(x)
+	this._range = range; // The range of values plotted
+	this._points = points || 100; // The number of points plotted
+	this._stroke = stroke || 'black'; // The line colour
+	this._strokeWidth = strokeWidth || 1; // The line width
+	this._settings = settings || {}; // Any other settings
+}
+
+$.extend(SVGPlotFunction.prototype, {
+
+	/* Set or retrieve the name for this function.
+	   @param  name    (string) the function's name
+	   @return  (SVGPlotFunction) this plot function object or
+	            (string) the function name (if no parameters) */
+	name: function(name) {
+		if (arguments.length == 0) {
+			return this._name;
+		}
+		this._name = name;
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the function to be plotted.
+	   @param  name  (string) the function's name (optional)
+	   @param  fn    (function) the function to be ploted
+	   @return  (SVGPlotFunction) this plot function object or
+	            (function) the actual function (if no parameters) */
+	fn: function(name, fn) {
+		if (arguments.length == 0) {
+			return this._fn;
+		}
+		if (typeof name == 'function') {
+			fn = name;
+			name = null;
+		}
+		this._name = name || this._name;
+		this._fn = fn;
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the range of values to be plotted.
+	   @param  min  (number) the minimum value to be plotted
+	   @param  max  (number) the maximum value to be plotted
+	   @return  (SVGPlotFunction) this plot function object or
+	            (number[2]) the value range (if no parameters) */
+	range: function(min, max) {
+		if (arguments.length == 0) {
+			return this._range;
+		}
+		this._range = (min == null ? null : [min, max]);
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the number of points to be plotted.
+	   @param  value  (number) the number of points to plot
+	   @return  (SVGPlotFunction) this plot function object or
+	            (number) the number of points (if no parameters) */
+	points: function(value) {
+		if (arguments.length == 0) {
+			return this._points;
+		}
+		this._points = value;
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the formatting for this function.
+	   @param  stroke       (string) the (out)line colour
+	   @param  strokeWidth  (number) the line's width (optional)
+	   @param  settings     (object) additional formatting settings for the function (optional)
+	   @return  (SVGPlotFunction) this plot function object or
+	            (object) formatting settings (if no parameters) */
+	format: function(stroke, strokeWidth, settings) {
+		if (arguments.length == 0) {
+			return $.extend({stroke: this._stroke,
+				strokeWidth: this._strokeWidth}, this._settings);
+		}
+		if (typeof strokeWidth != 'number') {
+			settings = strokeWidth;
+			strokeWidth = null;
+		}
+		this._stroke = stroke || this._stroke;
+		this._strokeWidth = strokeWidth || this._strokeWidth;
+		$.extend(this._settings, settings || {});
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Return to the parent plot. */
+	end: function() {
+		return this._plot;
+	}
+});
+
+/* Default function to plot.
+   @param  x  (number) the input value
+   @return  (number) the same value */
+function identity(x) {
+	return x;
+}
+
+/* Details about each plot axis.
+   @param  plot   (SVGPlot) the owning plot
+   @param  title  (string) the title of the axis
+   @param  min    (number) the minimum value displayed on this axis
+   @param  max    (number) the maximum value displayed on this axis
+   @param  major  (number) the distance between major ticks
+   @param  minor  (number) the distance between minor ticks (optional)
+   @return  (SVGPlotAxis) the new axis object */
+function SVGPlotAxis(plot, title, min, max, major, minor) {
+	this._plot = plot; // The owning plot
+	this._title = title || ''; // The plot's title
+	this._titleFormat = {}; // Formatting settings for the title
+	this._titleOffset = 0; // The offset for positioning the title
+	this._labelFormat = {}; // Formatting settings for the labels
+	this._lineFormat = {stroke: 'black', strokeWidth: 1}; // Formatting settings for the axis lines
+	this._ticks = {major: major || 10, minor: minor || 0, size: 10, position: 'both'}; // Tick mark options
+	this._scale = {min: min || 0, max: max || 100}; // Axis scale settings
+	this._crossAt = 0; // Where this axis crosses the other one. */
+}
+
+$.extend(SVGPlotAxis.prototype, {
+
+	/* Set or retrieve the scale for this axis.
+	   @param  min  (number) the minimum value shown
+	   @param  max  (number) the maximum value shown
+	   @return  (SVGPlotAxis) this axis object or
+	            (object) min and max values (if no parameters) */
+	scale: function(min, max) {
+		if (arguments.length == 0) {
+			return this._scale;
+		}
+		this._scale.min = min;
+		this._scale.max = max;
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the ticks for this axis.
+	   @param  major     (number) the distance between major ticks
+	   @param  minor     (number) the distance between minor ticks
+	   @param  size      (number) the length of the major ticks (minor are half) (optional)
+	   @param  position  (string) the location of the ticks:
+	                     'nw', 'se', 'both' (optional)
+	   @return  (SVGPlotAxis) this axis object or
+	            (object) major, minor, size, and position values (if no parameters) */
+	ticks: function(major, minor, size, position) {
+		if (arguments.length == 0) {
+			return this._ticks;
+		}
+		if (typeof size == 'string') {
+			position = size;
+			size = null;
+		}
+		this._ticks.major = major;
+		this._ticks.minor = minor;
+		this._ticks.size = size || this._ticks.size;
+		this._ticks.position = position || this._ticks.position;
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the title for this axis.
+	   @param  title   (string) the title text
+	   @param  offset  (number) the distance to offset the title position (optional)
+	   @param  colour  (string) how to colour the title (optional) 
+	   @param  format  (object) formatting settings for the title (optional)
+	   @return  (SVGPlotAxis) this axis object or
+	            (object) title, offset, and format values (if no parameters) */
+	title: function(title, offset, colour, format) {
+		if (arguments.length == 0) {
+			return {title: this._title, offset: this._titleOffset, format: this._titleFormat};
+		}
+		if (typeof offset != 'number') {
+			format = colour;
+			colour = offset;
+			offset = null;
+		}
+		if (typeof colour != 'string') {
+			format = colour;
+			colour = null;
+		}
+		this._title = title;
+		this._titleOffset = (offset != null ? offset : this._titleOffset);
+		if (colour || format) {
+			this._titleFormat = $.extend(format || {}, (colour ? {fill: colour} : {}));
+		}
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the label format for this axis.
+	   @param  colour  (string) how to colour the labels (optional) 
+	   @param  format  (object) formatting settings for the labels (optional)
+	   @return  (SVGPlotAxis) this axis object or
+	            (object) format values (if no parameters) */
+	format: function(colour, format) {
+		if (arguments.length == 0) {
+			return this._labelFormat;
+		}
+		if (typeof colour != 'string') {
+			format = colour;
+			colour = null;
+		}
+		this._labelFormat = $.extend(format || {}, (colour ? {fill: colour} : {}));
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the line formatting for this axis.
+	   @param  colour    (string) the line's colour
+	   @param  width     (number) the line's width (optional)
+	   @param  settings  (object) additional formatting settings for the line (optional)
+	   @return  (SVGPlotAxis) this axis object or
+	            (object) line formatting values (if no parameters) */
+	line: function(colour, width, settings) {
+		if (arguments.length == 0) {
+			return this._lineFormat;
+		}
+		if (typeof width != 'number') {
+			settings = width;
+			width = null;
+		}
+		$.extend(this._lineFormat, {stroke: colour, strokeWidth:
+			width || this._lineFormat.strokeWidth}, settings || {});
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Return to the parent plot. */
+	end: function() {
+		return this._plot;
+	}
+});
+
+/* Details about the plot legend.
+   @param  plot          (SVGPlot) the owning plot
+   @param  bgSettings    (object) additional formatting settings for the legend background (optional)
+   @param  textSettings  (object) additional formatting settings for the legend text (optional)
+   @return  (SVGPlotLegend) the new legend object */
+function SVGPlotLegend(plot, bgSettings, textSettings) {
+	this._plot = plot; // The owning plot
+	this._show = true; // Show the legend?
+	this._area = [0.9, 0.1, 1.0, 0.9]; // The legend area: left, top, right, bottom,
+		// > 1 in pixels, <= 1 as proportion
+	this._sampleSize = 15; // Size of sample box
+	this._bgSettings = bgSettings || {stroke: 'gray'}; // Additional formatting settings for the legend background
+	this._textSettings = textSettings || {}; // Additional formatting settings for the text
+}
+
+$.extend(SVGPlotLegend.prototype, {
+
+	/* Set or retrieve whether the legend should be shown.
+	   @param  show  (boolean) true to display it, false to hide it
+	   @return  (SVGPlotLegend) this legend object or
+	            (boolean) show the legend? (if no parameters) */
+	show: function(show) {
+		if (arguments.length == 0) {
+			return this._show;
+		}
+		this._show = show;
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve the legend area.
+	   @param  left    (number) > 1 is pixels, <= 1 is proportion of width or
+	                   (number[4]) for left, top, right, bottom
+	   @param  top     (number) > 1 is pixels, <= 1 is proportion of height
+	   @param  right   (number) > 1 is pixels, <= 1 is proportion of width
+	   @param  bottom  (number) > 1 is pixels, <= 1 is proportion of height
+	   @return  (SVGPlotLegend) this legend object or
+	            (number[4]) the legend area: left, top, right, bottom (if no parameters) */
+	area: function(left, top, right, bottom) {
+		if (arguments.length == 0) {
+			return this._area;
+		}
+		this._area = (isArray(left) ? left : [left, top, right, bottom]);
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Set or retrieve additional settings for the legend area.
+	   @param  sampleSize    (number) the size of the sample box to display (optional)
+	   @param  bgSettings    (object) additional formatting settings for the legend background
+	   @param  textSettings  (object) additional formatting settings for the legend text (optional)
+	   @return  (SVGPlotLegend) this legend object or
+	            (object) bgSettings and textSettings for the legend (if no parameters) */
+	settings: function(sampleSize, bgSettings, textSettings) {
+		if (arguments.length == 0) {
+			return {sampleSize: this._sampleSize, bgSettings: this._bgSettings,
+				textSettings: this._textSettings};
+		}
+		if (typeof sampleSize == 'object') {
+			textSettings = bgSettings;
+			bgSettings = sampleSize;
+			sampleSize = null;
+		}
+		this._sampleSize = sampleSize || this._sampleSize;
+		this._bgSettings = bgSettings;
+		this._textSettings = textSettings || this._textSettings;
+		this._plot._drawPlot();
+		return this;
+	},
+
+	/* Return to the parent plot. */
+	end: function() {
+		return this._plot;
+	}
+});
+
+//==============================================================================
+
+/* Determine whether an object is an array. */
+function isArray(a) {
+	return (a && a.constructor == Array);
+}
+
+})(jQuery)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/lion.svg	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,161 @@
+<?xml version="1.0"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+         "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="15cm" height="15cm">
+  <g transform="translate(100,10)">
+    <polygon fill="#f2cc99"
+             points=" 69,18 82,8 99,3 118,5 135,12 149,21 156,13 165,9 177,13 183,28 180,50 164,91 155,107 154,114 151,121 141,127 139,136 155,206 157,251 126,342 133,357 128,376 83,376 75,368 67,350 61,350 53,369 4,369 2,361 5,354 12,342 16,321 4,257 4,244 7,218 9,179 26,127 43,93 32,77 30,70 24,67 16,49 17,35 18,23 30,12 40,7 53,7 62,12"/>
+    <polygon fill="#e5b27f"
+             points=" 142,79 136,74 138,82 133,78 133,84 127,78 128,85 124,80 125,87 119,82 119,90 125,99 125,96 128,100 128,94 131,98 132,93 135,97 136,93 138,97 139,94 141,98 143,94 144,85"/>
+    <polygon fill="#eb8080"
+             points=" 127,101 132,100 137,99 144,101 143,105 135,110"/>
+    <polygon fill="#f2cc99"
+             points=" 178,229 157,248 139,296 126,349 137,356 158,357 183,342 212,332 235,288 235,261 228,252 212,250 188,251"/>
+    <g fill="#9c826b">
+      <polygon points=" 56,229 48,241 48,250 57,281 63,325 71,338 81,315 76,321 79,311 83,301 75,308 80,298 73,303 76,296 71,298 74,292 69,293 74,284 78,278 71,278 74,274 68,273 70,268 66,267 68,261 60,266 62,259 65,253 57,258 59,251 55,254 55,248 60,237 54,240 58,234 54,236"/>
+      <polygon points=" 74,363 79,368 81,368 85,362 89,363 92,370 96,373 101,372 108,361 110,371 113,373 116,371 120,358 122,363 123,371 126,371 129,367 132,357 135,361 130,376 127,377 94,378 84,376 76,371"/>
+      <polygon points=" 212,250 219,251 228,258 236,270 235,287 225,304 205,332 177,343 171,352 158,357 166,352 168,346 168,339 165,333 155,327 155,323 161,320 165,316 169,316 167,312 171,313 168,308 173,309 170,306 177,306 175,308 177,311 174,311 176,316 171,315 174,319 168,320 168,323 175,327 179,332 183,326 184,332 189,323 190,328 194,320 194,325 199,316 201,320 204,313 206,316 208,310 211,305 219,298 226,288 229,279 228,266 224,259 217,253"/>
+      <polygon points=" 151,205 151,238 149,252 141,268 128,282 121,301 130,300 126,313 118,324 116,337 120,346 133,352 133,340 137,333 145,329 156,327 153,319 153,291 157,271 170,259 178,277 193,250 174,216"/>
+      <polygon points=" 78,127 90,142 95,155 108,164 125,167 139,175 150,206 152,191 141,140 121,148 100,136"/>
+      <polygon points=" 21,58 35,63 38,68 32,69 42,74 40,79 47,80 54,83 45,94 34,81 32,73 24,66"/>
+      <polygon points=" 71,34 67,34 66,27 59,24 54,17 48,17 39,22 30,26 28,31 31,39 38,46 29,45 36,54 41,61 41,70 50,69 54,71 55,58 67,52 76,43 76,39 68,44"/>
+      <polygon points=" 139,74 141,83 143,89 144,104 148,104 155,106 154,86 157,77 155,72 150,77 144,77"/>
+      <polygon points=" 105,44 102,53 108,58 111,62 112,55"/>
+      <polygon points=" 141,48 141,54 144,58 139,62 137,66 136,59 137,52"/>
+      <polygon points=" 98,135 104,130 105,134 108,132 108,135 112,134 113,137 116,136 116,139 119,139 124,141 128,140 133,138 140,133 139,140 126,146 104,144"/>
+      <polygon points=" 97,116 103,119 103,116 111,118 116,117 122,114 127,107 135,111 142,107 141,114 145,118 149,121 145,125 140,124 127,121 113,125 100,124"/>
+      <polygon points=" 147,33 152,35 157,34 153,31 160,31 156,28 161,28 159,24 163,25 163,21 165,22 170,23 167,17 172,21 174,18 175,23 176,22 177,28 177,33 174,37 176,39 174,44 171,49 168,53 164,57 159,68 156,70 154,60 150,51 146,43 144,35"/>
+      <polygon points=" 85,72 89,74 93,75 100,76 105,75 102,79 94,79 88,76"/>
+      <polygon points=" 86,214 79,221 76,232 82,225 78,239 82,234 78,245 81,243 79,255 84,250 84,267 87,254 90,271 90,257 95,271 93,256 95,249 92,252 93,243 89,253 89,241 86,250 87,236 83,245 87,231 82,231 90,219 84,221"/>
+    </g>
+    <g fill="#ffcc7f">
+      <polygon points=" 93,68 96,72 100,73 106,72 108,66 105,63 100,62"/>
+      <polygon points=" 144,64 142,68 142,73 146,74 150,73 154,64 149,62"/>
+    </g>
+    <g fill="#9c826b">
+      <polygon points=" 57,91 42,111 52,105 41,117 53,112 46,120 53,116 50,124 57,119 55,127 61,122 60,130 67,126 66,134 71,129 72,136 77,130 76,137 80,133 82,138 86,135 96,135 94,129 86,124 83,117 77,123 79,117 73,120 75,112 68,116 71,111 65,114 69,107 63,110 68,102 61,107 66,98 61,103 63,97 57,99"/>
+      <polygon points=" 83,79 76,79 67,82 75,83 65,88 76,87 65,92 76,91 68,96 77,95 70,99 80,98 72,104 80,102 76,108 85,103 92,101 87,98 93,96 86,94 91,93 85,91 93,89 99,89 105,93 107,85 102,82 92,80"/>
+      <polygon points=" 109,77 111,83 109,89 113,94 117,90 117,81 114,78"/>
+      <polygon points=" 122,128 127,126 134,127 136,129 134,130 130,128 124,129"/>
+      <polygon points=" 78,27 82,32 80,33 82,36 78,37 82,40 78,42 81,46 76,47 78,49 74,50 82,52 87,50 83,48 91,46 86,45 91,42 88,40 92,37 86,34 90,31 86,29 89,26"/>
+      <polygon points=" 82,17 92,20 79,21 90,25 81,25 94,28 93,26 101,30 101,26 107,33 108,28 111,40 113,34 115,45 117,39 119,54 121,46 124,58 126,47 129,59 130,49 134,58 133,44 137,48 133,37 137,40 133,32 126,20 135,26 132,19 138,23 135,17 142,18 132,11 116,6 94,6 78,11 92,12 80,14 90,16"/>
+      <polygon points=" 142,234 132,227 124,223 115,220 110,225 118,224 127,229 135,236 122,234 115,237 113,242 121,238 139,243 121,245 111,254 95,254 102,244 104,235 110,229 100,231 104,224 113,216 122,215 132,217 141,224 145,230 149,240"/>
+      <polygon points=" 115,252 125,248 137,249 143,258 134,255 125,254"/>
+      <polygon points=" 114,212 130,213 140,219 147,225 144,214 137,209 128,207"/>
+      <polygon points=" 102,263 108,258 117,257 131,258 116,260 109,265"/>
+      <polygon points=" 51,241 35,224 40,238 23,224 31,242 19,239 28,247 17,246 25,250 37,254 39,263 44,271 47,294 48,317 51,328 60,351 60,323 53,262 47,246"/>
+      <polygon points=" 2,364 9,367 14,366 18,355 20,364 26,366 31,357 35,364 39,364 42,357 47,363 53,360 59,357 54,369 7,373"/>
+      <polygon points=" 7,349 19,345 25,339 18,341 23,333 28,326 23,326 27,320 23,316 25,311 20,298 15,277 12,264 9,249 10,223 3,248 5,261 15,307 17,326 11,343"/>
+      <polygon points=" 11,226 15,231 25,236 18,227"/>
+      <polygon points=" 13,214 19,217 32,227 23,214 16,208 15,190 24,148 31,121 24,137 14,170 8,189"/>
+      <polygon points=" 202,254 195,258 199,260 193,263 197,263 190,268 196,268 191,273 188,282 200,272 194,272 201,266 197,265 204,262 200,258 204,256"/>
+    </g>
+    <g fill="#845433">
+      <polygon points=" 151,213 165,212 179,225 189,246 187,262 179,275 176,263 177,247 171,233 163,230 165,251 157,264 146,298 145,321 133,326 143,285 154,260 153,240"/>
+      <polygon points=" 91,132 95,145 97,154 104,148 107,155 109,150 111,158 115,152 118,159 120,153 125,161 126,155 133,164 132,154 137,163 137,152 142,163 147,186 152,192 148,167 141,143 124,145 105,143"/>
+    </g>
+    <g fill="#9c826b">
+      <polygon points=" 31,57 23,52 26,51 20,44 23,42 21,36 22,29 25,23 24,32 30,43 26,41 30,50 26,48"/>
+      <polygon points=" 147,21 149,28 155,21 161,16 167,14 175,15 173,11 161,9"/>
+      <polygon points=" 181,39 175,51 169,57 171,65 165,68 165,75 160,76 162,91 171,71 180,51"/>
+      <polygon points=" 132,346 139,348 141,346 142,341 147,342 143,355 133,350"/>
+      <polygon points=" 146,355 151,352 155,348 157,343 160,349 151,356 147,357"/>
+      <polygon points=" 99,266 100,281 94,305 86,322 78,332 72,346 73,331 91,291"/>
+      <polygon points=" 20,347 32,342 45,340 54,345 45,350 42,353 38,350 31,353 29,356 23,350 19,353 15,349"/>
+      <polygon points=" 78,344 86,344 92,349 88,358 84,352"/>
+      <polygon points=" 93,347 104,344 117,345 124,354 121,357 116,351 112,351 108,355 102,351"/>
+    </g>
+    <g fill="#000000">
+      <polygon points=" 105,12 111,18 113,24 113,29 119,34 116,23 112,16"/>
+      <polygon points=" 122,27 125,34 127,43 128,34 125,29"/>
+      <polygon points=" 115,13 122,19 122,15 113,10"/>
+    </g>
+    <g fill="#ffe5b2">
+      <polygon points=" 116,172 107,182 98,193 98,183 90,199 89,189 84,207 88,206 87,215 95,206 93,219 91,230 98,216 97,226 104,214 112,209 104,208 113,202 126,200 139,207 132,198 142,203 134,192 142,195 134,187 140,185 130,181 136,177 126,177 125,171 116,180"/>
+      <polygon points=" 74,220 67,230 67,221 59,235 63,233 60,248 70,232 65,249 71,243 67,256 73,250 69,262 73,259 71,267 76,262 72,271 78,270 76,275 82,274 78,290 86,279 86,289 92,274 88,275 87,264 82,270 82,258 77,257 78,247 73,246 77,233 72,236"/>
+      <polygon points=" 133,230 147,242 148,250 145,254 138,247 129,246 142,245 138,241 128,237 137,238"/>
+      <polygon points=" 133,261 125,261 116,263 111,267 125,265"/>
+      <polygon points=" 121,271 109,273 103,279 99,305 92,316 85,327 83,335 89,340 97,341 94,336 101,336 96,331 103,330 97,327 108,325 99,322 109,321 100,318 110,317 105,314 110,312 107,310 113,308 105,306 114,303 105,301 115,298 107,295 115,294 108,293 117,291 109,289 117,286 109,286 118,283 112,281 118,279 114,278 119,276 115,274"/>
+      <polygon points=" 79,364 74,359 74,353 76,347 80,351 83,356 82,360"/>
+      <polygon points=" 91,363 93,356 97,353 103,355 105,360 103,366 99,371 94,368"/>
+      <polygon points=" 110,355 114,353 118,357 117,363 113,369 111,362"/>
+      <polygon points=" 126,354 123,358 124,367 126,369 129,361 129,357"/>
+      <polygon points=" 30,154 24,166 20,182 23,194 29,208 37,218 41,210 41,223 46,214 46,227 52,216 52,227 61,216 59,225 68,213 73,219 70,207 77,212 69,200 77,202 70,194 78,197 68,187 76,182 64,182 58,175 58,185 53,177 50,186 46,171 44,182 39,167 36,172 36,162 30,166"/>
+      <polygon points=" 44,130 41,137 45,136 43,150 48,142 48,157 53,150 52,164 60,156 61,169 64,165 66,175 70,167 74,176 77,168 80,183 85,172 90,182 93,174 98,181 99,173 104,175 105,169 114,168 102,163 95,157 94,166 90,154 87,162 82,149 75,159 72,148 68,155 67,143 62,148 62,138 58,145 56,133 52,142 52,128 49,134 47,125"/>
+      <polygon points=" 13,216 19,219 36,231 22,223 16,222 22,227 12,224 13,220 16,220"/>
+      <polygon points=" 10,231 14,236 25,239 27,237 19,234"/>
+      <polygon points=" 9,245 14,242 25,245 13,245"/>
+      <polygon points=" 33,255 26,253 18,254 25,256 18,258 27,260 18,263 27,265 19,267 29,270 21,272 29,276 21,278 30,281 22,283 31,287 24,288 32,292 23,293 34,298 26,299 37,303 32,305 39,309 33,309 39,314 34,314 40,318 34,317 40,321 34,321 41,326 33,326 40,330 33,332 39,333 33,337 42,337 54,341 49,337 52,335 47,330 50,330 45,325 49,325 45,321 48,321 45,316 46,306 45,286 43,274 36,261"/>
+      <polygon points=" 7,358 9,351 14,351 17,359 11,364"/>
+      <polygon points=" 44,354 49,351 52,355 49,361"/>
+      <polygon points=" 32,357 37,353 40,358 36,361"/>
+      <polygon points=" 139,334 145,330 154,330 158,334 154,341 152,348 145,350 149,340 147,336 141,339 139,345 136,342 136,339"/>
+      <polygon points=" 208,259 215,259 212,255 220,259 224,263 225,274 224,283 220,292 208,300 206,308 203,304 199,315 197,309 195,318 193,313 190,322 190,316 185,325 182,318 180,325 172,321 178,320 176,313 186,312 180,307 188,307 184,303 191,302 186,299 195,294 187,290 197,288 192,286 201,283 194,280 203,277 198,275 207,271 200,269 209,265 204,265 212,262"/>
+      <polygon points=" 106,126 106,131 109,132 111,134 115,132 115,135 119,133 118,137 123,137 128,137 133,134 136,130 136,127 132,124 118,128 112,128 106,126 106,126 106,126"/>
+      <polygon points=" 107,114 101,110 98,102 105,97 111,98 119,102 121,108 118,112 113,115"/>
+      <polygon points=" 148,106 145,110 146,116 150,118 152,111 151,107"/>
+      <polygon points=" 80,55 70,52 75,58 63,57 72,61 57,61 67,66 57,67 62,69 54,71 61,73 54,77 63,78 53,85 60,84 56,90 69,84 63,82 75,76 70,75 77,72 72,71 78,69 72,66 81,67 78,64 82,63 80,60 86,62"/>
+      <polygon points=" 87,56 91,52 96,50 102,56 98,56 92,60"/>
+      <polygon points=" 85,68 89,73 98,76 106,74 96,73 91,70"/>
+      <polygon points=" 115,57 114,64 111,64 115,75 122,81 122,74 126,79 126,74 131,78 130,72 133,77 131,68 126,61 119,57"/>
+      <polygon points=" 145,48 143,53 147,59 151,59 150,55"/>
+      <polygon points=" 26,22 34,15 43,10 52,10 59,16 47,15 32,22"/>
+      <polygon points=" 160,19 152,26 149,34 154,33 152,30 157,30 155,26 158,27 157,23 161,23"/>
+    </g>
+    <g fill="#000000">
+      <polygon points=" 98,117 105,122 109,122 105,117 113,120 121,120 130,112 128,108 123,103 123,99 128,101 132,106 135,109 142,105 142,101 145,101 145,91 148,101 145,105 136,112 135,116 143,124 148,120 150,122 142,128 133,122 121,125 112,126 103,125 100,129 96,124"/>
+      <polygon points=" 146,118 152,118 152,115 149,115"/>
+      <polygon points=" 148,112 154,111 154,109 149,109"/>
+      <polygon points=" 106,112 108,115 114,116 118,114"/>
+      <polygon points=" 108,108 111,110 116,110 119,108"/>
+      <polygon points=" 106,104 109,105 117,106 115,104"/>
+      <polygon points=" 50,25 41,26 34,33 39,43 49,58 36,51 47,68 55,69 54,59 61,57 74,46 60,52 67,42 57,48 61,40 54,45 60,36 59,29 48,38 52,30 47,32"/>
+      <polygon points=" 147,34 152,41 155,49 161,53 157,47 164,47 158,43 168,44 159,40 164,37 169,37 164,33 169,34 165,28 170,30 170,25 173,29 175,27 176,32 173,36 175,39 172,42 172,46 168,49 170,55 162,57 158,63 155,58 153,50 149,46"/>
+      <polygon points=" 155,71 159,80 157,93 157,102 155,108 150,101 149,93 154,101 152,91 151,83 155,79"/>
+      <polygon points=" 112,78 115,81 114,91 112,87 113,82"/>
+      <polygon points=" 78,28 64,17 58,11 47,9 36,10 28,16 21,26 18,41 20,51 23,61 33,65 28,68 37,74 36,81 43,87 48,90 43,100 40,98 39,90 31,80 30,72 22,71 17,61 14,46 16,28 23,17 33,9 45,6 54,6 65,12"/>
+      <polygon points=" 67,18 76,9 87,5 101,2 118,3 135,8 149,20 149,26 144,19 132,12 121,9 105,7 89,8 76,14 70,20"/>
+      <polygon points=" 56,98 48,106 56,103 47,112 56,110 52,115 57,113 52,121 62,115 58,123 65,119 63,125 69,121 68,127 74,125 74,129 79,128 83,132 94,135 93,129 85,127 81,122 76,126 75,121 71,124 71,117 66,121 66,117 62,117 64,112 60,113 60,110 57,111 61,105 57,107 60,101 55,102"/>
+      <polygon points=" 101,132 103,138 106,134 106,139 112,136 111,142 115,139 114,143 119,142 125,145 131,142 135,138 140,134 140,129 143,135 145,149 150,171 149,184 145,165 141,150 136,147 132,151 131,149 126,152 125,150 121,152 117,148 111,152 110,148 105,149 104,145 98,150 96,138 94,132 94,130 98,132"/>
+      <polygon points=" 41,94 32,110 23,132 12,163 6,190 7,217 5,236 3,247 9,230 12,211 12,185 18,160 26,134 35,110 43,99"/>
+      <polygon points=" 32,246 41,250 50,257 52,267 53,295 53,323 59,350 54,363 51,365 44,366 42,360 40,372 54,372 59,366 62,353 71,352 75,335 73,330 66,318 68,302 64,294 67,288 63,286 63,279 59,275 58,267 56,262 50,247 42,235 44,246 32,236 35,244"/>
+      <polygon points=" 134,324 146,320 159,322 173,327 179,337 179,349 172,355 158,357 170,350 174,343 170,333 163,328 152,326 134,329"/>
+      <polygon points=" 173,339 183,334 184,338 191,329 194,332 199,323 202,325 206,318 209,320 213,309 221,303 228,296 232,289 234,279 233,269 230,262 225,256 219,253 208,252 198,252 210,249 223,250 232,257 237,265 238,277 238,291 232,305 221,323 218,335 212,342 200,349 178,348"/>
+      <polygon points=" 165,296 158,301 156,310 156,323 162,324 159,318 162,308 162,304"/>
+      <polygon points=" 99,252 105,244 107,234 115,228 121,228 131,235 122,233 113,235 109,246 121,239 133,243 121,243 110,251"/>
+      <polygon points=" 117,252 124,247 134,249 136,253 126,252"/>
+      <polygon points=" 117,218 132,224 144,233 140,225 132,219 117,218 117,218 117,218"/>
+      <polygon points=" 122,212 134,214 143,221 141,213 132,210"/>
+      <polygon points=" 69,352 70,363 76,373 86,378 97,379 108,379 120,377 128,378 132,373 135,361 133,358 132,366 127,375 121,374 121,362 119,367 117,374 110,376 110,362 107,357 106,371 104,375 97,376 90,375 90,368 86,362 83,364 86,369 85,373 78,370 73,362 71,351"/>
+      <polygon points=" 100,360 96,363 99,369 102,364"/>
+      <polygon points=" 115,360 112,363 114,369 117,364"/>
+      <polygon points=" 127,362 125,364 126,369 128,365"/>
+      <polygon points=" 5,255 7,276 11,304 15,320 13,334 6,348 2,353 0,363 5,372 12,374 25,372 38,372 44,369 42,367 36,368 31,369 30,360 27,368 20,370 16,361 15,368 10,369 3,366 3,359 6,352 11,348 17,331 19,316 12,291 9,274"/>
+      <polygon points=" 10,358 7,362 10,366 11,362"/>
+      <polygon points=" 25,357 22,360 24,366 27,360"/>
+      <polygon points=" 37,357 34,361 36,365 38,361"/>
+      <polygon points=" 49,356 46,359 47,364 50,360"/>
+      <polygon points=" 130,101 132,102 135,101 139,102 143,103 142,101 137,100 133,100"/>
+      <polygon points=" 106,48 105,52 108,56 109,52"/>
+      <polygon points=" 139,52 139,56 140,60 142,58 141,56"/>
+      <polygon points=" 25,349 29,351 30,355 33,350 37,348 42,351 45,347 49,345 44,343 36,345"/>
+      <polygon points=" 98,347 105,351 107,354 109,349 115,349 120,353 118,349 113,346 104,346"/>
+      <polygon points=" 83,348 87,352 87,357 89,351 87,348"/>
+      <polygon points=" 155,107 163,107 170,107 186,108 175,109 155,109"/>
+      <polygon points=" 153,114 162,113 175,112 192,114 173,114 154,115"/>
+      <polygon points=" 152,118 164,120 180,123 197,129 169,123 151,120"/>
+      <polygon points=" 68,109 87,106 107,106 106,108 88,108"/>
+      <polygon points=" 105,111 95,112 79,114 71,116 85,115 102,113"/>
+      <polygon points=" 108,101 98,99 87,99 78,99 93,100 105,102"/>
+      <polygon points=" 85,63 91,63 97,60 104,60 108,62 111,69 112,75 110,74 108,71 103,73 106,69 105,65 103,64 103,67 102,70 99,70 97,66 94,67 97,72 88,67 84,66"/>
+      <polygon points=" 140,74 141,66 144,61 150,61 156,62 153,70 150,73 152,65 150,65 151,68 149,71 146,71 144,66 143,70 143,74"/>
+      <polygon points=" 146,20 156,11 163,9 172,9 178,14 182,18 184,32 182,42 182,52 177,58 176,67 171,76 165,90 157,105 160,92 164,85 168,78 167,73 173,66 172,62 175,59 174,55 177,53 180,46 181,29 179,21 173,13 166,11 159,13 153,18 148,23"/>
+      <polygon points=" 150,187 148,211 150,233 153,247 148,267 135,283 125,299 136,292 131,313 122,328 122,345 129,352 133,359 133,367 137,359 148,356 140,350 131,347 129,340 132,332 140,328 137,322 140,304 154,265 157,244 155,223 161,220 175,229 186,247 185,260 176,275 178,287 185,277 188,261 196,253 189,236 174,213"/>
+      <polygon points=" 147,338 142,341 143,345 141,354 147,343"/>
+      <polygon points=" 157,342 156,349 150,356 157,353 163,346 162,342"/>
+      <polygon points=" 99,265 96,284 92,299 73,339 73,333 87,300"/>
+    </g>
+  </g>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/svg/svgBasics.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,153 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+     "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        <title>jQuery SVG Basics</title>
+
+<style type="text/css">
+
+@import "jquery.svg.css";
+
+#svgbasics { position: absolute; border: 1px solid blue; }
+
+#img img {width: 400px; }
+
+</style>
+
+<script type="text/javascript" src="../dlGeometry.js"></script>
+<script type="text/javascript" src="../jquery-1.4.4.js"></script>
+<script type="text/javascript" src="jquery.svg.js"></script>
+<script type="text/javascript">
+
+var $resDiv;
+
+$(function() {
+    var geom = dlGeometry();
+    var svg = $('#svgbasics');
+    var $div = $('#img img');
+    var divrect = geom.rectangle($div);
+    divrect.addPosition({x: -1, y: -1}).adjustDiv(svg);
+    svg.svg({onLoad: drawInitial});
+	$('button').click(drawShape);
+	$resDiv = $('div#res');
+	console.log($resDiv);
+});
+
+function drawInitial(svg) {
+    // svg.configure({viewBox: '0 0 400 300' }, true);
+    svg.configure({transform: 'scale(0.5)' }, true);
+	svg.circle(75, 75, 50, {fill: 'none', stroke: 'red', 'stroke-width': 3});
+	var g = svg.group({stroke: 'black', 'stroke-width': 2});
+	svg.line(g, 15, 75, 135, 75);
+	svg.line(g, 75, 15, 75, 135);
+	var g = svg.group({stroke: 'yellow', 'stroke-width': 4});
+	svg.line(g, 0, 0, 400, 0);
+	svg.line(g, 0, 0, 0, 300);
+	svg.line(g, 400, 0, 400, 300);
+	svg.line(g, 400, 300, 0, 300);
+	// svg.configure({viewPort: '0 0 100 100', overflow: 'visible' }, false);
+
+}
+
+var colours = ['purple', 'red', 'orange', 'yellow', 'lime', 'green', 'blue', 'navy', 'black'];
+
+var x=0,y=0,w=400,h=300;
+
+function setViewBox(svg) {
+    var s = [x,y,w,h].join(' ');
+    svg.configure({viewBox: s }, true);
+    $resDiv.text(s);
+}
+
+
+function drawShape() {
+	var shape = this.id;
+	var svg = $('#svgbasics').svg('get');
+	if (shape == 'rect') {
+		svg.rect(random(300), random(200), random(100) + 100, random(100) + 100,
+			{fill: colours[random(9)], stroke: colours[random(9)],
+			'stroke-width': random(5) + 1});
+	}
+	else if (shape == 'line') {
+		svg.line(random(400), random(300), random(400), random(300),
+			{stroke: colours[random(9)], 'stroke-width': random(5) + 1});
+	}
+	else if (shape == 'circle') {
+		svg.circle(random(300) + 50, random(200) + 50, random(80) + 20,
+			{fill: colours[random(9)], stroke: colours[random(9)],
+			'stroke-width': random(5) + 1});
+	}
+	else if (shape == 'ellipse') {
+		svg.ellipse(random(300) + 50, random(200) + 50, random(80) + 20, random(80) + 20,
+			{fill: colours[random(9)], stroke: colours[random(9)],
+			'stroke-width': random(5) + 1});
+	}
+	else if (shape == 'clear') {
+		svg.clear();
+	}
+	else if (shape == 'x+') {
+	    x+=10; 
+		setViewBox(svg);
+	}
+	else if (shape == 'x-') {
+	    x-=10; 
+		setViewBox(svg);
+	}
+	else if (shape == 'y+') {
+	    y+=10; 
+		setViewBox(svg);
+	}
+	else if (shape == 'y-') {
+	    y-=10; 
+		setViewBox(svg);
+	}
+	else if (shape == 'w+') {
+	    w+=10; 
+		setViewBox(svg);
+	}
+	else if (shape == 'w-') {
+	    w-=10; 
+		setViewBox(svg);
+	}
+	else if (shape == 'h+') {
+	    h+=10; 
+		setViewBox(svg);
+	}
+	else if (shape == 'h-') {
+	    h-=10; 
+		setViewBox(svg);
+	}
+	
+}
+
+function random(range) {
+	return Math.floor(Math.random() * range);
+}
+</script>
+    </head>
+    <body>
+        <h1>jQuery SVG</h1>
+        <div id="img">
+            <img src="peterskuppel.jpg" />
+        </div>
+        <div id="svgbasics"></div>
+        <p>
+            <button id="rect">Add rectangle</button>
+            <button id="line">Add line</button>
+            <button id="circle">Add circle</button>
+            <button id="ellipse">Add ellipse</button>
+            <button id="x+">x+</button>
+            <button id="x-">x-</button>
+            <button id="y+">y+</button>
+            <button id="y-">y-</button>
+            <button id="w+">w+</button>
+            <button id="w-">w-</button>
+            <button id="h+">h+</button>
+            <button id="h-">h-</button>
+            <button id="clear">Clear</button>
+        </p>
+        <div id="res"/>
+    </body>
+</html>
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_flat_0_aaaaaa_40x100.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_flat_75_ffffff_40x100.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_glass_55_fbf9ee_1x400.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_glass_65_ffffff_1x400.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_glass_75_dadada_1x400.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_glass_75_e6e6e6_1x400.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_glass_95_fef1ec_1x400.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-icons_222222_256x240.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-icons_2e83ff_256x240.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-icons_454545_256x240.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-icons_888888_256x240.png has changed
Binary file client/src/main/webapp/jquery/ui/images/ui-icons_cd0a0a_256x240.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery-test-embedded.SLIDER.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Digilib jQuery Test: embedded</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+
+            div.digilib {
+                /* padding for buttons and bird-div */
+                padding-right: 18px;
+                padding-bottom: 100px;
+                /* width: 220px; */
+            }
+
+            td {
+                vertical-align: top;
+                }
+
+            #debug {
+                background-color: beige;
+                position: absolute;
+                top: 400px;
+                padding: 0px 10px;
+                font-family: Arial;
+                font-size: 9pt;
+                }
+
+            div._log {
+                color: grey;
+                }
+
+            div._debug {
+                color: darkgreen;
+                }
+
+            div._error {
+                color: red;
+                }
+
+            div#test:hover {
+                background-color: cornsilk;
+                }
+
+        </style>
+
+        <script type="text/javascript" src="jquery-1.4.4.js"></script>
+
+        <script type="text/javascript" src="jquery.ui.core.js"></script>
+        <script type="text/javascript" src="jquery.ui.mouse.js"></script>
+        <script type="text/javascript" src="jquery.ui.button.js"></script>
+        <script type="text/javascript" src="jquery.ui.draggable.js"></script>
+        <script type="text/javascript" src="jquery.ui.position.js"></script>
+        <script type="text/javascript" src="jquery.ui.resizable.js"></script>
+        <script type="text/javascript" src="jquery.ui.widget.js"></script>
+        <script type="text/javascript" src="jquery.ui.dialog.js"></script>
+        <script type="text/javascript" src="jquery.ui.slider.js"></script>
+
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                 $('div.digilib').digilib({
+                    interactionMode : 'embedded',
+                    birdDivWidth : 100, 
+                    birdDivHeight : 100
+                    });
+
+                 $('div.digilib').each(function(){
+                         console.log($(this).data('digilib').settings);
+                    });
+
+            });
+
+        </script>
+    </head>
+
+    <body>
+        <table>
+            <tr>
+                <td>
+                    <div id="digilib-1" class="digilib single">
+                        <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/&amp;pn=1" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-2" class="digilib">
+                        <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/ferrara" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-3" class="digilib">
+                        <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/weide" />
+                    </div>
+                </td>
+
+                <td>
+                    <div id="digilib-4" class="digilib">
+                        <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/HansHolbein-NikolausKratzer" />
+                    </div>
+                </td>
+            </tr>
+        </table>
+        <div id="debug">DEBUG</div>
+        <div id="test">
+            <img id="test" src="img/black-glass-16.png"></img>
+            <img id="test2" src="img/black-glass-32.png"></img>
+        </div>
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery-test-full.SLIDER.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Digilib jQuery Test: fullscreen</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+
+        </style>
+
+        <script type="text/javascript" src="jquery-1.4.4.js"></script>
+
+        <script type="text/javascript" src="jquery.ui.core.js"></script>
+        <script type="text/javascript" src="jquery.ui.widget.js"></script>
+        <script type="text/javascript" src="jquery.ui.mouse.js"></script>
+        <script type="text/javascript" src="jquery.ui.button.js"></script>
+        <script type="text/javascript" src="jquery.ui.draggable.js"></script>
+        <script type="text/javascript" src="jquery.ui.position.js"></script>
+        <script type="text/javascript" src="jquery.ui.resizable.js"></script>
+        <script type="text/javascript" src="jquery.ui.dialog.js"></script>
+        <script type="text/javascript" src="jquery.ui.slider.js"></script>
+
+        <script type="text/javascript" src="dlGeometry.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+        <link rel="stylesheet" type="text/css" href="jquery-ui-1.8.9.custom.css" />
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'fullscreen',
+                    scalerBaseUrl : 'http://digilib.biblhertz.it/digilib04/servlet/Scaler'
+                    };
+                $('div.digilib').digilib(opts);
+            });
+
+        </script>
+    </head>
+
+    <body>
+
+        <div id="digilib-1" class="digilib">
+            <img src="http://digilib.biblhertz.it/digilib04/servlet/Scaler?dw=200&amp;dh=200&amp;fn=/digisprint/jquery/FransHals-WillemVanHeythuysen" />
+        </div>
+    </body>
+</html>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery-ui-1.8.9.custom.css	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,573 @@
+/*
+ * jQuery UI CSS Framework 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.9
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.digilib.SLIDER.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,1613 @@
+/* Copyright (c) 2011 Martin Raspe, Robert Casties
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+Authors:
+  Martin Raspe, Robert Casties, 11.1.2011
+*/
+
+/**
+ * digilib jQuery plugin
+**/ 
+
+
+/* jslint browser: true, debug: true, forin: true
+*/
+
+// fallback for console.log calls
+if (typeof(console) === 'undefined') {
+    var console = {
+        log : function(){}, 
+        debug : function(){}, 
+        error : function(){}
+        };
+    var customConsole = true;
+}
+
+(function($) {
+    var buttons = {
+        reference : {
+            onclick : "reference",
+            tooltip : "get a reference URL",
+            img : "reference.png"
+            },
+        zoomin : {
+            onclick : ["zoomBy", 1.4],
+            tooltip : "zoom in",
+            img : "zoom-in.png"
+            },
+        zoomout : {
+            onclick : ["zoomBy", 0.7],
+            tooltip : "zoom out",
+            img : "zoom-out.png"
+            },
+        zoomarea : {
+            onclick : "zoomArea",
+            tooltip : "zoom area",
+            img : "zoom-area.png"
+            },
+        zoomfull : {
+            onclick : "zoomFull",
+            tooltip : "view the whole image",
+            img : "zoom-full.png"
+            },
+        pagewidth : {
+            onclick : ["zoomFull", "width"],
+            tooltip : "page width",
+            img : "pagewidth.png"
+            },
+        back : {
+            onclick : ["gotoPage", "-1"],
+            tooltip : "goto previous image",
+            img : "back.png"
+            },
+        fwd : {
+            onclick : ["gotoPage", "+1"],
+            tooltip : "goto next image",
+            img : "fwd.png"
+            },
+        page : {
+            onclick : "gotoPage",
+            tooltip : "goto image number",
+            img : "page.png"
+            },
+        bird : {
+            onclick : "showBirdDiv",
+            tooltip : "show bird's eye view",
+            img : "birds-eye.png"
+            },
+        help : {
+            onclick : "showAboutDiv",
+            tooltip : "about Digilib",
+            img : "help.png"
+            },
+        reset : {
+            onclick : "reset",
+            tooltip : "reset image",
+            img : "reset.png"
+            },
+        mark : {
+            onclick : "setMark",
+            tooltip : "set a mark",
+            img : "mark.png"
+            },
+        delmark : {
+            onclick : "removeMark",
+            tooltip : "delete the last mark",
+            img : "delmark.png"
+            },
+        hmir : {
+            onclick : ["mirror", "h"],
+            tooltip : "mirror horizontally",
+            img : "mirror-horizontal.png"
+            },
+        vmir : {
+            onclick : ["mirror", "v"],
+            tooltip : "mirror vertically",
+            img : "mirror-vertical.png"
+            },
+        rot : {
+            onclick : "rotate",
+            tooltip : "rotate image",
+            img : "rotate.png"
+            },
+        brgt : {
+            onclick : "brightness",
+            tooltip : "set brightness",
+            img : "brightness.png"
+            },
+        cont : {
+            onclick : "contrast",
+            tooltip : "set contrast",
+            img : "contrast.png"
+            },
+        rgb : {
+            onclick : "javascript:setParamWin('rgb', '...')",
+            tooltip : "set rgb values",
+            img : "rgb.png"
+            },
+        quality : {
+            onclick : "setQuality",
+            tooltip : "set image quality",
+            img : "quality.png"
+            },
+        size : {
+            onclick : "javascript:toggleSizeMenu()",
+            tooltip : "set page size",
+            img : "size.png"
+            },
+        calibrationx : {
+            onclick : "javascript:calibrate('x')",
+            tooltip : "calibrate screen x-ratio",
+            img : "calibration-x.png"
+            },
+        scale : {
+            onclick : "javascript:toggleScaleMenu()",
+            tooltip : "change image scale",
+            img : "original-size.png"
+            },
+        toggleoptions : {
+            onclick : "moreButtons",
+            tooltip : "more options",
+            img : "options.png"
+            },
+        moreoptions : {
+            onclick : ["moreButtons", "+1"],
+            tooltip : "more options",
+            img : "options.png"
+            },
+        lessoptions : {
+            onclick : ["moreButtons", "-1"],
+            tooltip : "less options",
+            img : "options.png"
+            },
+        SEP : {
+            img : "sep.png"
+            }
+        };
+
+    var defaults = {
+        // version of this script
+        'version' : 'jquery.digilib.js 0.9',
+        // logo url
+        'logoUrl' : '../img/digilib-logo-text1.png',
+        // homepage url (behind logo)
+        'homeUrl' : 'http://digilib.berlios.de',
+        // base URL to digilib viewer (for reference URLs)
+        'digilibBaseUrl' : null,
+        // base URL to Scaler servlet
+        'scalerBaseUrl' : null,
+        // list of Scaler parameters
+        'scalerParamNames' : ['fn','pn','dw','dh','ww','wh','wx','wy','ws','mo',
+                              'rot','cont','brgt','rgbm','rgba','ddpi','ddpix','ddpiy'],
+        // Scaler parameter defaults
+        'pn' : 1,
+        'ww' : 1.0,
+        'wh' : 1.0,
+        'wx' : 0.0,
+        'wy' : 0.0,
+        'ws' : 1.0,
+        'mo' : '',
+        'rot' : 0,
+        'cont' : 0,
+        'brgt' : 0,
+        'rgbm' : '0/0/0',
+        'rgba' : '0/0/0',
+        'ddpi' : null,
+        'ddpix' : null,
+        'ddpiy' : null,
+        // list of digilib parameters
+        'digilibParamNames' : ['fn','pn','ww','wh','wx','wy','ws','mo','rot','cont','brgt','rgbm','rgba','mk','clop'],
+        // digilib parameter defaults
+        'mk' : '',
+        'clop' : '',
+        // mode of operation: 
+        // fullscreen = take parameters from page URL, keep state in page URL
+        // embedded = take parameters from Javascript options, keep state inside object 
+        'interactionMode' : 'fullscreen',
+        // buttons
+        'buttons' : buttons,
+        // defaults for digilib buttons
+        'buttonSettings' : {
+            'fullscreen' : {
+                // path to button images (must end with a slash)
+                'imagePath' : 'img/fullscreen/',
+                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","bird","help","reset","toggleoptions"],
+                'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","size","calibrationx","scale","toggleoptions"],
+                'buttonSets' : ['standardSet', 'specialSet']
+                },
+            'embedded' : {
+                'imagePath' : 'img/embedded/16/',
+                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","bird","help","reset","toggleoptions"],
+                'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","toggleoptions"],
+                'buttonSets' : ['standardSet', 'specialSet']
+                }
+        },
+        // number of visible button groups
+        'visibleButtonSets' : 1,
+        // is birdView shown?
+        'isBirdDivVisible' : false,
+        // dimensions of bird's eye div
+        'birdDivWidth' : 200, 
+        'birdDivHeight' : 200,
+        // parameters used by bird's eye div
+        'birdDivParams' : ['fn','pn','dw','dh'],
+        // style of the zoom area indicator in the bird's eye div 
+        'birdIndicatorStyle' : {'border' : '2px solid #ff0000' },
+        // style of zoom area "rubber band"
+        'zoomrectStyle' : {'border' : '2px solid #ff0000' },
+        // is the "about" window shown?
+        'isAboutDivVisible' : false,
+        // maximum width of background image for drag-scroll
+        'maxBgSize' : 10000
+
+        };
+
+    // affine geometry classes
+    var geom = dlGeometry();
+
+    var FULL_AREA = geom.rectangle(0, 0, 1, 1);
+
+    var actions = {
+        // init: digilib initialization
+        init : function(options) {
+            // settings for this digilib instance are merged from defaults and options
+            var settings = $.extend({}, defaults, options);
+            var isFullscreen = settings.interactionMode === 'fullscreen';
+            var queryParams = {};
+            if (isFullscreen) {
+                queryParams = parseQueryParams();
+                // check scalerBaseUrl
+                if (settings.scalerBaseUrl == null) {
+                    // try the host this came from
+                    var h = window.location.host;
+                    if (window.location.host) {
+                        var url = window.location.href;
+                        // assume the page lives in [webapp]/jquery/
+                        var pos = url.indexOf('jquery/');
+                        if (pos > 0) {
+                            settings.scalerBaseUrl = url.substring(0, pos) + 'servlet/Scaler';
+                        }
+                    }
+                }
+            }
+            return this.each(function() {
+                var $elem = $(this);
+                var data = $elem.data('digilib');
+                var params, elemSettings;
+                // if the plugin hasn't been initialized yet
+                if (!data) {
+                    // merge query parameters
+                    if (isFullscreen) {
+                        params = queryParams;
+                    } else {
+                        params = parseImgParams($elem);
+                        if (jQuery.cookie) {
+                            // retrieve params from cookie
+                            var ck = "digilib-embed:fn:" + escape(params.fn) + ":pn:" + (params.pn || '1');
+                            var cs = jQuery.cookie(ck);
+                            console.debug("get cookie=", ck, " value=", cs);
+                            if (cs) {
+                                var cp = parseQueryString(cs);
+                                // ignore fn and pn from cookie TODO: should we keep pn?
+                                delete cp.fn;
+                                delete cp.pn;
+                                jQuery.extend(params, cp);
+                            }
+                        }
+                    }
+                    // store $(this) element in the settings
+                    elemSettings = jQuery.extend({}, settings, params);
+                    data = {
+                            $elem : $elem,
+                            settings : elemSettings,
+                            queryParams : params
+                    };
+                    // store in data element
+                    $elem.data('digilib', data);
+                }
+                unpackParams(data);
+                // check if browser knows *background-size
+                for (var bs in {'':1, '-moz-':1, '-webkit-':1, '-o-':1}) {
+                    if ($elem.css(bs+'background-size')) {
+                        data.hasBgSize = true;
+                        data.bgSizeName = bs+'background-size';
+                        break;
+                    }
+                }
+                // check digilib base URL
+                if (elemSettings.digilibBaseUrl == null) {
+                    if (isFullscreen) {
+                        // take current host
+                        var url = window.location.toString();
+                        var pos = url.indexOf('?');
+                        elemSettings.digilibBaseUrl = url.substring(0, pos);
+                    } else {
+                        var url = elemSettings.scalerBaseUrl;
+                        if (url) {
+                            // build it from scaler URL
+                            var bp = url.indexOf('/servlet/Scaler');
+                            elemSettings.digilibBaseUrl = url.substring(0, bp) + '/digilib.jsp';                        
+                        }
+                    }
+                }
+                // create HTML structure for scaler
+                setupScalerDiv(data);
+                // add buttons
+                for (var i = 0; i < elemSettings.visibleButtonSets; ++i) {
+                    showButtons(data, true, i);
+                    }
+                // bird's eye view creation
+                if (elemSettings.isBirdDivVisible) {
+                    setupBirdDiv(data);
+                    data.$birdDiv.show();
+                    }
+                // about window creation - TODO: could be deferred? restrict to only one item?
+                setupAboutDiv(data);
+                // drag zoom area around in scaler div 
+                setupZoomDrag(data);
+                // dialog for brightness, rotate etc. 
+                setupDialogDiv(data);
+            });
+        },
+
+        // destroy: clean up digilib
+        destroy : function(data) {
+            return this.each(function(){
+                var $elem = $(this);
+                $(window).unbind('.digilib'); // unbind all digilibs(?)
+                data.digilib.remove();
+                $elem.removeData('digilib');
+            });
+        },
+
+        // show or hide the 'about' window
+        showAboutDiv : function(data, show) {
+            data.settings.isAboutDivVisible = showDiv(data.settings.isAboutDivVisible, data.$aboutDiv, show);
+        },
+
+        // event handler: toggles the visibility of the bird's eye window 
+        showBirdDiv : function (data, show) {
+            var settings = data.settings;
+            if (data.$birdDiv == null) {
+                // no bird div -> create
+                setupBirdDiv(data);
+            }
+            settings.isBirdDivVisible = showDiv(settings.isBirdDivVisible, data.$birdDiv, show);
+            updateBirdDiv(data);
+            storeOptions(data);
+            // data.$birdImg.triggerHandler('load'); // TODO: we shouldn't do that
+        },
+
+        // goto given page nr (+/-: relative)
+        gotoPage : function (data, pageNr) {
+            var settings = data.settings;
+            var oldpn = settings.pn;
+            if (pageNr == null) {
+                pageNr = window.prompt("Goto page number", oldpn);
+            }
+            var pn = setNumValue(settings, "pn", pageNr);
+            if (pn == null) return false; // nothing happened
+            if (pn < 1) {
+                alert("no such page (page number too low)");
+                settings.pn = oldpn;
+                return false;
+                }
+            if (settings.pt) {
+                if (pn > settings.pt) {
+                    alert("no such page (page number too high)");
+                    settings.pn = oldpn;
+                    return false;
+                    }
+                }
+            // reset mk and others(?)
+            data.marks = [];
+            data.zoomArea = FULL_AREA;
+            // then reload
+            redisplay(data);
+        },
+
+        // zoom by a given factor
+        zoomBy : function (data, factor) {
+            zoomBy(data, factor);
+        },
+
+        // zoom interactively
+        zoomArea : function (data) {
+            zoomArea(data);
+        },
+
+        // zoom out to full page
+        zoomFull : function (data, mode) {
+            data.zoomArea = FULL_AREA;
+            if (mode === 'width') {
+                data.dlOpts.fitwidth = 1;
+                delete data.dlOpts.fitheight;
+            } else if (mode === 'height') {
+                data.dlOpts.fitheight = 1;
+                delete data.dlOpts.fitwidth;
+            } else {
+                delete data.dlOpts.fitwidth;
+                delete data.dlOpts.fitheight;
+            }
+            redisplay(data);
+        },
+
+        // set a mark by clicking (or giving a position)
+        setMark : function (data, mpos) {
+            if (mpos == null) {
+                // interactive
+                setMark(data);
+            } else {
+                // use position
+                data.marks.push(pos);
+                redisplay(data);
+            }
+        },
+
+        // remove the last mark
+        removeMark : function (data) {
+            data.marks.pop();
+            redisplay(data);
+        },
+
+        // mirror the image
+        mirror : function (data, mode) {
+            var flags = data.scalerFlags;
+            if (mode === 'h') {
+                if (flags.hmir) {
+                    delete flags.hmir;
+                } else {
+                    flags.hmir = 1;
+                }
+            } else {
+                if (flags.vmir) {
+                    delete flags.vmir;
+                } else {
+                    flags.vmir = 1;
+                }
+            }
+            redisplay(data);
+        },
+
+        // rotate the image
+        rotate : function (data, angle) {
+            var rot = data.settings.rot;
+            if (angle == null) {
+                // angle = window.prompt("Rotation angle:", rot);
+                var $slider = data.$slider;
+                $slider.slider('enable');
+                var $dialog = data.$dialog;
+                $dialog.text('Set the slider');
+                $dialog.dialog('option', {
+                    'title' : 'set rotation angle',
+                    });
+                $dialog.dialog('open');
+            }
+            //data.settings.rot = angle;
+            //redisplay(data);
+        },
+
+        // change brightness
+        brightness : function (data, factor) {
+            var brgt = data.settings.brgt;
+            if (factor == null) {
+                factor = window.prompt("Brightness (-255..255)", brgt);
+            }
+            data.settings.brgt = factor;
+            redisplay(data);
+        },
+
+        // change contrast
+        contrast : function (data, factor) {
+            var cont = data.settings.cont;
+            if (factor == null) {
+                factor = window.prompt("Contrast (-8, 8)", cont);
+            }
+            data.settings.cont = factor;
+            redisplay(data);
+        },
+
+        // display more (or less) button sets
+        moreButtons : function (data, more) {
+            var settings = data.settings;
+            if (more == null) {
+                // toggle more or less (only works for 2 sets)
+                var maxbtns = settings.buttonSettings[settings.interactionMode].buttonSets.length;
+                if (settings.visibleButtonSets >= maxbtns) {
+                    more = '-1';
+                } else {
+                    more = '+1';
+                }
+            }
+            if (more === '-1') {
+                // remove set
+                var setIdx = settings.visibleButtonSets - 1;
+                if (showButtons(data, false, setIdx, true)) {
+                    settings.visibleButtonSets--;
+                }
+            } else {
+                // add set
+                var setIdx = settings.visibleButtonSets;
+                if (showButtons(data, true, setIdx, true)) {
+                    settings.visibleButtonSets++;
+                }
+            }
+            // persist setting
+            storeOptions(data);
+        },
+
+        // reset image parameters to defaults
+        reset : function (data) {
+            var settings = data.settings;
+            var paramNames = settings.digilibParamNames;
+            var params = data.queryParams;
+            // delete all digilib parameters
+            for (var i = 0; i < paramNames.length; i++) {
+                var paramName = paramNames[i];
+                delete settings[paramName];
+                }
+            settings.fn = params.fn || ''; // no default defined
+            settings.pn = params.pn || defaults.pn;
+            settings.dw = params.dw;
+            settings.dh = params.dh;
+            settings.isBirdDivVisible = false;
+            settings.visibleButtonSets = 1;
+            // resets zoomArea, marks, scalerflags
+            data.zoomArea = FULL_AREA;
+            data.marks = [];
+            data.scalerFlags = {};
+            delete data.dlOpts.fitwidth;
+            delete data.dlOpts.fitheight;
+            redisplay(data);
+        },
+
+        // presents a reference url (returns value if noprompt)
+        reference : function (data, noprompt) {
+            var settings = data.settings;
+            var url = getDigilibUrl(data);
+            if (noprompt == null) {
+                window.prompt("URL reference to the current view", url);
+            }
+            return url;
+        },
+
+        // set image quality
+        setQuality : function (data, qual) {
+            var oldq = getQuality(data);
+            if (qual == null) {
+                qual = window.prompt("Image quality (0..2)", oldq);
+            }
+            qual = parseInt(qual, 10);
+            if (qual >= 0 && qual <= 2) {
+                setQuality(data, qual);
+                redisplay(data);
+            }
+        }
+    };
+
+    // returns parameters from page url
+    var parseQueryParams = function() {
+        return parseQueryString(window.location.search.slice(1));
+    };
+
+    // returns parameters from embedded img-element
+    var parseImgParams = function($elem) {
+        var src = $elem.find('img').first().attr('src');
+        if (!src) return null;
+        var pos = src.indexOf('?');
+        var query = (pos < 0) ? '' : src.substring(pos + 1);
+        var scalerUrl = src.substring(0, pos);
+        var params = parseQueryString(query);
+        params.scalerBaseUrl = scalerUrl;
+        return params;
+    };
+
+    // parses query parameter string into parameter object
+    var parseQueryString = function(query) {
+        var params = {};
+        if (query == null) return params;
+        var pairs = query.split("&");
+        //var keys = [];
+        for (var i = 0; i < pairs.length; i++) {
+            var pair = pairs[i].split("=");
+            if (pair.length === 2) {
+                params[pair[0]] = pair[1];
+                //keys.push(pair[0]);
+            }
+        }
+        return params;
+    };
+
+    // returns a query string from key names from a parameter hash (ignoring if the same value is in defaults)
+    var getParamString = function (settings, keys, defaults) {
+        var paramString = '';
+        var nx = false;
+        for (i = 0; i < keys.length; ++i) {
+            var key = keys[i];
+            if ((settings[key] != null) && ((defaults == null) || (settings[key] != defaults[key]))) {
+                // first param gets no '&'
+                if (nx) {
+                    paramString += '&';
+                } else {
+                    nx = true;
+                }
+                // add parm=val
+                paramString += key + '=' + settings[key];
+            }
+        }
+        return paramString;
+    };
+
+    // returns URL and query string for Scaler
+    var getScalerUrl = function (data) {
+        packParams(data);
+        var settings = data.settings;
+        if (settings.scalerBaseUrl == null) {
+            alert("ERROR: URL of digilib Scaler servlet missing!");
+            }
+        var keys = settings.scalerParamNames;
+        var queryString = getParamString(settings, keys, defaults);
+        var url = settings.scalerBaseUrl + '?' + queryString;
+        return url;
+    };
+
+    // returns URL for bird's eye view image
+    var getBirdImgUrl = function (data, moreParams) {
+        var settings = data.settings;
+        var birdDivOptions = {
+                dw : settings.birdDivWidth,
+                dh : settings.birdDivHeight
+        };
+        var birdSettings = jQuery.extend({}, settings, birdDivOptions);
+        // use only the relevant parameters
+        if (moreParams == null) {
+            var params = getParamString(birdSettings, settings.birdDivParams, defaults);
+        } else {
+            var params = getParamString(birdSettings, 
+                    settings.birdDivParams.concat(moreParams), defaults);
+        }
+        var url = settings.scalerBaseUrl + '?' + params;
+        return url;
+    };
+
+    // returns URL and query string for current digilib
+    var getDigilibUrl = function (data) {
+        packParams(data);
+        var settings = data.settings;
+        var queryString = getParamString(settings, settings.digilibParamNames, defaults);
+        return settings.digilibBaseUrl + '?' + queryString;
+    };
+
+    // processes some parameters into objects and stuff
+    var unpackParams = function (data) {
+        var settings = data.settings;
+        // zoom area
+        var zoomArea = geom.rectangle(settings.wx, settings.wy, settings.ww, settings.wh);
+        data.zoomArea = zoomArea;
+        // marks
+        var marks = [];
+        if (settings.mk) {
+            var mk = settings.mk;
+            if (mk.indexOf(";") >= 0) {
+                var pa = mk.split(";");    // old format with ";"
+            } else {
+                var pa = mk.split(",");    // new format
+            }
+            for (var i = 0; i < pa.length ; i++) {
+                var pos = pa[i].split("/");
+                if (pos.length > 1) {
+                    marks.push(geom.position(pos[0], pos[1]));
+                    }
+                }
+            }
+        data.marks = marks;
+        // mo (Scaler flags)
+        var flags = {};
+        if (settings.mo) {
+            var pa = settings.mo.split(",");
+            for (var i = 0; i < pa.length ; i++) {
+                flags[pa[i]] = pa[i];
+                }
+            }
+        data.scalerFlags = flags;
+        retrieveOptions(data);
+    };
+
+    // put objects back into parameters
+    var packParams = function (data) {
+        var settings = data.settings;
+        // zoom area
+        if (data.zoomArea) {
+            settings.wx = cropFloat(data.zoomArea.x);
+            settings.wy = cropFloat(data.zoomArea.y);
+            settings.ww = cropFloat(data.zoomArea.width);
+            settings.wh = cropFloat(data.zoomArea.height);
+            }
+        // marks
+        if (data.marks) {
+            settings.mk = '';
+            for (var i = 0; i < data.marks.length; i++) {
+                if (i) {
+                    settings.mk += ',';
+                    }
+                settings.mk += cropFloat(data.marks[i].x).toString() +
+                    '/' + cropFloat(data.marks[i].y).toString();
+                }
+            }
+        // Scaler flags
+        if (data.scalerFlags) {
+            var mo = '';
+            for (var f in data.scalerFlags) {
+                if (mo) {
+                    mo += ',';
+                }
+                mo += f;
+            }
+            settings.mo = mo;
+        }
+        // user interface options
+        storeOptions(data);
+    };
+
+    var storeOptions = function (data) {
+        // save digilib options in cookie
+        var settings = data.settings;
+        if (data.dlOpts) {
+            // save digilib settings in options
+            data.dlOpts.birdview = settings.isBirdDivVisible ? 1 : 0;
+            data.dlOpts.buttons = settings.visibleButtonSets;
+            var clop = '';
+            for (var o in data.dlOpts) {
+                if (clop) {
+                    clop += '&';
+                    }
+                clop += o + '=' + data.dlOpts[o];
+                }
+            if (jQuery.cookie) {
+                var ck = "digilib:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+                console.debug("set cookie=", ck, " value=", clop);
+                jQuery.cookie(ck, clop);
+                }
+        }
+        if (settings.interactionMode !== 'fullscreen' && jQuery.cookie) {
+            // store normal parameters in cookie for embedded mode
+            var qs = getParamString(settings, settings.digilibParamNames, defaults);
+            var ck = "digilib-embed:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+            console.debug("set cookie=", ck, " value=", qs);
+            jQuery.cookie(ck, qs);
+        }
+    };
+
+    var retrieveOptions = function (data) {
+        // clop (digilib options)
+        var opts = {};
+        var settings = data.settings;
+        if (jQuery.cookie) {
+            // read from cookie
+            var ck = "digilib:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+            var cp = jQuery.cookie(ck);
+            console.debug("get cookie=", ck, " value=", cp);
+            // in query string format
+            opts = parseQueryString(cp);
+            }
+        data.dlOpts = opts;
+        // birdview option
+        if (opts.birdview != null) {
+            settings.isBirdDivVisible = opts.birdview === '1';
+            }
+        // visible button sets
+        if (opts.buttons != null) {
+            settings.visibleButtonSets = opts.buttons;
+            }
+    };
+
+    // (re)load the img from a new scaler URL
+    var redisplay = function (data) {
+        var settings = data.settings; 
+        if (settings.interactionMode === 'fullscreen') {
+            // update location.href (browser URL) in fullscreen mode
+            var url = getDigilibUrl(data);
+            var history = window.history;
+            if (typeof(history.pushState) === 'function') {
+                console.debug("we could modify history, but we don't...");
+                }
+            window.location = url;
+        } else {
+            // embedded mode -- just change img src
+            var url = getScalerUrl(data);
+            data.$img.attr('src', url);
+            // redisplay bird img
+            updateBirdDiv(data);
+            }
+    };
+
+    // returns maximum size for scaler img in fullscreen mode
+    var getFullscreenImgSize = function($elem) {
+        var $win = $(window);
+        var winH = $win.height();
+        var winW = $win.width();
+        // TODO: account for borders?
+        return geom.size(winW, winH);
+    };
+
+    // creates HTML structure for digilib in elem
+    var setupScalerDiv = function (data) {
+        var settings = data.settings;
+        var $elem = data.$elem;
+        $elem.addClass('digilib');
+        var $img;
+        var scalerUrl;
+        if (settings.interactionMode === 'fullscreen') {
+            // fullscreen
+            $elem.addClass('dl_fullscreen');
+            var imgSize = getFullscreenImgSize($elem);
+            // fitwidth/height omits destination height/width
+            if (data.dlOpts.fitheight == null) {
+                settings.dw = imgSize.width;
+            }
+            if (data.dlOpts.fitwidth == null) {
+                settings.dh = imgSize.height;
+            }
+            scalerUrl = getScalerUrl(data);
+            $img = $('<img/>');
+        } else {
+            // embedded mode -- try to keep img tag
+            $elem.addClass('dl_embedded');
+            scalerUrl = getScalerUrl(data);
+            $img = $elem.find('img');
+            if ($img.length > 0) {
+                oldUrl = $img.attr('src');
+                if (oldUrl === scalerUrl) {
+                    console.debug("img detach:", $img);
+                    $img.detach();
+                } else {
+                    $img = $('<img/>');
+                }
+            } else {
+                $img = $('<img/>');
+            }
+        }
+        // create new html
+        $elem.empty(); // TODO: should we keep stuff for customization?
+        var $scaler = $('<div class="scaler"/>');
+        $elem.append($scaler);
+        $scaler.append($img);
+        $img.addClass('pic');
+        data.$scaler = $scaler;
+        data.$img = $img;
+        // setup image load handler before setting the src attribute (IE bug)
+        $img.load(scalerImgLoadedHandler(data));
+        $img.attr('src', scalerUrl);
+    };
+
+    // creates HTML structure for buttons in elem
+    var createButtons = function (data, buttonSetIdx) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var mode = settings.interactionMode;
+        var buttonSettings = settings.buttonSettings[mode];
+        var buttonGroup = buttonSettings.buttonSets[buttonSetIdx];
+        if (buttonGroup == null) {
+            // no buttons here
+            return;
+        }
+        var $buttonsDiv = $('<div class="buttons"/>');
+        var buttonNames = buttonSettings[buttonGroup];
+        for (var i = 0; i < buttonNames.length; i++) {
+            var buttonName = buttonNames[i];
+            var buttonConfig = settings.buttons[buttonName];
+            // construct the button html
+            var $button = $('<div class="button"></div>');
+            var $a = $('<a/>');
+            var $img = $('<img class="button"/>');
+            $buttonsDiv.append($button);
+            $button.append($a);
+            $a.append($img);
+            // add attributes and bindings
+            $button.attr('title', buttonConfig.tooltip);
+            $button.addClass('button-' + buttonName);
+            // create handler for the buttons
+            $a.bind('click.digilib', (function () {
+                // we create a new closure to capture the value of action
+                var action = buttonConfig.onclick;
+                if ($.isArray(action)) {
+                    // the handler function calls digilib with action and parameters
+                    return function (evt) {
+                        console.debug('click action=', action, ' evt=', evt);
+                        $elem.digilib.apply($elem, action);
+                        return false;
+                    };
+                } else {
+                    // the handler function calls digilib with action
+                    return function (evt) {
+                        console.debug('click action=', action, ' evt=', evt);
+                        $elem.digilib(action);
+                        return false;
+                    };
+                }
+            })());
+            $img.attr('src', buttonSettings.imagePath + buttonConfig.img);
+        }
+        // make buttons div scroll if too large for window
+        if ($buttonsDiv.height() > $(window).height() - 10) {
+            $buttonsDiv.css('position', 'absolute');
+        }
+        // buttons hidden at first
+        $buttonsDiv.hide();
+        $elem.append($buttonsDiv);
+        if (data.$buttonSets == null) {
+            // first button set
+            data.$buttonSets = [$buttonsDiv];
+        } else {
+            $elem.append($buttonsDiv);
+            data.$buttonSets[buttonSetIdx] = $buttonsDiv;
+        }
+        return $buttonsDiv;
+    };
+
+    // creates HTML structure for the bird's eye view in elem
+    var setupBirdDiv = function (data) {
+        var $elem = data.$elem;
+        // the bird's eye div
+        var $birdDiv = $('<div class="birdview" style="display:none"/>');
+        // the detail indicator frame
+        var $birdZoom = $('<div class="birdzoom" style="display:none; background-color:transparent;"/>');
+        // the small image
+        var $birdImg = $('<img class="birdimg"/>');
+        data.$birdDiv = $birdDiv;
+        data.$birdZoom = $birdZoom;
+        data.$birdImg = $birdImg;
+        $elem.append($birdDiv);
+        $birdDiv.append($birdZoom);
+        $birdDiv.append($birdImg);
+        $birdZoom.css(data.settings.birdIndicatorStyle);
+        var birdUrl = getBirdImgUrl(data);
+        $birdImg.load(birdImgLoadedHandler(data));
+        $birdImg.attr('src', birdUrl);
+    };
+
+    // update bird's eye view
+    var updateBirdDiv = function (data) {
+        if (!data.settings.isBirdDivVisible) return;
+        var $birdImg = data.$birdImg;
+        var oldsrc = $birdImg.attr('src');
+        var newsrc = getBirdImgUrl(data);
+        if (oldsrc !== newsrc) {
+            $birdImg.attr('src', newsrc);
+            // onload handler re-renders
+        } else {
+            // re-render
+            renderBirdArea(data);
+            // enable click and drag
+            setupBirdDrag(data);
+        }
+    };
+
+    // creates HTML structure for the dialog
+    var setupDialogDiv = function (data) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var $dialogDiv = $('<div/>');
+        var $sliderDiv = $('<div/>');
+        $dialogDiv.append($sliderDiv);
+        $dialogDiv.dialog({
+            'autoOpen' : false,
+            'buttons': {
+                "Ok": function() { 
+                    $(this).dialog("close"); 
+                    }, 
+                "Cancel": function() { 
+                    $(this).dialog("close"); 
+                    } 
+                }
+		    });
+		$sliderDiv.slider({
+			'range' : true,
+			'min' : 0,
+			'max' : 500,
+			'values' : [ 75, 300 ]
+		    });
+        data.$dialog = $dialogDiv;
+        data.$slider = $sliderDiv;
+    };
+
+    // creates HTML structure for the about view in elem
+    var setupAboutDiv = function (data) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var $aboutDiv = $('<div class="about" style="display:none"/>');
+        var $header = $('<p>Digilib Graphic Viewer</p>');
+        var $link = $('<a/>');
+        var $logo = $('<img class="logo" title="digilib"/>');
+        var $content = $('<p/>');
+        $elem.append($aboutDiv);
+        $aboutDiv.append($header);
+        $aboutDiv.append($link);
+        $aboutDiv.append($content);
+        $link.append($logo);
+        $logo.attr('src', settings.logoUrl);
+        $link.attr('href', settings.homeUrl);
+        $content.text('Version: ' + settings.version);
+        // click hides
+        $aboutDiv.bind('click.digilib', function () { 
+            settings.isAboutDivVisible = showDiv(settings.isAboutDivVisible, $aboutDiv, 0);
+            return false;
+            });
+        data.$aboutDiv = $aboutDiv;
+    };
+
+    // shows some window e.g. 'about' (toggle visibility if show is null)
+    var showDiv = function (isVisible, $div, show) {
+        if (show == null) {
+            // toggle visibility
+            isVisible = !isVisible;
+        } else {
+            // set visibility
+            isVisible = show;
+            }
+        if (isVisible) {
+            $div.fadeIn();
+        } else {
+            $div.fadeOut();
+            }
+        return isVisible;
+    };
+
+    // display more (or less) button sets
+    var showButtons = function (data, more, setIdx, animated) {
+        var atime = animated ? 'fast': 0;
+        if (more) {
+            // add set
+            var $otherSets = data.$elem.find('div.buttons:visible');
+            var $set;
+            if (data.$buttonSets && data.$buttonSets[setIdx]) {
+                // set exists
+                $set = data.$buttonSets[setIdx];
+            } else {
+                $set = createButtons(data, setIdx);
+                }
+            if ($set == null) return false;
+            var btnWidth = $set.width();
+            // move remaining sets left and show new set
+            if ($otherSets.length > 0) {
+                    $otherSets.animate({right : '+='+btnWidth+'px'}, atime,
+                            function () {$set.show();});
+            } else {
+                $set.show();
+            }
+        } else {
+            // remove set
+            var $set = data.$buttonSets[setIdx];
+            if ($set == null) return false;
+            var btnWidth = $set.width();
+            // hide last set
+            $set.hide();
+            // take remaining sets and move right
+            var $otherSets = data.$elem.find('div.buttons:visible');
+            $otherSets.animate({right : '-='+btnWidth+'px'}, atime);
+        }
+        return true;
+    };
+
+    // create Transform from area and $img
+    var getImgTrafo = function ($img, area, rot, hmir, vmir) {
+        var picrect = geom.rectangle($img);
+        var trafo = geom.transform();
+        // move zoom area offset to center
+        trafo.concat(trafo.getTranslation(geom.position(-area.x, -area.y)));
+        // scale zoom area size to [1,1]
+        trafo.concat(trafo.getScale(geom.size(1/area.width, 1/area.height)));
+        // rotate and mirror (around transformed image center i.e. [0.5,0.5])
+        if (rot || hmir || vmir) {
+            // move [0.5,0.5] to center
+            trafo.concat(trafo.getTranslation(geom.position(-0.5, -0.5)));
+            if (hmir) {
+                // mirror about center
+                trafo.concat(trafo.getMirror('y'));
+                }
+            if (vmir) {
+                // mirror about center
+                trafo.concat(trafo.getMirror('x'));
+                }
+            if (rot) {
+                // rotate around center
+                trafo.concat(trafo.getRotation(parseFloat(rot)));
+                }
+            // move back
+            trafo.concat(trafo.getTranslation(geom.position(0.5, 0.5)));
+            }
+        // scale to screen position and size
+        trafo.concat(trafo.getScale(picrect));
+        trafo.concat(trafo.getTranslation(picrect));
+        return trafo;
+    };
+
+    // returns function for load event of scaler img
+    var scalerImgLoadedHandler = function (data) {
+        return function () {
+            var $img = $(this);
+            var $scaler = data.$scaler;
+            // create Transform from current area and picsize
+            data.imgTrafo = getImgTrafo($img, data.zoomArea,
+                    data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir);
+            console.debug("imgTrafo=", data.imgTrafo);
+            // adjust scaler div size
+            var imgRect = geom.rectangle($img);
+            console.debug("imgrect=", imgRect);
+            imgRect.adjustDiv($scaler);
+            // show image in case it was hidden (for example in zoomDrag)
+            $img.css('visibility', 'visible');
+            $scaler.css({'opacity' : '1', 'background-image' : 'none'});
+            // display marks
+            renderMarks(data);
+            // enable drag-to-scroll
+            setupZoomDrag(data);
+            // TODO: digilib.showArrows(); // show arrow overlays for zoom navigation
+        };
+    };
+
+    // returns function for load event of bird's eye view img
+    var birdImgLoadedHandler = function (data) {
+        return function () {
+            var $img = $(this);
+            console.debug("birdimg loaded! this=", this, " data=", data);
+            // create Transform from current area and picsize
+            data.birdTrafo = getImgTrafo($img, FULL_AREA);
+            // display red indicator around zoomarea
+            renderBirdArea(data);
+            // enable click and drag
+            setupBirdDrag(data);
+        };
+    };
+
+    // place marks on the image
+    var renderMarks = function (data) {
+        var $elem = data.$elem;
+        var marks = data.marks;
+        // clear marks
+        $elem.find('div.mark').remove();
+        for (var i = 0; i < marks.length; i++) {
+            var mark = marks[i];
+            if (data.zoomArea.containsPosition(mark)) {
+                var mpos = data.imgTrafo.transform(mark);
+                console.debug("renderMarks: mpos=",mpos);
+                // create mark
+                var html = '<div class="mark">'+(i+1)+'</div>';
+                var $mark = $(html);
+                $elem.append($mark);
+                mpos.adjustDiv($mark);
+                }
+            }
+    };
+
+    // show zoom area indicator on bird's eye view
+    var renderBirdArea = function (data) {
+        var $birdZoom = data.$birdZoom;
+        var zoomArea = data.zoomArea;
+        var normalSize = isFullArea(zoomArea);
+        if (normalSize) {
+            $birdZoom.hide();
+            return;
+        } else {
+            $birdZoom.show();
+        }
+        // position may have changed
+        data.birdTrafo = getImgTrafo(data.$birdImg, FULL_AREA);
+        var zoomRect = data.birdTrafo.transform(zoomArea);
+        // acount for border width
+        zoomRect.addPosition({x : -2, y : -2});
+        if (data.settings.interactionMode === 'fullscreen') {
+            // no animation for fullscreen
+            zoomRect.adjustDiv($birdZoom);
+        } else {
+            // nice animation for embedded mode :-)
+            // correct offsetParent because animate doesn't use offset
+            var ppos = $birdZoom.offsetParent().offset();
+            var dest = {
+                    left : (zoomRect.x - ppos.left) + 'px',
+                    top : (zoomRect.y - ppos.top) + 'px',
+                    width : zoomRect.width,
+                    height : zoomRect.height};
+            $birdZoom.animate(dest);
+        }
+    };
+
+    // zooms by the given factor
+    var zoomBy = function(data, factor) {
+        var area = data.zoomArea;
+        var newarea = area.copy();
+        // scale
+        newarea.width /= factor;
+        newarea.height /= factor;
+        // and recenter
+        newarea.x -= 0.5 * (newarea.width - area.width);
+        newarea.y -= 0.5 * (newarea.height - area.height);
+        newarea = FULL_AREA.fit(newarea);
+        data.zoomArea = newarea;
+        redisplay(data);
+    };
+
+    // add a mark where clicked
+    var setMark = function (data) {
+        var $scaler = data.$scaler;
+        // unbind other handler
+        $scaler.unbind(".dlZoomDrag");
+        // start event capturing
+        $scaler.one('mousedown.dlSetMark', function (evt) {
+            // event handler adding a new mark
+            console.log("setmark at=", evt);
+            var mpos = geom.position(evt);
+            var pos = data.imgTrafo.invtransform(mpos);
+            data.marks.push(pos);
+            redisplay(data);
+            return false;
+        });
+    };
+
+    // zoom to the area around two clicked points
+    var zoomArea = function(data) {
+        $elem = data.$elem;
+        $scaler = data.$scaler;
+        var pt1, pt2;
+        var $zoomDiv = $('<div class="zoomrect" style="display:none"/>');
+        $elem.append($zoomDiv);
+        $zoomDiv.css(data.settings.zoomrectStyle);
+        var picRect = geom.rectangle($scaler);
+        // FIX ME: is there a way to query the border width from CSS info?
+        // rect.x -= 2; // account for overlay borders
+        // rect.y -= 2;
+
+        var zoomStart = function (evt) {
+            pt1 = geom.position(evt);
+            // setup and show zoom div
+            pt1.adjustDiv($zoomDiv);
+            $zoomDiv.width(0).height(0);
+            $zoomDiv.show();
+            // register events
+            $elem.bind("mousemove.dlZoomArea", zoomMove);
+            $elem.bind("mouseup.dlZoomArea", zoomEnd);
+            return false;
+        };
+
+        // mouse move handler
+        var zoomMove = function (evt) {
+            pt2 = geom.position(evt);
+            var rect = geom.rectangle(pt1, pt2);
+            rect.clipTo(picRect);
+            // update zoom div
+            rect.adjustDiv($zoomDiv);
+            return false;
+        };
+
+        // mouseup handler: end moving
+        var zoomEnd = function (evt) {
+            pt2 = geom.position(evt);
+            // assume a click and continue if the area is too small
+            var clickRect = geom.rectangle(pt1, pt2);
+            if (clickRect.getArea() <= 5) return false;
+            // hide zoom div
+            $zoomDiv.remove();
+            // unregister events
+            $elem.unbind("mousemove.dlZoomArea", zoomMove);
+            $elem.unbind("mouseup.dlZoomArea", zoomEnd);
+            // clip and transform
+            clickRect.clipTo(picRect);
+            var area = data.imgTrafo.invtransform(clickRect);
+            data.zoomArea = area;
+            // zoomed is always fit
+            data.settings.ws = 1;
+            delete data.dlOpts.fitwidth;
+            delete data.dlOpts.fitheight;
+            redisplay(data);
+            return false;
+        };
+
+        // clear old handler (also ZoomDrag)
+        $scaler.unbind('.dlZoomArea');
+        $scaler.unbind(".dlZoomDrag");
+        $elem.unbind('.dlZoomArea');
+        // bind start zoom handler
+        $scaler.one('mousedown.dlZoomArea', zoomStart);
+    };
+
+    // bird's eye view zoom area click and drag handler
+    var setupBirdDrag = function(data) {
+        var $birdImg = data.$birdImg;
+        var $birdZoom = data.$birdZoom;
+        var $document = $(document);
+        var $scaler = data.$scaler;
+        var startPos, newRect, birdImgRect, birdZoomRect, fullRect, scalerPos;
+
+        // mousedown handler: start dragging bird zoom to a new position
+        var birdZoomStartDrag = function(evt) {
+            startPos = geom.position(evt);
+            // position may have changed
+            data.birdTrafo = getImgTrafo($birdImg, FULL_AREA);
+            birdImgRect = geom.rectangle($birdImg);
+            birdZoomRect = geom.rectangle($birdZoom);
+            scalerPos = geom.position($scaler);
+            newRect = null;
+            fullRect = setZoomBG(data); // setup zoom background image
+            $document.bind("mousemove.dlBirdMove", birdZoomMove);
+            $document.bind("mouseup.dlBirdMove", birdZoomEndDrag);
+            return false;
+        };
+
+        // mousemove handler: drag
+        var birdZoomMove = function(evt) {
+            var pos = geom.position(evt);
+            var delta = startPos.delta(pos);
+            // move birdZoom div, keeping size
+            newRect = birdZoomRect.copy();
+            newRect.addPosition(delta);
+            newRect.stayInside(birdImgRect);
+            // reflect birdview zoom position in scaler image
+            var area = data.birdTrafo.invtransform(newRect);
+            var imgArea = data.imgTrafo.transform(area);
+            var offset = imgArea.getPosition().neg();
+            offset.add(scalerPos);
+            console.log('offset', offset);
+            if (fullRect) {
+                var bgPos = fullRect.getPosition().add(offset);
+            } else {
+                var bgPos = offset;
+            }
+            // move the background image to the new position
+            data.$scaler.css({
+                'background-position' : bgPos.x + "px " + bgPos.y + "px"
+                });
+            // acount for border width
+            newRect.addPosition({x : -2, y : -2});
+            newRect.adjustDiv($birdZoom);
+            return false;
+        };
+
+        // mouseup handler: reload page
+        var birdZoomEndDrag = function(evt) {
+            var settings = data.settings;
+            $document.unbind("mousemove.dlBirdMove", birdZoomMove);
+            $document.unbind("mouseup.dlBirdMove", birdZoomEndDrag);
+            if (newRect == null) { 
+                // no movement happened - set center to click position
+                startPos = birdZoomRect.getCenter();
+                birdZoomMove(evt); 
+                }
+            // ugly, but needed to prevent double border width compensation
+            newRect.addPosition({x : +2, y : +2});
+            var newArea = data.birdTrafo.invtransform(newRect);
+            data.zoomArea = newArea;
+            redisplay(data);
+            return false;
+        };
+
+        // clear old handler
+        $document.unbind(".dlBirdMove");
+        $birdImg.unbind(".dlBirdMove");
+        $birdZoom.unbind(".dlBirdMove");
+        if (! isFullArea(data.zoomArea)) {
+            // set new handler
+            $birdImg.bind("mousedown.dlBirdMove", birdZoomStartDrag);
+            $birdZoom.bind("mousedown.dlBirdMove", birdZoomStartDrag);
+        }
+    };
+
+    // move bird zoom indicator to reflect zoomed detail area
+    var setBirdZoom = function(data, rect) {
+        var part = data.imgTrafo.invtransform(rect);
+        // area = FULL_AREA.fit(part); // no, we want to see where we transcend the borders
+        birdTrafo = getImgTrafo(data.$birdImg, FULL_AREA);
+        var birdRect = birdTrafo.transform(part);
+        // acount for border width
+        birdRect.addPosition({x : -2, y : -2});
+        birdRect.adjustDiv(data.$birdZoom);
+    };
+
+    // set zoom background
+    var setZoomBG = function(data) {
+        var $scaler = data.$scaler;
+        var $img = data.$img;
+        var fullRect = null;
+        // hide the scaler img, show background of div instead
+        $img.css('visibility', 'hidden');
+        var scalerCss = {
+            'background-image' : 'url(' + $img.attr('src') + ')',
+            'background-repeat' : 'no-repeat',
+            'background-position' : 'left top',
+            'opacity' : '0.5',
+            'cursor' : 'move'
+            };
+        if (data.hasBgSize) {
+            // full-size background using CSS3-background-size
+            fullRect = data.imgTrafo.transform(FULL_AREA);
+            if (fullRect.height < data.settings.maxBgSize && fullRect.width < data.settings.maxBgSize) {
+                // correct offset because background is relative
+                var scalerPos = geom.position($scaler);
+                fullRect.addPosition(scalerPos.neg());
+                var url = getBirdImgUrl(data, ['rot', 'mo']);
+                scalerCss['background-image'] = 'url(' + url + ')';
+                scalerCss[data.bgSizeName] = fullRect.width + 'px ' + fullRect.height + 'px';
+                scalerCss['background-position'] = fullRect.x + 'px '+ fullRect.y + 'px';
+            } else {
+                // too big
+                fullRect = null;
+                }
+            }
+            $scaler.css(scalerCss);
+            // isBgReady = true;
+        return fullRect;
+    };
+
+    // setup handlers for dragging the zoomed image
+    var setupZoomDrag = function(data) {
+        var startPos, delta, fullRect;
+        var $document = $(document);
+        var $elem = data.$elem;
+        var $scaler = data.$scaler;
+        var $img = data.$img;
+
+        // drag the image and load a new detail on mouse up
+        var dragStart = function (evt) {
+            console.debug("dragstart at=",evt);
+            // don't start dragging if not zoomed
+            if (isFullArea(data.zoomArea)) return false;
+            startPos = geom.position(evt);
+            delta = null;
+            // set low res background immediately on mousedown
+            fullRect = setZoomBG(data);
+            $document.bind("mousemove.dlZoomDrag", dragMove);
+            $document.bind("mouseup.dlZoomDrag", dragEnd);
+            return false;
+            };
+
+        // mousemove handler: drag zoomed image
+        var dragMove = function (evt) {
+            var pos = geom.position(evt);
+            delta = startPos.delta(pos);
+            if (fullRect) {
+                var bgPos = fullRect.getPosition().add(delta);
+            } else {
+                var bgPos = delta;
+            }
+            // move the background image to the new position
+            $scaler.css({
+                'background-position' : bgPos.x + "px " + bgPos.y + "px"
+                });
+            // set birdview indicator to reflect new zoom position
+            var za = geom.rectangle($img);
+            za.addPosition(delta.neg());
+            setBirdZoom(data, za);
+            return false;
+            };
+
+        // mouseup handler: reload zoomed image in new position
+        var dragEnd = function (evt) {
+            $scaler.css('cursor', 'auto');
+            $document.unbind("mousemove.dlZoomDrag", dragMove);
+            $document.unbind("mouseup.dlZoomDrag", dragEnd);
+            if (delta == null || delta.distance() < 2) {
+                // no movement
+                $img.css('visibility', 'visible');
+                $scaler.css({'opacity' : '1', 'background-image' : 'none'});
+                return false; 
+            }
+            // get old zoom area (screen coordinates)
+            var za = geom.rectangle($img);
+            // move
+            za.addPosition(delta.neg());
+            // transform back
+            var newArea = data.imgTrafo.invtransform(za);
+            data.zoomArea = FULL_AREA.fit(newArea);
+            redisplay(data);
+            return false;
+            };
+
+        // clear old handler
+        $document.unbind(".dlZoomDrag");
+        $scaler.unbind(".dlZoomDrag");
+        if (! isFullArea(data.zoomArea)) {
+            // set handler
+            $scaler.bind("mousedown.dlZoomDrag", dragStart);
+        }
+    };
+
+    // get image quality as a number (0..2)
+    var getQuality = function (data) {
+        var flags = data.scalerFlags;
+        var q = flags.q2 || flags.q1 || 'q0'; // assume q0 as default
+        return parseInt(q[1], 10);
+    };
+
+    // set image quality as a number (0..2)
+    var setQuality = function (data, qual) {
+        var flags = data.scalerFlags;
+        // clear flags
+        for (var i = 0; i < 3; ++i) {
+            delete flags['q'+i];
+            }
+        flags['q'+qual] = 'q'+qual;
+    };
+
+    // sets a key to a value (relative values with +/- if relative=true)
+    var setNumValue = function(settings, key, value) {
+        if (value == null) return null;
+        if (isNumber(value)) {
+            settings[key] = value;
+            return value;
+        }
+        var sign = value[0];
+        if (sign === '+' || sign === '-') {
+            if (settings[key] == null) {
+                // this isn't perfect but still...
+                settings[key] = 0;
+                }
+            settings[key] = parseFloat(settings[key]) + parseFloat(value);
+        } else {
+            settings[key] = value;
+            }
+        return settings[key];
+    };
+
+    // auxiliary function (from old dllib.js)
+    var isFullArea = function(area) {
+        return (area.width === 1.0) && (area.height === 1.0);
+    };
+
+    // auxiliary function (from Douglas Crockford, A.10)
+    var isNumber = function isNumber(value) {
+        return typeof value === 'number' && isFinite(value);
+    };
+
+    // auxiliary function to crop senseless precision
+    var cropFloat = function (x) {
+        return parseInt(10000 * x, 10) / 10000;
+    };
+
+    // fallback for console.log calls
+    if (customConsole) {
+        var logFunction = function(type) {
+            return function(){
+                var $debug = $('#debug'); // debug div
+                if (!$debug) return;
+                var args = Array.prototype.slice.call(arguments);
+                var argtext = args.join(' ');
+                var $logDiv = $('<div/>');
+                $logDiv.addClass(type);
+                $logDiv.text(argtext);
+                $debug.append($logDiv);
+                };
+            };
+        console.log = logFunction('_log'); 
+        console.debug = logFunction('_debug'); 
+        console.error = logFunction('_error');
+        }
+
+    // hook plugin into jquery
+    $.fn.digilib = function(action) {
+        if (actions[action]) {
+            // call action on this with the remaining arguments (inserting data as first argument)
+            var $elem = $(this);
+            var data = $elem.data('digilib');
+            var args = Array.prototype.slice.call(arguments, 1);
+            args.unshift(data);
+            return actions[action].apply(this, args);
+        } else if (typeof(action) === 'object' || !action) {
+            // call init on this
+            return actions.init.apply(this, arguments);
+        } else {
+            $.error('action ' + action + ' does not exist on jQuery.digilib');
+        }
+    };
+
+})(jQuery);
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.button.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,373 @@
+/*
+ * jQuery UI Button 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var lastActive,
+	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
+	stateClasses = "ui-state-hover ui-state-active ",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+	formResetHandler = function( event ) {
+		$( ":ui-button", event.target.form ).each(function() {
+			var inst = $( this ).data( "button" );
+			setTimeout(function() {
+				inst.refresh();
+			}, 1 );
+		});
+	},
+	radioGroup = function( radio ) {
+		var name = radio.name,
+			form = radio.form,
+			radios = $( [] );
+		if ( name ) {
+			if ( form ) {
+				radios = $( form ).find( "[name='" + name + "']" );
+			} else {
+				radios = $( "[name='" + name + "']", radio.ownerDocument )
+					.filter(function() {
+						return !this.form;
+					});
+			}
+		}
+		return radios;
+	};
+
+$.widget( "ui.button", {
+	options: {
+		disabled: null,
+		text: true,
+		label: null,
+		icons: {
+			primary: null,
+			secondary: null
+		}
+	},
+	_create: function() {
+		this.element.closest( "form" )
+			.unbind( "reset.button" )
+			.bind( "reset.button", formResetHandler );
+
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = this.element.attr( "disabled" );
+		}
+
+		this._determineButtonType();
+		this.hasTitle = !!this.buttonElement.attr( "title" );
+
+		var self = this,
+			options = this.options,
+			toggleButton = this.type === "checkbox" || this.type === "radio",
+			hoverClass = "ui-state-hover" + ( !toggleButton ? " ui-state-active" : "" ),
+			focusClass = "ui-state-focus";
+
+		if ( options.label === null ) {
+			options.label = this.buttonElement.html();
+		}
+
+		if ( this.element.is( ":disabled" ) ) {
+			options.disabled = true;
+		}
+
+		this.buttonElement
+			.addClass( baseClasses )
+			.attr( "role", "button" )
+			.bind( "mouseenter.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).addClass( "ui-state-hover" );
+				if ( this === lastActive ) {
+					$( this ).addClass( "ui-state-active" );
+				}
+			})
+			.bind( "mouseleave.button", function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( hoverClass );
+			})
+			.bind( "focus.button", function() {
+				// no need to check disabled, focus won't be triggered anyway
+				$( this ).addClass( focusClass );
+			})
+			.bind( "blur.button", function() {
+				$( this ).removeClass( focusClass );
+			});
+
+		if ( toggleButton ) {
+			this.element.bind( "change.button", function() {
+				self.refresh();
+			});
+		}
+
+		if ( this.type === "checkbox" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled ) {
+					return false;
+				}
+				$( this ).toggleClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", self.element[0].checked );
+			});
+		} else if ( this.type === "radio" ) {
+			this.buttonElement.bind( "click.button", function() {
+				if ( options.disabled ) {
+					return false;
+				}
+				$( this ).addClass( "ui-state-active" );
+				self.buttonElement.attr( "aria-pressed", true );
+
+				var radio = self.element[ 0 ];
+				radioGroup( radio )
+					.not( radio )
+					.map(function() {
+						return $( this ).button( "widget" )[ 0 ];
+					})
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", false );
+			});
+		} else {
+			this.buttonElement
+				.bind( "mousedown.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).addClass( "ui-state-active" );
+					lastActive = this;
+					$( document ).one( "mouseup", function() {
+						lastActive = null;
+					});
+				})
+				.bind( "mouseup.button", function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).removeClass( "ui-state-active" );
+				})
+				.bind( "keydown.button", function(event) {
+					if ( options.disabled ) {
+						return false;
+					}
+					if ( event.keyCode == $.ui.keyCode.SPACE || event.keyCode == $.ui.keyCode.ENTER ) {
+						$( this ).addClass( "ui-state-active" );
+					}
+				})
+				.bind( "keyup.button", function() {
+					$( this ).removeClass( "ui-state-active" );
+				});
+
+			if ( this.buttonElement.is("a") ) {
+				this.buttonElement.keyup(function(event) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						// TODO pass through original event correctly (just as 2nd argument doesn't work)
+						$( this ).click();
+					}
+				});
+			}
+		}
+
+		// TODO: pull out $.Widget's handling for the disabled option into
+		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
+		// be overridden by individual plugins
+		this._setOption( "disabled", options.disabled );
+	},
+
+	_determineButtonType: function() {
+		
+		if ( this.element.is(":checkbox") ) {
+			this.type = "checkbox";
+		} else {
+			if ( this.element.is(":radio") ) {
+				this.type = "radio";
+			} else {
+				if ( this.element.is("input") ) {
+					this.type = "input";
+				} else {
+					this.type = "button";
+				}
+			}
+		}
+		
+		if ( this.type === "checkbox" || this.type === "radio" ) {
+			// we don't search against the document in case the element
+			// is disconnected from the DOM
+			this.buttonElement = this.element.parents().last()
+				.find( "label[for=" + this.element.attr("id") + "]" );
+			this.element.addClass( "ui-helper-hidden-accessible" );
+
+			var checked = this.element.is( ":checked" );
+			if ( checked ) {
+				this.buttonElement.addClass( "ui-state-active" );
+			}
+			this.buttonElement.attr( "aria-pressed", checked );
+		} else {
+			this.buttonElement = this.element;
+		}
+	},
+
+	widget: function() {
+		return this.buttonElement;
+	},
+
+	destroy: function() {
+		this.element
+			.removeClass( "ui-helper-hidden-accessible" );
+		this.buttonElement
+			.removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
+			.removeAttr( "role" )
+			.removeAttr( "aria-pressed" )
+			.html( this.buttonElement.find(".ui-button-text").html() );
+
+		if ( !this.hasTitle ) {
+			this.buttonElement.removeAttr( "title" );
+		}
+
+		$.Widget.prototype.destroy.call( this );
+	},
+
+	_setOption: function( key, value ) {
+		$.Widget.prototype._setOption.apply( this, arguments );
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.attr( "disabled", true );
+			} else {
+				this.element.removeAttr( "disabled" );
+			}
+		}
+		this._resetButton();
+	},
+
+	refresh: function() {
+		var isDisabled = this.element.is( ":disabled" );
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOption( "disabled", isDisabled );
+		}
+		if ( this.type === "radio" ) {
+			radioGroup( this.element[0] ).each(function() {
+				if ( $( this ).is( ":checked" ) ) {
+					$( this ).button( "widget" )
+						.addClass( "ui-state-active" )
+						.attr( "aria-pressed", true );
+				} else {
+					$( this ).button( "widget" )
+						.removeClass( "ui-state-active" )
+						.attr( "aria-pressed", false );
+				}
+			});
+		} else if ( this.type === "checkbox" ) {
+			if ( this.element.is( ":checked" ) ) {
+				this.buttonElement
+					.addClass( "ui-state-active" )
+					.attr( "aria-pressed", true );
+			} else {
+				this.buttonElement
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", false );
+			}
+		}
+	},
+
+	_resetButton: function() {
+		if ( this.type === "input" ) {
+			if ( this.options.label ) {
+				this.element.val( this.options.label );
+			}
+			return;
+		}
+		var buttonElement = this.buttonElement.removeClass( typeClasses ),
+			buttonText = $( "<span></span>" )
+				.addClass( "ui-button-text" )
+				.html( this.options.label )
+				.appendTo( buttonElement.empty() )
+				.text(),
+			icons = this.options.icons,
+			multipleIcons = icons.primary && icons.secondary;
+		if ( icons.primary || icons.secondary ) {
+			buttonElement.addClass( "ui-button-text-icon" +
+				( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			if ( icons.primary ) {
+				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
+			}
+			if ( icons.secondary ) {
+				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
+			}
+			if ( !this.options.text ) {
+				buttonElement
+					.addClass( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" )
+					.removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );
+				if ( !this.hasTitle ) {
+					buttonElement.attr( "title", buttonText );
+				}
+			}
+		} else {
+			buttonElement.addClass( "ui-button-text-only" );
+		}
+	}
+});
+
+$.widget( "ui.buttonset", {
+	options: {
+		items: ":button, :submit, :reset, :checkbox, :radio, a, :data(button)"
+	},
+
+	_create: function() {
+		this.element.addClass( "ui-buttonset" );
+	},
+	
+	_init: function() {
+		this.refresh();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this.buttons.button( "option", key, value );
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+	},
+	
+	refresh: function() {
+		this.buttons = this.element.find( this.options.items )
+			.filter( ":ui-button" )
+				.button( "refresh" )
+			.end()
+			.not( ":ui-button" )
+				.button()
+			.end()
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
+				.filter( ":first" )
+					.addClass( "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( "ui-corner-right" )
+				.end()
+			.end();
+	},
+
+	destroy: function() {
+		this.element.removeClass( "ui-buttonset" );
+		this.buttons
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-left ui-corner-right" )
+			.end()
+			.button( "destroy" );
+
+		$.Widget.prototype.destroy.call( this );
+	}
+});
+
+}( jQuery ) );
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.core.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,308 @@
+/*!
+ * jQuery UI 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function( $, undefined ) {
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ( $.ui.version ) {
+	return;
+}
+
+$.extend( $.ui, {
+	version: "1.8.9",
+
+	keyCode: {
+		ALT: 18,
+		BACKSPACE: 8,
+		CAPS_LOCK: 20,
+		COMMA: 188,
+		COMMAND: 91,
+		COMMAND_LEFT: 91, // COMMAND
+		COMMAND_RIGHT: 93,
+		CONTROL: 17,
+		DELETE: 46,
+		DOWN: 40,
+		END: 35,
+		ENTER: 13,
+		ESCAPE: 27,
+		HOME: 36,
+		INSERT: 45,
+		LEFT: 37,
+		MENU: 93, // COMMAND_RIGHT
+		NUMPAD_ADD: 107,
+		NUMPAD_DECIMAL: 110,
+		NUMPAD_DIVIDE: 111,
+		NUMPAD_ENTER: 108,
+		NUMPAD_MULTIPLY: 106,
+		NUMPAD_SUBTRACT: 109,
+		PAGE_DOWN: 34,
+		PAGE_UP: 33,
+		PERIOD: 190,
+		RIGHT: 39,
+		SHIFT: 16,
+		SPACE: 32,
+		TAB: 9,
+		UP: 38,
+		WINDOWS: 91 // COMMAND
+	}
+});
+
+// plugins
+$.fn.extend({
+	_focus: $.fn.focus,
+	focus: function( delay, fn ) {
+		return typeof delay === "number" ?
+			this.each(function() {
+				var elem = this;
+				setTimeout(function() {
+					$( elem ).focus();
+					if ( fn ) {
+						fn.call( elem );
+					}
+				}, delay );
+			}) :
+			this._focus.apply( this, arguments );
+	},
+
+	scrollParent: function() {
+		var scrollParent;
+		if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+			scrollParent = this.parents().filter(function() {
+				return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		} else {
+			scrollParent = this.parents().filter(function() {
+				return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1));
+			}).eq(0);
+		}
+
+		return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
+	},
+
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
+		}
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
+				// Ignore z-index if position is set to a value where z-index is ignored by the browser
+				// This makes behavior of this function consistent across browsers
+				// WebKit always returns auto if the element is positioned
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+					// IE returns 0 when zIndex is not specified
+					// other browsers return a string
+					// we ignore the case of nested elements with an explicit value of 0
+					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
+						return value;
+					}
+				}
+				elem = elem.parent();
+			}
+		}
+
+		return 0;
+	},
+
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+$.each( [ "Width", "Height" ], function( i, name ) {
+	var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+		type = name.toLowerCase(),
+		orig = {
+			innerWidth: $.fn.innerWidth,
+			innerHeight: $.fn.innerHeight,
+			outerWidth: $.fn.outerWidth,
+			outerHeight: $.fn.outerHeight
+		};
+
+	function reduce( elem, size, border, margin ) {
+		$.each( side, function() {
+			size -= parseFloat( $.curCSS( elem, "padding" + this, true) ) || 0;
+			if ( border ) {
+				size -= parseFloat( $.curCSS( elem, "border" + this + "Width", true) ) || 0;
+			}
+			if ( margin ) {
+				size -= parseFloat( $.curCSS( elem, "margin" + this, true) ) || 0;
+			}
+		});
+		return size;
+	}
+
+	$.fn[ "inner" + name ] = function( size ) {
+		if ( size === undefined ) {
+			return orig[ "inner" + name ].call( this );
+		}
+
+		return this.each(function() {
+			$( this ).css( type, reduce( this, size ) + "px" );
+		});
+	};
+
+	$.fn[ "outer" + name] = function( size, margin ) {
+		if ( typeof size !== "number" ) {
+			return orig[ "outer" + name ].call( this, size );
+		}
+
+		return this.each(function() {
+			$( this).css( type, reduce( this, size, true, margin ) + "px" );
+		});
+	};
+});
+
+// selectors
+function visible( element ) {
+	return !$( element ).parents().andSelf().filter(function() {
+		return $.curCSS( this, "visibility" ) === "hidden" ||
+			$.expr.filters.hidden( this );
+	}).length;
+}
+
+$.extend( $.expr[ ":" ], {
+	data: function( elem, i, match ) {
+		return !!$.data( elem, match[ 3 ] );
+	},
+
+	focusable: function( element ) {
+		var nodeName = element.nodeName.toLowerCase(),
+			tabIndex = $.attr( element, "tabindex" );
+		if ( "area" === nodeName ) {
+			var map = element.parentNode,
+				mapName = map.name,
+				img;
+			if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+				return false;
+			}
+			img = $( "img[usemap=#" + mapName + "]" )[0];
+			return !!img && visible( img );
+		}
+		return ( /input|select|textarea|button|object/.test( nodeName )
+			? !element.disabled
+			: "a" == nodeName
+				? element.href || !isNaN( tabIndex )
+				: !isNaN( tabIndex ))
+			// the element and all of its ancestors must be visible
+			&& visible( element );
+	},
+
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" );
+		return ( isNaN( tabIndex ) || tabIndex >= 0 ) && $( element ).is( ":focusable" );
+	}
+});
+
+// support
+$(function() {
+	var body = document.body,
+		div = body.appendChild( div = document.createElement( "div" ) );
+
+	$.extend( div.style, {
+		minHeight: "100px",
+		height: "auto",
+		padding: 0,
+		borderWidth: 0
+	});
+
+	$.support.minHeight = div.offsetHeight === 100;
+	$.support.selectstart = "onselectstart" in div;
+
+	// set display to none to avoid a layout bug in IE
+	// http://dev.jquery.com/ticket/4014
+	body.removeChild( div ).style.display = "none";
+});
+
+
+
+
+
+// deprecated
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var proto = $.ui[ module ].prototype;
+			for ( var i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode ) {
+				return;
+			}
+	
+			for ( var i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+	
+	// will be deprecated when we switch to jQuery 1.4 - use jQuery.contains()
+	contains: function( a, b ) {
+		return document.compareDocumentPosition ?
+			a.compareDocumentPosition( b ) & 16 :
+			a !== b && a.contains( b );
+	},
+	
+	// only used by resizable
+	hasScroll: function( el, a ) {
+	
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+	
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+	
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+	
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	},
+	
+	// these are odd functions, fix the API or move into individual plugins
+	isOverAxis: function( x, reference, size ) {
+		//Determines when x coordinate is over "b" element axis
+		return ( x > reference ) && ( x < ( reference + size ) );
+	},
+	isOver: function( y, x, top, left, height, width ) {
+		//Determines when x, y coordinates is over "b" element
+		return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
+	}
+});
+
+})( jQuery );
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.dialog.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,857 @@
+/*
+ * jQuery UI Dialog 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function( $, undefined ) {
+
+var uiDialogClasses =
+		'ui-dialog ' +
+		'ui-widget ' +
+		'ui-widget-content ' +
+		'ui-corner-all ',
+	sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	};
+
+$.widget("ui.dialog", {
+	options: {
+		autoOpen: true,
+		buttons: {},
+		closeOnEscape: true,
+		closeText: 'close',
+		dialogClass: '',
+		draggable: true,
+		hide: null,
+		height: 'auto',
+		maxHeight: false,
+		maxWidth: false,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: 'center',
+			at: 'center',
+			collision: 'fit',
+			// ensure that the titlebar is never outside the document
+			using: function(pos) {
+				var topOffset = $(this).css(pos).offset().top;
+				if (topOffset < 0) {
+					$(this).css('top', pos.top - topOffset);
+				}
+			}
+		},
+		resizable: true,
+		show: null,
+		stack: true,
+		title: '',
+		width: 300,
+		zIndex: 1000
+	},
+
+	_create: function() {
+		this.originalTitle = this.element.attr('title');
+		// #5742 - .attr() might return a DOMElement
+		if ( typeof this.originalTitle !== "string" ) {
+			this.originalTitle = "";
+		}
+
+		this.options.title = this.options.title || this.originalTitle;
+		var self = this,
+			options = self.options,
+
+			title = options.title || '&#160;',
+			titleId = $.ui.dialog.getTitleId(self.element),
+
+			uiDialog = (self.uiDialog = $('<div></div>'))
+				.appendTo(document.body)
+				.hide()
+				.addClass(uiDialogClasses + options.dialogClass)
+				.css({
+					zIndex: options.zIndex
+				})
+				// setting tabIndex makes the div focusable
+				// setting outline to 0 prevents a border on focus in Mozilla
+				.attr('tabIndex', -1).css('outline', 0).keydown(function(event) {
+					if (options.closeOnEscape && event.keyCode &&
+						event.keyCode === $.ui.keyCode.ESCAPE) {
+						
+						self.close(event);
+						event.preventDefault();
+					}
+				})
+				.attr({
+					role: 'dialog',
+					'aria-labelledby': titleId
+				})
+				.mousedown(function(event) {
+					self.moveToTop(false, event);
+				}),
+
+			uiDialogContent = self.element
+				.show()
+				.removeAttr('title')
+				.addClass(
+					'ui-dialog-content ' +
+					'ui-widget-content')
+				.appendTo(uiDialog),
+
+			uiDialogTitlebar = (self.uiDialogTitlebar = $('<div></div>'))
+				.addClass(
+					'ui-dialog-titlebar ' +
+					'ui-widget-header ' +
+					'ui-corner-all ' +
+					'ui-helper-clearfix'
+				)
+				.prependTo(uiDialog),
+
+			uiDialogTitlebarClose = $('<a href="#"></a>')
+				.addClass(
+					'ui-dialog-titlebar-close ' +
+					'ui-corner-all'
+				)
+				.attr('role', 'button')
+				.hover(
+					function() {
+						uiDialogTitlebarClose.addClass('ui-state-hover');
+					},
+					function() {
+						uiDialogTitlebarClose.removeClass('ui-state-hover');
+					}
+				)
+				.focus(function() {
+					uiDialogTitlebarClose.addClass('ui-state-focus');
+				})
+				.blur(function() {
+					uiDialogTitlebarClose.removeClass('ui-state-focus');
+				})
+				.click(function(event) {
+					self.close(event);
+					return false;
+				})
+				.appendTo(uiDialogTitlebar),
+
+			uiDialogTitlebarCloseText = (self.uiDialogTitlebarCloseText = $('<span></span>'))
+				.addClass(
+					'ui-icon ' +
+					'ui-icon-closethick'
+				)
+				.text(options.closeText)
+				.appendTo(uiDialogTitlebarClose),
+
+			uiDialogTitle = $('<span></span>')
+				.addClass('ui-dialog-title')
+				.attr('id', titleId)
+				.html(title)
+				.prependTo(uiDialogTitlebar);
+
+		//handling of deprecated beforeclose (vs beforeClose) option
+		//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+		//TODO: remove in 1.9pre
+		if ($.isFunction(options.beforeclose) && !$.isFunction(options.beforeClose)) {
+			options.beforeClose = options.beforeclose;
+		}
+
+		uiDialogTitlebar.find("*").add(uiDialogTitlebar).disableSelection();
+
+		if (options.draggable && $.fn.draggable) {
+			self._makeDraggable();
+		}
+		if (options.resizable && $.fn.resizable) {
+			self._makeResizable();
+		}
+
+		self._createButtons(options.buttons);
+		self._isOpen = false;
+
+		if ($.fn.bgiframe) {
+			uiDialog.bgiframe();
+		}
+	},
+
+	_init: function() {
+		if ( this.options.autoOpen ) {
+			this.open();
+		}
+	},
+
+	destroy: function() {
+		var self = this;
+		
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.hide();
+		self.element
+			.unbind('.dialog')
+			.removeData('dialog')
+			.removeClass('ui-dialog-content ui-widget-content')
+			.hide().appendTo('body');
+		self.uiDialog.remove();
+
+		if (self.originalTitle) {
+			self.element.attr('title', self.originalTitle);
+		}
+
+		return self;
+	},
+
+	widget: function() {
+		return this.uiDialog;
+	},
+
+	close: function(event) {
+		var self = this,
+			maxZ, thisZ;
+		
+		if (false === self._trigger('beforeClose', event)) {
+			return;
+		}
+
+		if (self.overlay) {
+			self.overlay.destroy();
+		}
+		self.uiDialog.unbind('keypress.ui-dialog');
+
+		self._isOpen = false;
+
+		if (self.options.hide) {
+			self.uiDialog.hide(self.options.hide, function() {
+				self._trigger('close', event);
+			});
+		} else {
+			self.uiDialog.hide();
+			self._trigger('close', event);
+		}
+
+		$.ui.dialog.overlay.resize();
+
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		if (self.options.modal) {
+			maxZ = 0;
+			$('.ui-dialog').each(function() {
+				if (this !== self.uiDialog[0]) {
+					thisZ = $(this).css('z-index');
+					if(!isNaN(thisZ)) {
+						maxZ = Math.max(maxZ, thisZ);
+					}
+				}
+			});
+			$.ui.dialog.maxZ = maxZ;
+		}
+
+		return self;
+	},
+
+	isOpen: function() {
+		return this._isOpen;
+	},
+
+	// the force parameter allows us to move modal dialogs to their correct
+	// position on open
+	moveToTop: function(force, event) {
+		var self = this,
+			options = self.options,
+			saveScroll;
+
+		if ((options.modal && !force) ||
+			(!options.stack && !options.modal)) {
+			return self._trigger('focus', event);
+		}
+
+		if (options.zIndex > $.ui.dialog.maxZ) {
+			$.ui.dialog.maxZ = options.zIndex;
+		}
+		if (self.overlay) {
+			$.ui.dialog.maxZ += 1;
+			self.overlay.$el.css('z-index', $.ui.dialog.overlay.maxZ = $.ui.dialog.maxZ);
+		}
+
+		//Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed.
+		//  http://ui.jquery.com/bugs/ticket/3193
+		saveScroll = { scrollTop: self.element.attr('scrollTop'), scrollLeft: self.element.attr('scrollLeft') };
+		$.ui.dialog.maxZ += 1;
+		self.uiDialog.css('z-index', $.ui.dialog.maxZ);
+		self.element.attr(saveScroll);
+		self._trigger('focus', event);
+
+		return self;
+	},
+
+	open: function() {
+		if (this._isOpen) { return; }
+
+		var self = this,
+			options = self.options,
+			uiDialog = self.uiDialog;
+
+		self.overlay = options.modal ? new $.ui.dialog.overlay(self) : null;
+		self._size();
+		self._position(options.position);
+		uiDialog.show(options.show);
+		self.moveToTop(true);
+
+		// prevent tabbing out of modal dialogs
+		if (options.modal) {
+			uiDialog.bind('keypress.ui-dialog', function(event) {
+				if (event.keyCode !== $.ui.keyCode.TAB) {
+					return;
+				}
+
+				var tabbables = $(':tabbable', this),
+					first = tabbables.filter(':first'),
+					last  = tabbables.filter(':last');
+
+				if (event.target === last[0] && !event.shiftKey) {
+					first.focus(1);
+					return false;
+				} else if (event.target === first[0] && event.shiftKey) {
+					last.focus(1);
+					return false;
+				}
+			});
+		}
+
+		// set focus to the first tabbable element in the content area or the first button
+		// if there are no tabbable elements, set focus on the dialog itself
+		$(self.element.find(':tabbable').get().concat(
+			uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
+				uiDialog.get()))).eq(0).focus();
+
+		self._isOpen = true;
+		self._trigger('open');
+
+		return self;
+	},
+
+	_createButtons: function(buttons) {
+		var self = this,
+			hasButtons = false,
+			uiDialogButtonPane = $('<div></div>')
+				.addClass(
+					'ui-dialog-buttonpane ' +
+					'ui-widget-content ' +
+					'ui-helper-clearfix'
+				),
+			uiButtonSet = $( "<div></div>" )
+				.addClass( "ui-dialog-buttonset" )
+				.appendTo( uiDialogButtonPane );
+
+		// if we already have a button pane, remove it
+		self.uiDialog.find('.ui-dialog-buttonpane').remove();
+
+		if (typeof buttons === 'object' && buttons !== null) {
+			$.each(buttons, function() {
+				return !(hasButtons = true);
+			});
+		}
+		if (hasButtons) {
+			$.each(buttons, function(name, props) {
+				props = $.isFunction( props ) ?
+					{ click: props, text: name } :
+					props;
+				var button = $('<button type="button"></button>')
+					.attr( props, true )
+					.unbind('click')
+					.click(function() {
+						props.click.apply(self.element[0], arguments);
+					})
+					.appendTo(uiButtonSet);
+				if ($.fn.button) {
+					button.button();
+				}
+			});
+			uiDialogButtonPane.appendTo(self.uiDialog);
+		}
+	},
+
+	_makeDraggable: function() {
+		var self = this,
+			options = self.options,
+			doc = $(document),
+			heightBeforeDrag;
+
+		function filteredUi(ui) {
+			return {
+				position: ui.position,
+				offset: ui.offset
+			};
+		}
+
+		self.uiDialog.draggable({
+			cancel: '.ui-dialog-content, .ui-dialog-titlebar-close',
+			handle: '.ui-dialog-titlebar',
+			containment: 'document',
+			start: function(event, ui) {
+				heightBeforeDrag = options.height === "auto" ? "auto" : $(this).height();
+				$(this).height($(this).height()).addClass("ui-dialog-dragging");
+				self._trigger('dragStart', event, filteredUi(ui));
+			},
+			drag: function(event, ui) {
+				self._trigger('drag', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				options.position = [ui.position.left - doc.scrollLeft(),
+					ui.position.top - doc.scrollTop()];
+				$(this).removeClass("ui-dialog-dragging").height(heightBeforeDrag);
+				self._trigger('dragStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		});
+	},
+
+	_makeResizable: function(handles) {
+		handles = (handles === undefined ? this.options.resizable : handles);
+		var self = this,
+			options = self.options,
+			// .ui-resizable has position: relative defined in the stylesheet
+			// but dialogs have to use absolute or fixed positioning
+			position = self.uiDialog.css('position'),
+			resizeHandles = (typeof handles === 'string' ?
+				handles	:
+				'n,e,s,w,se,sw,ne,nw'
+			);
+
+		function filteredUi(ui) {
+			return {
+				originalPosition: ui.originalPosition,
+				originalSize: ui.originalSize,
+				position: ui.position,
+				size: ui.size
+			};
+		}
+
+		self.uiDialog.resizable({
+			cancel: '.ui-dialog-content',
+			containment: 'document',
+			alsoResize: self.element,
+			maxWidth: options.maxWidth,
+			maxHeight: options.maxHeight,
+			minWidth: options.minWidth,
+			minHeight: self._minHeight(),
+			handles: resizeHandles,
+			start: function(event, ui) {
+				$(this).addClass("ui-dialog-resizing");
+				self._trigger('resizeStart', event, filteredUi(ui));
+			},
+			resize: function(event, ui) {
+				self._trigger('resize', event, filteredUi(ui));
+			},
+			stop: function(event, ui) {
+				$(this).removeClass("ui-dialog-resizing");
+				options.height = $(this).height();
+				options.width = $(this).width();
+				self._trigger('resizeStop', event, filteredUi(ui));
+				$.ui.dialog.overlay.resize();
+			}
+		})
+		.css('position', position)
+		.find('.ui-resizable-se').addClass('ui-icon ui-icon-grip-diagonal-se');
+	},
+
+	_minHeight: function() {
+		var options = this.options;
+
+		if (options.height === 'auto') {
+			return options.minHeight;
+		} else {
+			return Math.min(options.minHeight, options.height);
+		}
+	},
+
+	_position: function(position) {
+		var myAt = [],
+			offset = [0, 0],
+			isVisible;
+
+		if (position) {
+			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
+	//		if (typeof position == 'string' || $.isArray(position)) {
+	//			myAt = $.isArray(position) ? position : position.split(' ');
+
+			if (typeof position === 'string' || (typeof position === 'object' && '0' in position)) {
+				myAt = position.split ? position.split(' ') : [position[0], position[1]];
+				if (myAt.length === 1) {
+					myAt[1] = myAt[0];
+				}
+
+				$.each(['left', 'top'], function(i, offsetPosition) {
+					if (+myAt[i] === myAt[i]) {
+						offset[i] = myAt[i];
+						myAt[i] = offsetPosition;
+					}
+				});
+
+				position = {
+					my: myAt.join(" "),
+					at: myAt.join(" "),
+					offset: offset.join(" ")
+				};
+			} 
+
+			position = $.extend({}, $.ui.dialog.prototype.options.position, position);
+		} else {
+			position = $.ui.dialog.prototype.options.position;
+		}
+
+		// need to show the dialog to get the actual offset in the position plugin
+		isVisible = this.uiDialog.is(':visible');
+		if (!isVisible) {
+			this.uiDialog.show();
+		}
+		this.uiDialog
+			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
+			.css({ top: 0, left: 0 })
+			.position($.extend({ of: window }, position));
+		if (!isVisible) {
+			this.uiDialog.hide();
+		}
+	},
+
+	_setOptions: function( options ) {
+		var self = this,
+			resizableOptions = {},
+			resize = false;
+
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+			
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+		}
+		if ( this.uiDialog.is( ":data(resizable)" ) ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function(key, value){
+		var self = this,
+			uiDialog = self.uiDialog;
+
+		switch (key) {
+			//handling of deprecated beforeclose (vs beforeClose) option
+			//Ticket #4669 http://dev.jqueryui.com/ticket/4669
+			//TODO: remove in 1.9pre
+			case "beforeclose":
+				key = "beforeClose";
+				break;
+			case "buttons":
+				self._createButtons(value);
+				break;
+			case "closeText":
+				// ensure that we always pass a string
+				self.uiDialogTitlebarCloseText.text("" + value);
+				break;
+			case "dialogClass":
+				uiDialog
+					.removeClass(self.options.dialogClass)
+					.addClass(uiDialogClasses + value);
+				break;
+			case "disabled":
+				if (value) {
+					uiDialog.addClass('ui-dialog-disabled');
+				} else {
+					uiDialog.removeClass('ui-dialog-disabled');
+				}
+				break;
+			case "draggable":
+				var isDraggable = uiDialog.is( ":data(draggable)" );
+				if ( isDraggable && !value ) {
+					uiDialog.draggable( "destroy" );
+				}
+				
+				if ( !isDraggable && value ) {
+					self._makeDraggable();
+				}
+				break;
+			case "position":
+				self._position(value);
+				break;
+			case "resizable":
+				// currently resizable, becoming non-resizable
+				var isResizable = uiDialog.is( ":data(resizable)" );
+				if (isResizable && !value) {
+					uiDialog.resizable('destroy');
+				}
+
+				// currently resizable, changing handles
+				if (isResizable && typeof value === 'string') {
+					uiDialog.resizable('option', 'handles', value);
+				}
+
+				// currently non-resizable, becoming resizable
+				if (!isResizable && value !== false) {
+					self._makeResizable(value);
+				}
+				break;
+			case "title":
+				// convert whatever was passed in o a string, for html() to not throw up
+				$(".ui-dialog-title", self.uiDialogTitlebar).html("" + (value || '&#160;'));
+				break;
+		}
+
+		$.Widget.prototype._setOption.apply(self, arguments);
+	},
+
+	_size: function() {
+		/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
+		 * divs will both have width and height set, so we need to reset them
+		 */
+		var options = this.options,
+			nonContentHeight,
+			minContentHeight,
+			isVisible = this.uiDialog.is( ":visible" );
+
+		// reset content sizing
+		this.element.show().css({
+			width: 'auto',
+			minHeight: 0,
+			height: 0
+		});
+
+		if (options.minWidth > options.width) {
+			options.width = options.minWidth;
+		}
+
+		// reset wrapper sizing
+		// determine the height of all the non-content elements
+		nonContentHeight = this.uiDialog.css({
+				height: 'auto',
+				width: options.width
+			})
+			.height();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		
+		if ( options.height === "auto" ) {
+			// only needed for IE6 support
+			if ( $.support.minHeight ) {
+				this.element.css({
+					minHeight: minContentHeight,
+					height: "auto"
+				});
+			} else {
+				this.uiDialog.show();
+				var autoHeight = this.element.css( "height", "auto" ).height();
+				if ( !isVisible ) {
+					this.uiDialog.hide();
+				}
+				this.element.height( Math.max( autoHeight, minContentHeight ) );
+			}
+		} else {
+			this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
+		}
+
+		if (this.uiDialog.is(':data(resizable)')) {
+			this.uiDialog.resizable('option', 'minHeight', this._minHeight());
+		}
+	}
+});
+
+$.extend($.ui.dialog, {
+	version: "1.8.9",
+
+	uuid: 0,
+	maxZ: 0,
+
+	getTitleId: function($el) {
+		var id = $el.attr('id');
+		if (!id) {
+			this.uuid += 1;
+			id = this.uuid;
+		}
+		return 'ui-dialog-title-' + id;
+	},
+
+	overlay: function(dialog) {
+		this.$el = $.ui.dialog.overlay.create(dialog);
+	}
+});
+
+$.extend($.ui.dialog.overlay, {
+	instances: [],
+	// reuse old instances due to IE memory leak with alpha transparency (see #5185)
+	oldInstances: [],
+	maxZ: 0,
+	events: $.map('focus,mousedown,mouseup,keydown,keypress,click'.split(','),
+		function(event) { return event + '.dialog-overlay'; }).join(' '),
+	create: function(dialog) {
+		if (this.instances.length === 0) {
+			// prevent use of anchors and inputs
+			// we use a setTimeout in case the overlay is created from an
+			// event that we're going to be cancelling (see #2804)
+			setTimeout(function() {
+				// handle $(el).dialog().dialog('close') (see #4065)
+				if ($.ui.dialog.overlay.instances.length) {
+					$(document).bind($.ui.dialog.overlay.events, function(event) {
+						// stop events if the z-index of the target is < the z-index of the overlay
+						// we cannot return true when we don't want to cancel the event (#3523)
+						if ($(event.target).zIndex() < $.ui.dialog.overlay.maxZ) {
+							return false;
+						}
+					});
+				}
+			}, 1);
+
+			// allow closing by pressing the escape key
+			$(document).bind('keydown.dialog-overlay', function(event) {
+				if (dialog.options.closeOnEscape && event.keyCode &&
+					event.keyCode === $.ui.keyCode.ESCAPE) {
+					
+					dialog.close(event);
+					event.preventDefault();
+				}
+			});
+
+			// handle window resize
+			$(window).bind('resize.dialog-overlay', $.ui.dialog.overlay.resize);
+		}
+
+		var $el = (this.oldInstances.pop() || $('<div></div>').addClass('ui-widget-overlay'))
+			.appendTo(document.body)
+			.css({
+				width: this.width(),
+				height: this.height()
+			});
+
+		if ($.fn.bgiframe) {
+			$el.bgiframe();
+		}
+
+		this.instances.push($el);
+		return $el;
+	},
+
+	destroy: function($el) {
+		var indexOf = $.inArray($el, this.instances);
+		if (indexOf != -1){
+			this.oldInstances.push(this.instances.splice(indexOf, 1)[0]);
+		}
+
+		if (this.instances.length === 0) {
+			$([document, window]).unbind('.dialog-overlay');
+		}
+
+		$el.remove();
+		
+		// adjust the maxZ to allow other modal dialogs to continue to work (see #4309)
+		var maxZ = 0;
+		$.each(this.instances, function() {
+			maxZ = Math.max(maxZ, this.css('z-index'));
+		});
+		this.maxZ = maxZ;
+	},
+
+	height: function() {
+		var scrollHeight,
+			offsetHeight;
+		// handle IE 6
+		if ($.browser.msie && $.browser.version < 7) {
+			scrollHeight = Math.max(
+				document.documentElement.scrollHeight,
+				document.body.scrollHeight
+			);
+			offsetHeight = Math.max(
+				document.documentElement.offsetHeight,
+				document.body.offsetHeight
+			);
+
+			if (scrollHeight < offsetHeight) {
+				return $(window).height() + 'px';
+			} else {
+				return scrollHeight + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).height() + 'px';
+		}
+	},
+
+	width: function() {
+		var scrollWidth,
+			offsetWidth;
+		// handle IE 6
+		if ($.browser.msie && $.browser.version < 7) {
+			scrollWidth = Math.max(
+				document.documentElement.scrollWidth,
+				document.body.scrollWidth
+			);
+			offsetWidth = Math.max(
+				document.documentElement.offsetWidth,
+				document.body.offsetWidth
+			);
+
+			if (scrollWidth < offsetWidth) {
+				return $(window).width() + 'px';
+			} else {
+				return scrollWidth + 'px';
+			}
+		// handle "good" browsers
+		} else {
+			return $(document).width() + 'px';
+		}
+	},
+
+	resize: function() {
+		/* If the dialog is draggable and the user drags it past the
+		 * right edge of the window, the document becomes wider so we
+		 * need to stretch the overlay. If the user then drags the
+		 * dialog back to the left, the document will become narrower,
+		 * so we need to shrink the overlay to the appropriate size.
+		 * This is handled by shrinking the overlay before setting it
+		 * to the full document size.
+		 */
+		var $overlays = $([]);
+		$.each($.ui.dialog.overlay.instances, function() {
+			$overlays = $overlays.add(this);
+		});
+
+		$overlays.css({
+			width: 0,
+			height: 0
+		}).css({
+			width: $.ui.dialog.overlay.width(),
+			height: $.ui.dialog.overlay.height()
+		});
+	}
+});
+
+$.extend($.ui.dialog.overlay.prototype, {
+	destroy: function() {
+		$.ui.dialog.overlay.destroy(this.$el);
+	}
+});
+
+}(jQuery));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.draggable.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,797 @@
+/*
+ * jQuery UI Draggable 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.draggable", $.ui.mouse, {
+	widgetEventPrefix: "drag",
+	options: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scope: "default",
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false
+	},
+	_create: function() {
+
+		if (this.options.helper == 'original' && !(/^(?:r|a|f)/).test(this.element.css("position")))
+			this.element[0].style.position = 'relative';
+
+		(this.options.addClasses && this.element.addClass("ui-draggable"));
+		(this.options.disabled && this.element.addClass("ui-draggable-disabled"));
+
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+		if(!this.element.data('draggable')) return;
+		this.element
+			.removeData("draggable")
+			.unbind(".draggable")
+			.removeClass("ui-draggable"
+				+ " ui-draggable-dragging"
+				+ " ui-draggable-disabled");
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+
+		var o = this.options;
+
+		// among others, prevent a drag on a resizable-handle
+		if (this.helper || o.disabled || $(event.target).is('.ui-resizable-handle'))
+			return false;
+
+		//Quit if we're not on a valid handle
+		this.handle = this._getHandle(event);
+		if (!this.handle)
+			return false;
+
+		return true;
+
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options;
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		//If ddmanager is used for droppables, set the global draggable
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Store the helper's css position
+		this.cssPosition = this.helper.css("position");
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.positionAbs = this.element.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this.position = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		//Trigger event + callbacks
+		if(this._trigger("start", event) === false) {
+			this._clear();
+			return false;
+		}
+
+		//Recache the helper size
+		this._cacheHelperProportions();
+
+		//Prepare the droppable offsets
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		this.helper.addClass("ui-draggable-dragging");
+		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+	},
+
+	_mouseDrag: function(event, noPropagation) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Call plugins and callbacks and use the resulting position if something is returned
+		if (!noPropagation) {
+			var ui = this._uiHash();
+			if(this._trigger('drag', event, ui) === false) {
+				this._mouseUp({});
+				return false;
+			}
+			this.position = ui.position;
+		}
+
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		//If we are using droppables, inform the manager about the drop
+		var dropped = false;
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			dropped = $.ui.ddmanager.drop(this, event);
+
+		//if a drop comes from outside (a sortable)
+		if(this.dropped) {
+			dropped = this.dropped;
+			this.dropped = false;
+		}
+		
+		//if the original element is removed, don't bother to continue if helper is set to "original"
+		if((!this.element[0] || !this.element[0].parentNode) && this.options.helper == "original")
+			return false;
+
+		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
+			var self = this;
+			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
+				if(self._trigger("stop", event) !== false) {
+					self._clear();
+				}
+			});
+		} else {
+			if(this._trigger("stop", event) !== false) {
+				this._clear();
+			}
+		}
+
+		return false;
+	},
+	
+	cancel: function() {
+		
+		if(this.helper.is(".ui-draggable-dragging")) {
+			this._mouseUp({});
+		} else {
+			this._clear();
+		}
+		
+		return this;
+		
+	},
+
+	_getHandle: function(event) {
+
+		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
+		$(this.options.handle, this.element)
+			.find("*")
+			.andSelf()
+			.each(function() {
+				if(this == event.target) handle = true;
+			});
+
+		return handle;
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper == 'clone' ? this.element.clone() : this.element);
+
+		if(!helper.parents('body').length)
+			helper.appendTo((o.appendTo == 'parent' ? this.element[0].parentNode : o.appendTo));
+
+		if(helper[0] != this.element[0] && !(/(fixed|absolute)/).test(helper.css("position")))
+			helper.css("position", "absolute");
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.browser.msie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.element.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.element.css("marginLeft"),10) || 0),
+			top: (parseInt(this.element.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) - this.offset.relative.left - this.offset.parent.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) - this.offset.relative.top - this.offset.parent.top,
+			(o.containment == 'document' ? 0 : $(window).scrollLeft()) + $(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			(o.containment == 'document' ? 0 : $(window).scrollTop()) + ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor != Array) {
+			var ce = $(o.containment)[0]; if(!ce) return;
+			var co = $(o.containment).offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		} else if(o.containment.constructor == Array) {
+			this.containment = o.containment;
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.ui.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ($.browser.safari && $.browser.version < 526 && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_clear: function() {
+		this.helper.removeClass("ui-draggable-dragging");
+		if(this.helper[0] != this.element[0] && !this.cancelHelperRemoval) this.helper.remove();
+		//if($.ui.ddmanager) $.ui.ddmanager.current = null;
+		this.helper = null;
+		this.cancelHelperRemoval = false;
+	},
+
+	// From now on bulk stuff - mainly helpers
+
+	_trigger: function(type, event, ui) {
+		ui = ui || this._uiHash();
+		$.ui.plugin.call(this, type, [event, ui]);
+		if(type == "drag") this.positionAbs = this._convertPositionTo("absolute"); //The absolute position has to be recalculated after plugins
+		return $.Widget.prototype._trigger.call(this, type, event, ui);
+	},
+
+	plugins: {},
+
+	_uiHash: function(event) {
+		return {
+			helper: this.helper,
+			position: this.position,
+			originalPosition: this.originalPosition,
+			offset: this.positionAbs
+		};
+	}
+
+});
+
+$.extend($.ui.draggable, {
+	version: "1.8.9"
+});
+
+$.ui.plugin.add("draggable", "connectToSortable", {
+	start: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options,
+			uiSortable = $.extend({}, ui, { item: inst.element });
+		inst.sortables = [];
+		$(o.connectToSortable).each(function() {
+			var sortable = $.data(this, 'sortable');
+			if (sortable && !sortable.options.disabled) {
+				inst.sortables.push({
+					instance: sortable,
+					shouldRevert: sortable.options.revert
+				});
+				sortable._refreshItems();	//Do a one-time refresh at start to refresh the containerCache
+				sortable._trigger("activate", event, uiSortable);
+			}
+		});
+
+	},
+	stop: function(event, ui) {
+
+		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+		var inst = $(this).data("draggable"),
+			uiSortable = $.extend({}, ui, { item: inst.element });
+
+		$.each(inst.sortables, function() {
+			if(this.instance.isOver) {
+
+				this.instance.isOver = 0;
+
+				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
+				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
+
+				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: 'valid/invalid'
+				if(this.shouldRevert) this.instance.options.revert = true;
+
+				//Trigger the stop of the sortable
+				this.instance._mouseStop(event);
+
+				this.instance.options.helper = this.instance.options._helper;
+
+				//If the helper has been the original item, restore properties in the sortable
+				if(inst.options.helper == 'original')
+					this.instance.currentItem.css({ top: 'auto', left: 'auto' });
+
+			} else {
+				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
+				this.instance._trigger("deactivate", event, uiSortable);
+			}
+
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), self = this;
+
+		var checkPos = function(o) {
+			var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
+			var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
+			var itemHeight = o.height, itemWidth = o.width;
+			var itemTop = o.top, itemLeft = o.left;
+
+			return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop, itemLeft, itemHeight, itemWidth);
+		};
+
+		$.each(inst.sortables, function(i) {
+			
+			//Copy over some variables to allow calling the sortable's native _intersectsWith
+			this.instance.positionAbs = inst.positionAbs;
+			this.instance.helperProportions = inst.helperProportions;
+			this.instance.offset.click = inst.offset.click;
+			
+			if(this.instance._intersectsWith(this.instance.containerCache)) {
+
+				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
+				if(!this.instance.isOver) {
+
+					this.instance.isOver = 1;
+					//Now we fake the start of dragging for the sortable instance,
+					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
+					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
+					this.instance.currentItem = $(self).clone().appendTo(this.instance.element).data("sortable-item", true);
+					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
+					this.instance.options.helper = function() { return ui.helper[0]; };
+
+					event.target = this.instance.currentItem[0];
+					this.instance._mouseCapture(event, true);
+					this.instance._mouseStart(event, true, true);
+
+					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
+					this.instance.offset.click.top = inst.offset.click.top;
+					this.instance.offset.click.left = inst.offset.click.left;
+					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
+					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+
+					inst._trigger("toSortable", event);
+					inst.dropped = this.instance.element; //draggable revert needs that
+					//hack so receive/update callbacks work (mostly)
+					inst.currentItem = inst.element;
+					this.instance.fromOutside = inst;
+
+				}
+
+				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
+				if(this.instance.currentItem) this.instance._mouseDrag(event);
+
+			} else {
+
+				//If it doesn't intersect with the sortable, and it intersected before,
+				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
+				if(this.instance.isOver) {
+
+					this.instance.isOver = 0;
+					this.instance.cancelHelperRemoval = true;
+					
+					//Prevent reverting on this forced stop
+					this.instance.options.revert = false;
+					
+					// The out event needs to be triggered independently
+					this.instance._trigger('out', event, this.instance._uiHash(this.instance));
+					
+					this.instance._mouseStop(event, true);
+					this.instance.options.helper = this.instance.options._helper;
+
+					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
+					this.instance.currentItem.remove();
+					if(this.instance.placeholder) this.instance.placeholder.remove();
+
+					inst._trigger("fromSortable", event);
+					inst.dropped = false; //draggable revert needs that
+				}
+
+			};
+
+		});
+
+	}
+});
+
+$.ui.plugin.add("draggable", "cursor", {
+	start: function(event, ui) {
+		var t = $('body'), o = $(this).data('draggable').options;
+		if (t.css("cursor")) o._cursor = t.css("cursor");
+		t.css("cursor", o.cursor);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if (o._cursor) $('body').css("cursor", o._cursor);
+	}
+});
+
+$.ui.plugin.add("draggable", "iframeFix", {
+	start: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+			$('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>')
+			.css({
+				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+				position: "absolute", opacity: "0.001", zIndex: 1000
+			})
+			.css($(this).offset())
+			.appendTo("body");
+		});
+	},
+	stop: function(event, ui) {
+		$("div.ui-draggable-iframeFix").each(function() { this.parentNode.removeChild(this); }); //Remove frame helpers
+	}
+});
+
+$.ui.plugin.add("draggable", "opacity", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data('draggable').options;
+		if(t.css("opacity")) o._opacity = t.css("opacity");
+		t.css('opacity', o.opacity);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data('draggable').options;
+		if(o._opacity) $(ui.helper).css('opacity', o._opacity);
+	}
+});
+
+$.ui.plugin.add("draggable", "scroll", {
+	start: function(event, ui) {
+		var i = $(this).data("draggable");
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
+	},
+	drag: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options, scrolled = false;
+
+		if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {
+
+			if(!o.axis || o.axis != 'x') {
+				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity)
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity)
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+			}
+
+		} else {
+
+			if(!o.axis || o.axis != 'x') {
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+			}
+
+			if(!o.axis || o.axis != 'y') {
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+			}
+
+		}
+
+		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(i, event);
+
+	}
+});
+
+$.ui.plugin.add("draggable", "snap", {
+	start: function(event, ui) {
+
+		var i = $(this).data("draggable"), o = i.options;
+		i.snapElements = [];
+
+		$(o.snap.constructor != String ? ( o.snap.items || ':data(draggable)' ) : o.snap).each(function() {
+			var $t = $(this); var $o = $t.offset();
+			if(this != i.element[0]) i.snapElements.push({
+				item: this,
+				width: $t.outerWidth(), height: $t.outerHeight(),
+				top: $o.top, left: $o.left
+			});
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("draggable"), o = inst.options;
+		var d = o.snapTolerance;
+
+		var x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
+			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
+
+		for (var i = inst.snapElements.length - 1; i >= 0; i--){
+
+			var l = inst.snapElements[i].left, r = l + inst.snapElements[i].width,
+				t = inst.snapElements[i].top, b = t + inst.snapElements[i].height;
+
+			//Yes, I know, this is insane ;)
+			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
+				if(inst.snapElements[i].snapping) (inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+				inst.snapElements[i].snapping = false;
+				continue;
+			}
+
+			if(o.snapMode != 'inner') {
+				var ts = Math.abs(t - y2) <= d;
+				var bs = Math.abs(b - y1) <= d;
+				var ls = Math.abs(l - x2) <= d;
+				var rs = Math.abs(r - x1) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+			}
+
+			var first = (ts || bs || ls || rs);
+
+			if(o.snapMode != 'outer') {
+				var ts = Math.abs(t - y1) <= d;
+				var bs = Math.abs(b - y2) <= d;
+				var ls = Math.abs(l - x1) <= d;
+				var rs = Math.abs(r - x2) <= d;
+				if(ts) ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+				if(bs) ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				if(ls) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+				if(rs) ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+			}
+
+			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first))
+				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+
+		};
+
+	}
+});
+
+$.ui.plugin.add("draggable", "stack", {
+	start: function(event, ui) {
+
+		var o = $(this).data("draggable").options;
+
+		var group = $.makeArray($(o.stack)).sort(function(a,b) {
+			return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+		});
+		if (!group.length) { return; }
+		
+		var min = parseInt(group[0].style.zIndex) || 0;
+		$(group).each(function(i) {
+			this.style.zIndex = min + i;
+		});
+
+		this[0].style.zIndex = min + group.length;
+
+	}
+});
+
+$.ui.plugin.add("draggable", "zIndex", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("draggable").options;
+		if(t.css("zIndex")) o._zIndex = t.css("zIndex");
+		t.css('zIndex', o.zIndex);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("draggable").options;
+		if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex);
+	}
+});
+
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.mouse.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,151 @@
+/*!
+ * jQuery UI Mouse 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.mouse", {
+	options: {
+		cancel: ':input,option',
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var self = this;
+
+		this.element
+			.bind('mousedown.'+this.widgetName, function(event) {
+				return self._mouseDown(event);
+			})
+			.bind('click.'+this.widgetName, function(event) {
+				if (true === $.data(event.target, self.widgetName + '.preventClickEvent')) {
+				    $.removeData(event.target, self.widgetName + '.preventClickEvent');
+					event.stopImmediatePropagation();
+					return false;
+				}
+			});
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.unbind('.'+this.widgetName);
+	},
+
+	_mouseDown: function(event) {
+		// don't let more than one widget handle mouseStart
+		// TODO: figure out why we have to use originalEvent
+		event.originalEvent = event.originalEvent || {};
+		if (event.originalEvent.mouseHandled) { return; }
+
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this._mouseUp(event));
+
+		this._mouseDownEvent = event;
+
+		var self = this,
+			btnIsLeft = (event.which == 1),
+			elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
+		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if (!this.mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				self.mouseDelayMet = true;
+			}, this.options.delay);
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted = (this._mouseStart(event) !== false);
+			if (!this._mouseStarted) {
+				event.preventDefault();
+				return true;
+			}
+		}
+
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(event) {
+			return self._mouseMove(event);
+		};
+		this._mouseUpDelegate = function(event) {
+			return self._mouseUp(event);
+		};
+		$(document)
+			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		event.preventDefault();
+		event.originalEvent.mouseHandled = true;
+		return true;
+	},
+
+	_mouseMove: function(event) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.browser.msie && !(document.documentMode >= 9) && !event.button) {
+			return this._mouseUp(event);
+		}
+
+		if (this._mouseStarted) {
+			this._mouseDrag(event);
+			return event.preventDefault();
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted =
+				(this._mouseStart(this._mouseDownEvent, event) !== false);
+			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function(event) {
+		$(document)
+			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+
+			if (event.target == this._mouseDownEvent.target) {
+			    $.data(event.target, this.widgetName + '.preventClickEvent', true);
+			}
+
+			this._mouseStop(event);
+		}
+
+		return false;
+	},
+
+	_mouseDistanceMet: function(event) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - event.pageX),
+				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function(event) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function(event) {},
+	_mouseDrag: function(event) {},
+	_mouseStop: function(event) {},
+	_mouseCapture: function(event) { return true; }
+});
+
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.position.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,252 @@
+/*
+ * jQuery UI Position 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var horizontalPositions = /left|center|right/,
+	verticalPositions = /top|center|bottom/,
+	center = "center",
+	_position = $.fn.position,
+	_offset = $.fn.offset;
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var target = $( options.of ),
+		targetElem = target[0],
+		collision = ( options.collision || "flip" ).split( " " ),
+		offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ],
+		targetWidth,
+		targetHeight,
+		basePosition;
+
+	if ( targetElem.nodeType === 9 ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: 0, left: 0 };
+	// TODO: use $.isWindow() in 1.9
+	} else if ( targetElem.setTimeout ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		basePosition = { top: target.scrollTop(), left: target.scrollLeft() };
+	} else if ( targetElem.preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+		targetWidth = targetHeight = 0;
+		basePosition = { top: options.of.pageY, left: options.of.pageX };
+	} else {
+		targetWidth = target.outerWidth();
+		targetHeight = target.outerHeight();
+		basePosition = target.offset();
+	}
+
+	// force my and at to have valid horizontal and veritcal positions
+	// if a value is missing or invalid, it will be converted to center 
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[this] || "" ).split( " " );
+		if ( pos.length === 1) {
+			pos = horizontalPositions.test( pos[0] ) ?
+				pos.concat( [center] ) :
+				verticalPositions.test( pos[0] ) ?
+					[ center ].concat( pos ) :
+					[ center, center ];
+		}
+		pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center;
+		pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center;
+		options[ this ] = pos;
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	// normalize offset option
+	offset[ 0 ] = parseInt( offset[0], 10 ) || 0;
+	if ( offset.length === 1 ) {
+		offset[ 1 ] = offset[ 0 ];
+	}
+	offset[ 1 ] = parseInt( offset[1], 10 ) || 0;
+
+	if ( options.at[0] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[0] === center ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[1] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[1] === center ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	basePosition.left += offset[ 0 ];
+	basePosition.top += offset[ 1 ];
+
+	return this.each(function() {
+		var elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
+			marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
+			collisionWidth = elemWidth + marginLeft +
+				( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ),
+			collisionHeight = elemHeight + marginTop +
+				( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ),
+			position = $.extend( {}, basePosition ),
+			collisionPosition;
+
+		if ( options.my[0] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[0] === center ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[1] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[1] === center ) {
+			position.top -= elemHeight / 2;
+		}
+
+		// prevent fractions (see #5280)
+		position.left = Math.round( position.left );
+		position.top = Math.round( position.top );
+
+		collisionPosition = {
+			left: position.left - marginLeft,
+			top: position.top - marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[i] ] ) {
+				$.ui.position[ collision[i] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: offset,
+					my: options.my,
+					at: options.at
+				});
+			}
+		});
+
+		if ( $.fn.bgiframe ) {
+			elem.bgiframe();
+		}
+		elem.offset( $.extend( position, { using: options.using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
+			position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left );
+		},
+		top: function( position, data ) {
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
+			position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top );
+		}
+	},
+
+	flip: {
+		left: function( position, data ) {
+			if ( data.at[0] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(),
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					-data.targetWidth,
+				offset = -2 * data.offset[ 0 ];
+			position.left += data.collisionPosition.left < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		},
+		top: function( position, data ) {
+			if ( data.at[1] === center ) {
+				return;
+			}
+			var win = $( window ),
+				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(),
+				myOffset = data.my[ 1 ] === "top" ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					-data.targetHeight,
+				offset = -2 * data.offset[ 1 ];
+			position.top += data.collisionPosition.top < 0 ?
+				myOffset + atOffset + offset :
+				over > 0 ?
+					myOffset + atOffset + offset :
+					0;
+		}
+	}
+};
+
+// offset setter from jQuery 1.4
+if ( !$.offset.setOffset ) {
+	$.offset.setOffset = function( elem, options ) {
+		// set position first, in-case top/left are set even on static elem
+		if ( /static/.test( $.curCSS( elem, "position" ) ) ) {
+			elem.style.position = "relative";
+		}
+		var curElem   = $( elem ),
+			curOffset = curElem.offset(),
+			curTop    = parseInt( $.curCSS( elem, "top",  true ), 10 ) || 0,
+			curLeft   = parseInt( $.curCSS( elem, "left", true ), 10)  || 0,
+			props     = {
+				top:  (options.top  - curOffset.top)  + curTop,
+				left: (options.left - curOffset.left) + curLeft
+			};
+		
+		if ( 'using' in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	};
+
+	$.fn.offset = function( options ) {
+		var elem = this[ 0 ];
+		if ( !elem || !elem.ownerDocument ) { return null; }
+		if ( options ) { 
+			return this.each(function() {
+				$.offset.setOffset( this, options );
+			});
+		}
+		return _offset.call( this );
+	};
+}
+
+}( jQuery ));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.resizable.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,812 @@
+/*
+ * jQuery UI Resizable 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+$.widget("ui.resizable", $.ui.mouse, {
+	widgetEventPrefix: "resize",
+	options: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		containment: false,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var self = this, o = this.options;
+		this.element.addClass("ui-resizable");
+
+		$.extend(this, {
+			_aspectRatio: !!(o.aspectRatio),
+			aspectRatio: o.aspectRatio,
+			originalElement: this.element,
+			_proportionallyResizeElements: [],
+			_helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null
+		});
+
+		//Wrap the element if it cannot hold child nodes
+		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+
+			//Opera fix for relative positioning
+			if (/relative/.test(this.element.css('position')) && $.browser.opera)
+				this.element.css({ position: 'relative', top: 'auto', left: 'auto' });
+
+			//Create a wrapper element and set the wrapper to the new current internal element
+			this.element.wrap(
+				$('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({
+					position: this.element.css('position'),
+					width: this.element.outerWidth(),
+					height: this.element.outerHeight(),
+					top: this.element.css('top'),
+					left: this.element.css('left')
+				})
+			);
+
+			//Overwrite the original this.element
+			this.element = this.element.parent().data(
+				"resizable", this.element.data('resizable')
+			);
+
+			this.elementIsWrapper = true;
+
+			//Move margins to the wrapper
+			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+
+			//Prevent Safari textarea resize
+			this.originalResizeStyle = this.originalElement.css('resize');
+			this.originalElement.css('resize', 'none');
+
+			//Push the actual element to our proportionallyResize internal array
+			this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
+
+			// avoid IE jump (hard set the margin)
+			this.originalElement.css({ margin: this.originalElement.css('margin') });
+
+			// fix handlers offset
+			this._proportionallyResize();
+
+		}
+
+		this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' });
+		if(this.handles.constructor == String) {
+
+			if(this.handles == 'all') this.handles = 'n,e,s,w,se,sw,ne,nw';
+			var n = this.handles.split(","); this.handles = {};
+
+			for(var i = 0; i < n.length; i++) {
+
+				var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
+				var axis = $('<div class="ui-resizable-handle ' + hname + '"></div>');
+
+				// increase zIndex of sw, se, ne, nw axis
+				//TODO : this modifies original option
+				if(/sw|se|ne|nw/.test(handle)) axis.css({ zIndex: ++o.zIndex });
+
+				//TODO : What's going on here?
+				if ('se' == handle) {
+					axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se');
+				};
+
+				//Insert into internal handles object and append to element
+				this.handles[handle] = '.ui-resizable-'+handle;
+				this.element.append(axis);
+			}
+
+		}
+
+		this._renderAxis = function(target) {
+
+			target = target || this.element;
+
+			for(var i in this.handles) {
+
+				if(this.handles[i].constructor == String)
+					this.handles[i] = $(this.handles[i], this.element).show();
+
+				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+
+					var axis = $(this.handles[i], this.element), padWrapper = 0;
+
+					//Checking the correct pad and border
+					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+
+					//The padding type i have to apply...
+					var padPos = [ 'padding',
+						/ne|nw|n/.test(i) ? 'Top' :
+						/se|sw|s/.test(i) ? 'Bottom' :
+						/^e$/.test(i) ? 'Right' : 'Left' ].join("");
+
+					target.css(padPos, padWrapper);
+
+					this._proportionallyResize();
+
+				}
+
+				//TODO: What's that good for? There's not anything to be executed left
+				if(!$(this.handles[i]).length)
+					continue;
+
+			}
+		};
+
+		//TODO: make renderAxis a prototype function
+		this._renderAxis(this.element);
+
+		this._handles = $('.ui-resizable-handle', this.element)
+			.disableSelection();
+
+		//Matching axis name
+		this._handles.mouseover(function() {
+			if (!self.resizing) {
+				if (this.className)
+					var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+				//Axis, default = se
+				self.axis = axis && axis[1] ? axis[1] : 'se';
+			}
+		});
+
+		//If we want to auto hide the elements
+		if (o.autoHide) {
+			this._handles.hide();
+			$(this.element)
+				.addClass("ui-resizable-autohide")
+				.hover(function() {
+					$(this).removeClass("ui-resizable-autohide");
+					self._handles.show();
+				},
+				function(){
+					if (!self.resizing) {
+						$(this).addClass("ui-resizable-autohide");
+						self._handles.hide();
+					}
+				});
+		}
+
+		//Initialize the mouse interaction
+		this._mouseInit();
+
+	},
+
+	destroy: function() {
+
+		this._mouseDestroy();
+
+		var _destroy = function(exp) {
+			$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+				.removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
+		};
+
+		//TODO: Unwrap at same DOM position
+		if (this.elementIsWrapper) {
+			_destroy(this.element);
+			var wrapper = this.element;
+			wrapper.after(
+				this.originalElement.css({
+					position: wrapper.css('position'),
+					width: wrapper.outerWidth(),
+					height: wrapper.outerHeight(),
+					top: wrapper.css('top'),
+					left: wrapper.css('left')
+				})
+			).remove();
+		}
+
+		this.originalElement.css('resize', this.originalResizeStyle);
+		_destroy(this.originalElement);
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+		var handle = false;
+		for (var i in this.handles) {
+			if ($(this.handles[i])[0] == event.target) {
+				handle = true;
+			}
+		}
+
+		return !this.options.disabled && handle;
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options, iniPos = this.element.position(), el = this.element;
+
+		this.resizing = true;
+		this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
+
+		// bugfix for http://dev.jquery.com/ticket/1749
+		if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
+			el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
+		}
+
+		//Opera fixing relative position
+		if ($.browser.opera && (/relative/).test(el.css('position')))
+			el.css({ position: 'relative', top: 'auto', left: 'auto' });
+
+		this._renderProxy();
+
+		var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
+
+		if (o.containment) {
+			curleft += $(o.containment).scrollLeft() || 0;
+			curtop += $(o.containment).scrollTop() || 0;
+		}
+
+		//Store needed variables
+		this.offset = this.helper.offset();
+		this.position = { left: curleft, top: curtop };
+		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalPosition = { left: curleft, top: curtop };
+		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
+		this.originalMousePosition = { left: event.pageX, top: event.pageY };
+
+		//Aspect Ratio
+		this.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+
+	    var cursor = $('.ui-resizable-' + this.axis).css('cursor');
+	    $('body').css('cursor', cursor == 'auto' ? this.axis + '-resize' : cursor);
+
+		el.addClass("ui-resizable-resizing");
+		this._propagate("start", event);
+		return true;
+	},
+
+	_mouseDrag: function(event) {
+
+		//Increase performance, avoid regex
+		var el = this.helper, o = this.options, props = {},
+			self = this, smp = this.originalMousePosition, a = this.axis;
+
+		var dx = (event.pageX-smp.left)||0, dy = (event.pageY-smp.top)||0;
+		var trigger = this._change[a];
+		if (!trigger) return false;
+
+		// Calculate the attrs that will be change
+		var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
+
+		if (this._aspectRatio || event.shiftKey)
+			data = this._updateRatio(data, event);
+
+		data = this._respectSize(data, event);
+
+		// plugins callbacks need to be called first
+		this._propagate("resize", event);
+
+		el.css({
+			top: this.position.top + "px", left: this.position.left + "px",
+			width: this.size.width + "px", height: this.size.height + "px"
+		});
+
+		if (!this._helper && this._proportionallyResizeElements.length)
+			this._proportionallyResize();
+
+		this._updateCache(data);
+
+		// calling the user callback at the end
+		this._trigger('resize', event, this.ui());
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		this.resizing = false;
+		var o = this.options, self = this;
+
+		if(this._helper) {
+			var pr = this._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+						soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+							soffsetw = ista ? 0 : self.sizeDiff.width;
+
+			var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+				left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+				top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+			if (!o.animate)
+				this.element.css($.extend(s, { top: top, left: left }));
+
+			self.helper.height(self.size.height);
+			self.helper.width(self.size.width);
+
+			if (this._helper && !o.animate) this._proportionallyResize();
+		}
+
+		$('body').css('cursor', 'auto');
+
+		this.element.removeClass("ui-resizable-resizing");
+
+		this._propagate("stop", event);
+
+		if (this._helper) this.helper.remove();
+		return false;
+
+	},
+
+	_updateCache: function(data) {
+		var o = this.options;
+		this.offset = this.helper.offset();
+		if (isNumber(data.left)) this.position.left = data.left;
+		if (isNumber(data.top)) this.position.top = data.top;
+		if (isNumber(data.height)) this.size.height = data.height;
+		if (isNumber(data.width)) this.size.width = data.width;
+	},
+
+	_updateRatio: function(data, event) {
+
+		var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
+
+		if (data.height) data.width = (csize.height * this.aspectRatio);
+		else if (data.width) data.height = (csize.width / this.aspectRatio);
+
+		if (a == 'sw') {
+			data.left = cpos.left + (csize.width - data.width);
+			data.top = null;
+		}
+		if (a == 'nw') {
+			data.top = cpos.top + (csize.height - data.height);
+			data.left = cpos.left + (csize.width - data.width);
+		}
+
+		return data;
+	},
+
+	_respectSize: function(data, event) {
+
+		var el = this.helper, o = this.options, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
+				ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+					isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
+
+		if (isminw) data.width = o.minWidth;
+		if (isminh) data.height = o.minHeight;
+		if (ismaxw) data.width = o.maxWidth;
+		if (ismaxh) data.height = o.maxHeight;
+
+		var dw = this.originalPosition.left + this.originalSize.width, dh = this.position.top + this.size.height;
+		var cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
+
+		if (isminw && cw) data.left = dw - o.minWidth;
+		if (ismaxw && cw) data.left = dw - o.maxWidth;
+		if (isminh && ch)	data.top = dh - o.minHeight;
+		if (ismaxh && ch)	data.top = dh - o.maxHeight;
+
+		// fixing jump error on top/left - bug #2330
+		var isNotwh = !data.width && !data.height;
+		if (isNotwh && !data.left && data.top) data.top = null;
+		else if (isNotwh && !data.top && data.left) data.left = null;
+
+		return data;
+	},
+
+	_proportionallyResize: function() {
+
+		var o = this.options;
+		if (!this._proportionallyResizeElements.length) return;
+		var element = this.helper || this.element;
+
+		for (var i=0; i < this._proportionallyResizeElements.length; i++) {
+
+			var prel = this._proportionallyResizeElements[i];
+
+			if (!this.borderDif) {
+				var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
+					p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
+
+				this.borderDif = $.map(b, function(v, i) {
+					var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
+					return border + padding;
+				});
+			}
+
+			if ($.browser.msie && !(!($(element).is(':hidden') || $(element).parents(':hidden').length)))
+				continue;
+
+			prel.css({
+				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+			});
+
+		};
+
+	},
+
+	_renderProxy: function() {
+
+		var el = this.element, o = this.options;
+		this.elementOffset = el.offset();
+
+		if(this._helper) {
+
+			this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
+
+			// fix ie6 offset TODO: This seems broken
+			var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
+			pxyoffset = ( ie6 ? 2 : -1 );
+
+			this.helper.addClass(this._helper).css({
+				width: this.element.outerWidth() + pxyoffset,
+				height: this.element.outerHeight() + pxyoffset,
+				position: 'absolute',
+				left: this.elementOffset.left - ie6offset +'px',
+				top: this.elementOffset.top - ie6offset +'px',
+				zIndex: ++o.zIndex //TODO: Don't modify option
+			});
+
+			this.helper
+				.appendTo("body")
+				.disableSelection();
+
+		} else {
+			this.helper = this.element;
+		}
+
+	},
+
+	_change: {
+		e: function(event, dx, dy) {
+			return { width: this.originalSize.width + dx };
+		},
+		w: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { left: sp.left + dx, width: cs.width - dx };
+		},
+		n: function(event, dx, dy) {
+			var o = this.options, cs = this.originalSize, sp = this.originalPosition;
+			return { top: sp.top + dy, height: cs.height - dy };
+		},
+		s: function(event, dx, dy) {
+			return { height: this.originalSize.height + dy };
+		},
+		se: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		sw: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		},
+		ne: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		nw: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		}
+	},
+
+	_propagate: function(n, event) {
+		$.ui.plugin.call(this, n, [event, this.ui()]);
+		(n != "resize" && this._trigger(n, event, this.ui()));
+	},
+
+	plugins: {},
+
+	ui: function() {
+		return {
+			originalElement: this.originalElement,
+			element: this.element,
+			helper: this.helper,
+			position: this.position,
+			size: this.size,
+			originalSize: this.originalSize,
+			originalPosition: this.originalPosition
+		};
+	}
+
+});
+
+$.extend($.ui.resizable, {
+	version: "1.8.9"
+});
+
+/*
+ * Resizable Extensions
+ */
+
+$.ui.plugin.add("resizable", "alsoResize", {
+
+	start: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var _store = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				el.data("resizable-alsoresize", {
+					width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+					left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10),
+					position: el.css('position') // to reset Opera on stop()
+				});
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
+		}else{
+			_store(o.alsoResize);
+		}
+	},
+
+	resize: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options, os = self.originalSize, op = self.originalPosition;
+
+		var delta = {
+			height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
+			top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
+		},
+
+		_alsoResize = function (exp, c) {
+			$(exp).each(function() {
+				var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, 
+					css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];
+
+				$.each(css, function (i, prop) {
+					var sum = (start[prop]||0) + (delta[prop]||0);
+					if (sum && sum >= 0)
+						style[prop] = sum || null;
+				});
+
+				// Opera fixing relative position
+				if ($.browser.opera && /relative/.test(el.css('position'))) {
+					self._revertToRelativePosition = true;
+					el.css({ position: 'absolute', top: 'auto', left: 'auto' });
+				}
+
+				el.css(style);
+			});
+		};
+
+		if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
+		}else{
+			_alsoResize(o.alsoResize);
+		}
+	},
+
+	stop: function (event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var _reset = function (exp) {
+			$(exp).each(function() {
+				var el = $(this);
+				// reset position for Opera - no need to verify it was changed
+				el.css({ position: el.data("resizable-alsoresize").position });
+			});
+		};
+
+		if (self._revertToRelativePosition) {
+			self._revertToRelativePosition = false;
+			if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
+				$.each(o.alsoResize, function (exp) { _reset(exp); });
+			}else{
+				_reset(o.alsoResize);
+			}
+		}
+
+		$(this).removeData("resizable-alsoresize");
+	}
+});
+
+$.ui.plugin.add("resizable", "animate", {
+
+	stop: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options;
+
+		var pr = self._proportionallyResizeElements, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+					soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+						soffsetw = ista ? 0 : self.sizeDiff.width;
+
+		var style = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
+					left = (parseInt(self.element.css('left'), 10) + (self.position.left - self.originalPosition.left)) || null,
+						top = (parseInt(self.element.css('top'), 10) + (self.position.top - self.originalPosition.top)) || null;
+
+		self.element.animate(
+			$.extend(style, top && left ? { top: top, left: left } : {}), {
+				duration: o.animateDuration,
+				easing: o.animateEasing,
+				step: function() {
+
+					var data = {
+						width: parseInt(self.element.css('width'), 10),
+						height: parseInt(self.element.css('height'), 10),
+						top: parseInt(self.element.css('top'), 10),
+						left: parseInt(self.element.css('left'), 10)
+					};
+
+					if (pr && pr.length) $(pr[0]).css({ width: data.width, height: data.height });
+
+					// propagating resize, and updating values for each animation step
+					self._updateCache(data);
+					self._propagate("resize", event);
+
+				}
+			}
+		);
+	}
+
+});
+
+$.ui.plugin.add("resizable", "containment", {
+
+	start: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, el = self.element;
+		var oc = o.containment,	ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
+		if (!ce) return;
+
+		self.containerElement = $(ce);
+
+		if (/document/.test(oc) || oc == document) {
+			self.containerOffset = { left: 0, top: 0 };
+			self.containerPosition = { left: 0, top: 0 };
+
+			self.parentData = {
+				element: $(document), left: 0, top: 0,
+				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
+			};
+		}
+
+		// i'm a node, so compute top, left, right, bottom
+		else {
+			var element = $(ce), p = [];
+			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
+
+			self.containerOffset = element.offset();
+			self.containerPosition = element.position();
+			self.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
+
+			var co = self.containerOffset, ch = self.containerSize.height,	cw = self.containerSize.width,
+						width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
+
+			self.parentData = {
+				element: ce, left: co.left, top: co.top, width: width, height: height
+			};
+		}
+	},
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options,
+				ps = self.containerSize, co = self.containerOffset, cs = self.size, cp = self.position,
+				pRatio = self._aspectRatio || event.shiftKey, cop = { top:0, left:0 }, ce = self.containerElement;
+
+		if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
+
+		if (cp.left < (self._helper ? co.left : 0)) {
+			self.size.width = self.size.width + (self._helper ? (self.position.left - co.left) : (self.position.left - cop.left));
+			if (pRatio) self.size.height = self.size.width / o.aspectRatio;
+			self.position.left = o.helper ? co.left : 0;
+		}
+
+		if (cp.top < (self._helper ? co.top : 0)) {
+			self.size.height = self.size.height + (self._helper ? (self.position.top - co.top) : self.position.top);
+			if (pRatio) self.size.width = self.size.height * o.aspectRatio;
+			self.position.top = self._helper ? co.top : 0;
+		}
+
+		self.offset.left = self.parentData.left+self.position.left;
+		self.offset.top = self.parentData.top+self.position.top;
+
+		var woset = Math.abs( (self._helper ? self.offset.left - cop.left : (self.offset.left - cop.left)) + self.sizeDiff.width ),
+					hoset = Math.abs( (self._helper ? self.offset.top - cop.top : (self.offset.top - co.top)) + self.sizeDiff.height );
+
+		var isParent = self.containerElement.get(0) == self.element.parent().get(0),
+		    isOffsetRelative = /relative|absolute/.test(self.containerElement.css('position'));
+
+		if(isParent && isOffsetRelative) woset -= self.parentData.left;
+
+		if (woset + self.size.width >= self.parentData.width) {
+			self.size.width = self.parentData.width - woset;
+			if (pRatio) self.size.height = self.size.width / self.aspectRatio;
+		}
+
+		if (hoset + self.size.height >= self.parentData.height) {
+			self.size.height = self.parentData.height - hoset;
+			if (pRatio) self.size.width = self.size.height * self.aspectRatio;
+		}
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options, cp = self.position,
+				co = self.containerOffset, cop = self.containerPosition, ce = self.containerElement;
+
+		var helper = $(self.helper), ho = helper.offset(), w = helper.outerWidth() - self.sizeDiff.width, h = helper.outerHeight() - self.sizeDiff.height;
+
+		if (self._helper && !o.animate && (/relative/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+		if (self._helper && !o.animate && (/static/).test(ce.css('position')))
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+
+	}
+});
+
+$.ui.plugin.add("resizable", "ghost", {
+
+	start: function(event, ui) {
+
+		var self = $(this).data("resizable"), o = self.options, cs = self.size;
+
+		self.ghost = self.originalElement.clone();
+		self.ghost
+			.css({ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.addClass('ui-resizable-ghost')
+			.addClass(typeof o.ghost == 'string' ? o.ghost : '');
+
+		self.ghost.appendTo(self.helper);
+
+	},
+
+	resize: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
+	},
+
+	stop: function(event, ui){
+		var self = $(this).data("resizable"), o = self.options;
+		if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
+	}
+
+});
+
+$.ui.plugin.add("resizable", "grid", {
+
+	resize: function(event, ui) {
+		var self = $(this).data("resizable"), o = self.options, cs = self.size, os = self.originalSize, op = self.originalPosition, a = self.axis, ratio = o._aspectRatio || event.shiftKey;
+		o.grid = typeof o.grid == "number" ? [o.grid, o.grid] : o.grid;
+		var ox = Math.round((cs.width - os.width) / (o.grid[0]||1)) * (o.grid[0]||1), oy = Math.round((cs.height - os.height) / (o.grid[1]||1)) * (o.grid[1]||1);
+
+		if (/^(se|s|e)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+		}
+		else if (/^(ne)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+		}
+		else if (/^(sw)$/.test(a)) {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.left = op.left - ox;
+		}
+		else {
+			self.size.width = os.width + ox;
+			self.size.height = os.height + oy;
+			self.position.top = op.top - oy;
+			self.position.left = op.left - ox;
+		}
+	}
+
+});
+
+var num = function(v) {
+	return parseInt(v, 10) || 0;
+};
+
+var isNumber = function(value) {
+	return !isNaN(parseInt(value, 10));
+};
+
+})(jQuery);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.slider.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,682 @@
+/*
+ * jQuery UI Slider 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+// number of pages in a slider
+// (how many times can you page up/down to go through the whole range)
+var numPages = 5;
+
+$.widget( "ui.slider", $.ui.mouse, {
+
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null
+	},
+
+	_create: function() {
+		var self = this,
+			o = this.options;
+
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+
+		this.element
+			.addClass( "ui-slider" +
+				" ui-slider-" + this.orientation +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" );
+		
+		if ( o.disabled ) {
+			this.element.addClass( "ui-slider-disabled ui-disabled" );
+		}
+
+		this.range = $([]);
+
+		if ( o.range ) {
+			if ( o.range === true ) {
+				this.range = $( "<div></div>" );
+				if ( !o.values ) {
+					o.values = [ this._valueMin(), this._valueMin() ];
+				}
+				if ( o.values.length && o.values.length !== 2 ) {
+					o.values = [ o.values[0], o.values[0] ];
+				}
+			} else {
+				this.range = $( "<div></div>" );
+			}
+
+			this.range
+				.appendTo( this.element )
+				.addClass( "ui-slider-range" );
+
+			if ( o.range === "min" || o.range === "max" ) {
+				this.range.addClass( "ui-slider-range-" + o.range );
+			}
+
+			// note: this isn't the most fittingly semantic framework class for this element,
+			// but worked best visually with a variety of themes
+			this.range.addClass( "ui-widget-header" );
+		}
+
+		if ( $( ".ui-slider-handle", this.element ).length === 0 ) {
+			$( "<a href='#'></a>" )
+				.appendTo( this.element )
+				.addClass( "ui-slider-handle" );
+		}
+
+		if ( o.values && o.values.length ) {
+			while ( $(".ui-slider-handle", this.element).length < o.values.length ) {
+				$( "<a href='#'></a>" )
+					.appendTo( this.element )
+					.addClass( "ui-slider-handle" );
+			}
+		}
+
+		this.handles = $( ".ui-slider-handle", this.element )
+			.addClass( "ui-state-default" +
+				" ui-corner-all" );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.add( this.range ).filter( "a" )
+			.click(function( event ) {
+				event.preventDefault();
+			})
+			.hover(function() {
+				if ( !o.disabled ) {
+					$( this ).addClass( "ui-state-hover" );
+				}
+			}, function() {
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.focus(function() {
+				if ( !o.disabled ) {
+					$( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
+					$( this ).addClass( "ui-state-focus" );
+				} else {
+					$( this ).blur();
+				}
+			})
+			.blur(function() {
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		this.handles.each(function( i ) {
+			$( this ).data( "index.ui-slider-handle", i );
+		});
+
+		this.handles
+			.keydown(function( event ) {
+				var ret = true,
+					index = $( this ).data( "index.ui-slider-handle" ),
+					allowed,
+					curVal,
+					newVal,
+					step;
+	
+				if ( self.options.disabled ) {
+					return;
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+					case $.ui.keyCode.END:
+					case $.ui.keyCode.PAGE_UP:
+					case $.ui.keyCode.PAGE_DOWN:
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						ret = false;
+						if ( !self._keySliding ) {
+							self._keySliding = true;
+							$( this ).addClass( "ui-state-active" );
+							allowed = self._start( event, index );
+							if ( allowed === false ) {
+								return;
+							}
+						}
+						break;
+				}
+	
+				step = self.options.step;
+				if ( self.options.values && self.options.values.length ) {
+					curVal = newVal = self.values( index );
+				} else {
+					curVal = newVal = self.value();
+				}
+	
+				switch ( event.keyCode ) {
+					case $.ui.keyCode.HOME:
+						newVal = self._valueMin();
+						break;
+					case $.ui.keyCode.END:
+						newVal = self._valueMax();
+						break;
+					case $.ui.keyCode.PAGE_UP:
+						newVal = self._trimAlignValue( curVal + ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.PAGE_DOWN:
+						newVal = self._trimAlignValue( curVal - ( (self._valueMax() - self._valueMin()) / numPages ) );
+						break;
+					case $.ui.keyCode.UP:
+					case $.ui.keyCode.RIGHT:
+						if ( curVal === self._valueMax() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal + step );
+						break;
+					case $.ui.keyCode.DOWN:
+					case $.ui.keyCode.LEFT:
+						if ( curVal === self._valueMin() ) {
+							return;
+						}
+						newVal = self._trimAlignValue( curVal - step );
+						break;
+				}
+	
+				self._slide( event, index, newVal );
+	
+				return ret;
+	
+			})
+			.keyup(function( event ) {
+				var index = $( this ).data( "index.ui-slider-handle" );
+	
+				if ( self._keySliding ) {
+					self._keySliding = false;
+					self._stop( event, index );
+					self._change( event, index );
+					$( this ).removeClass( "ui-state-active" );
+				}
+	
+			});
+
+		this._refreshValue();
+
+		this._animateOff = false;
+	},
+
+	destroy: function() {
+		this.handles.remove();
+		this.range.remove();
+
+		this.element
+			.removeClass( "ui-slider" +
+				" ui-slider-horizontal" +
+				" ui-slider-vertical" +
+				" ui-slider-disabled" +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" )
+			.removeData( "slider" )
+			.unbind( ".slider" );
+
+		this._mouseDestroy();
+
+		return this;
+	},
+
+	_mouseCapture: function( event ) {
+		var o = this.options,
+			position,
+			normValue,
+			distance,
+			closestHandle,
+			self,
+			index,
+			allowed,
+			offset,
+			mouseOverHandle;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		self = this;
+		this.handles.each(function( i ) {
+			var thisDistance = Math.abs( normValue - self.values(i) );
+			if ( distance > thisDistance ) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		});
+
+		// workaround for bug #3736 (if both handles of a range are at 0,
+		// the first is always used as the one with least distance,
+		// and moving it is obviously prevented by preventing negative ranges)
+		if( o.range === true && this.values(1) === o.min ) {
+			index += 1;
+			closestHandle = $( this.handles[index] );
+		}
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		self._handleIndex = index;
+
+		closestHandle
+			.addClass( "ui-state-active" )
+			.focus();
+		
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function( event ) {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+		
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this.handles.removeClass( "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+	
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_start: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+		return this._trigger( "start", event, uiHash );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var otherVal,
+			newValues,
+			allowed;
+
+		if ( this.options.values && this.options.values.length ) {
+			otherVal = this.values( index ? 0 : 1 );
+
+			if ( ( this.options.values.length === 2 && this.options.range === true ) && 
+					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+				) {
+				newVal = otherVal;
+			}
+
+			if ( newVal !== this.values( index ) ) {
+				newValues = this.values();
+				newValues[ index ] = newVal;
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal,
+					values: newValues
+				} );
+				otherVal = this.values( index ? 0 : 1 );
+				if ( allowed !== false ) {
+					this.values( index, newVal, true );
+				}
+			}
+		} else {
+			if ( newVal !== this.value() ) {
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal
+				} );
+				if ( allowed !== false ) {
+					this.value( newVal );
+				}
+			}
+		}
+	},
+
+	_stop: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+
+		this._trigger( "stop", event, uiHash );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+			var uiHash = {
+				handle: this.handles[ index ],
+				value: this.value()
+			};
+			if ( this.options.values && this.options.values.length ) {
+				uiHash.value = this.values( index );
+				uiHash.values = this.values();
+			}
+
+			this._trigger( "change", event, uiHash );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this.options.values && this.options.values.length ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+
+		switch ( key ) {
+			case "disabled":
+				if ( value ) {
+					this.handles.filter( ".ui-state-focus" ).blur();
+					this.handles.removeClass( "ui-state-hover" );
+					this.handles.attr( "disabled", "disabled" );
+					this.element.addClass( "ui-disabled" );
+				} else {
+					this.handles.removeAttr( "disabled" );
+					this.element.removeClass( "ui-disabled" );
+				}
+				break;
+			case "orientation":
+				this._detectOrientation();
+				this.element
+					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					.addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+				for ( i = 0; i < valsLength; i += 1 ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else {
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i+= 1) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		}
+	},
+	
+	// returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = (val - this._valueMin()) % step;
+			alignValue = val - valModStep;
+
+		if ( Math.abs(valModStep) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed(5) );
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.options.max;
+	},
+	
+	_refreshValue: function() {
+		var oRange = this.options.range,
+			o = this.options,
+			self = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			valPercent,
+			_set = {},
+			lastValPercent,
+			value,
+			valueMin,
+			valueMax;
+
+		if ( this.options.values && this.options.values.length ) {
+			this.handles.each(function( i, j ) {
+				valPercent = ( self.values(i) - self._valueMin() ) / ( self._valueMax() - self._valueMin() ) * 100;
+				_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( self.options.range === true ) {
+					if ( self.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					} else {
+						if ( i === 0 ) {
+							self.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							self.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			});
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ self.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+		}
+	}
+
+});
+
+$.extend( $.ui.slider, {
+	version: "1.8.9"
+});
+
+}(jQuery));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/jquery/ui/jquery.ui.widget.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,262 @@
+/*!
+ * jQuery UI Widget 1.8.9
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function( $, undefined ) {
+
+// jQuery 1.4+
+if ( $.cleanData ) {
+	var _cleanData = $.cleanData;
+	$.cleanData = function( elems ) {
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			$( elem ).triggerHandler( "remove" );
+		}
+		_cleanData( elems );
+	};
+} else {
+	var _remove = $.fn.remove;
+	$.fn.remove = function( selector, keepData ) {
+		return this.each(function() {
+			if ( !keepData ) {
+				if ( !selector || $.filter( selector, [ this ] ).length ) {
+					$( "*", this ).add( [ this ] ).each(function() {
+						$( this ).triggerHandler( "remove" );
+					});
+				}
+			}
+			return _remove.call( $(this), selector, keepData );
+		});
+	};
+}
+
+$.widget = function( name, base, prototype ) {
+	var namespace = name.split( "." )[ 0 ],
+		fullName;
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName ] = function( elem ) {
+		return !!$.data( elem, name );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	$[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without initializing for simple inheritance
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+
+	var basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+//	$.each( basePrototype, function( key, val ) {
+//		if ( $.isPlainObject(val) ) {
+//			basePrototype[ key ] = $.extend( {}, val );
+//		}
+//	});
+	basePrototype.options = $.extend( true, {}, basePrototype.options );
+	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
+		namespace: namespace,
+		widgetName: name,
+		widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name,
+		widgetBaseClass: fullName
+	}, prototype );
+
+	$.widget.bridge( name, $[ namespace ][ name ] );
+};
+
+$.widget.bridge = function( name, object ) {
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = Array.prototype.slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.extend.apply( null, [ true, options ].concat(args) ) :
+			options;
+
+		// prevent calls to internal methods
+		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
+			return returnValue;
+		}
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var instance = $.data( this, name ),
+					methodValue = instance && $.isFunction( instance[options] ) ?
+						instance[ options ].apply( instance, args ) :
+						instance;
+				// TODO: add this back in 1.9 and use $.error() (see #5972)
+//				if ( !instance ) {
+//					throw "cannot call methods on " + name + " prior to initialization; " +
+//						"attempted to call method '" + options + "'";
+//				}
+//				if ( !$.isFunction( instance[options] ) ) {
+//					throw "no such method '" + options + "' for " + name + " widget instance";
+//				}
+//				var methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, name );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, name, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( options, element ) {
+	// allow instantiation without initializing for simple inheritance
+	if ( arguments.length ) {
+		this._createWidget( options, element );
+	}
+};
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	options: {
+		disabled: false
+	},
+	_createWidget: function( options, element ) {
+		// $.widget.bridge stores the plugin instance, but we do it anyway
+		// so that it's stored even before the _create function runs
+		$.data( element, this.widgetName, this );
+		this.element = $( element );
+		this.options = $.extend( true, {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		var self = this;
+		this.element.bind( "remove." + this.widgetName, function() {
+			self.destroy();
+		});
+
+		this._create();
+		this._trigger( "create" );
+		this._init();
+	},
+	_getCreateOptions: function() {
+		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
+	},
+	_create: function() {},
+	_init: function() {},
+
+	destroy: function() {
+		this.element
+			.unbind( "." + this.widgetName )
+			.removeData( this.widgetName );
+		this.widget()
+			.unbind( "." + this.widgetName )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetBaseClass + "-disabled " +
+				"ui-state-disabled" );
+	},
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.extend( {}, this.options );
+		}
+
+		if  (typeof key === "string" ) {
+			if ( value === undefined ) {
+				return this.options[ key ];
+			}
+			options = {};
+			options[ key ] = value;
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var self = this;
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+		});
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				[ value ? "addClass" : "removeClass"](
+					this.widgetBaseClass + "-disabled" + " " +
+					"ui-state-disabled" )
+				.attr( "aria-disabled", value );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_trigger: function( type, event, data ) {
+		var callback = this.options[ type ];
+
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		data = data || {};
+
+		// copy original event properties over to the new event
+		// this would happen if we could call $.event.fix instead of $.Event
+		// but we don't have a way to force an event to be fixed multiple times
+		if ( event.originalEvent ) {
+			for ( var i = $.event.props.length, prop; i; ) {
+				prop = $.event.props[ --i ];
+				event[ prop ] = event.originalEvent[ prop ];
+			}
+		}
+
+		this.element.trigger( event, data );
+
+		return !( $.isFunction(callback) &&
+			callback.call( this.element[0], event, data ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+})( jQuery );
Binary file client/src/main/webapp/oldskin/buttons/back0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/back1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/background0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/background1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/description0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/description1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/digicat0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/digicat1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/download0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/download1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/fullpage0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/fullpage1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/glossar0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/help0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/home0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/home1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/makepdf0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/makepdf1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/mark.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/mark0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/mark1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/matrix0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/matrix1.gif has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/oldskin/buttons/menu.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,240 @@
+function checkBrowser() {
+
+	this.ua    = navigator.userAgent;
+	this.ver   = navigator.appVersion;
+	this.dom   = ( document.getElementById );
+	this.opera = ( this.dom ) && ( this.ua.toLowerCase().indexOf("opera") > -1 );
+	this.ie4   = ( document.all ) && ( !this.dom );
+	this.ie5   = ( this.ver.indexOf("MSIE 5") > -1 ) && ( this.dom );
+	this.ie6   = ( this.ver.indexOf("MSIE 6") > -1 ) && ( this.dom );
+	this.ns4   = ( document.layers ) && ( !this.dom );
+	this.ns6   = ( this.dom ) && ( parseInt(this.ver) >= 5 ) && ( !this.opera );
+	this.ns    = this.ns4 || this.ns6;
+	this.ie    = this.ie4 || this.ie5 || this.ie6;
+
+	return this;
+}
+
+browser = new checkBrowser();
+
+function changeBc(obj, color){
+	var div;
+
+	if (color == '' && browser.ns4) color = null;
+
+	if (browser.ns4) div = document.layers[obj];
+	else if (browser.dom) div = document.getElementById(obj).style;
+	else if (browser.ie) div = document.all[obj].style;
+
+	if (browser.dom || browser.ie) div.backgroundColor = color;
+	if (browser.ns4) div.bgColor = color;
+}
+
+function makeArray(n){
+	this.length = n;
+	for (var i = 0; i < n; i++) {
+		this[i] = new Image();
+	}
+
+	return this;
+}
+
+function preloadImages() {
+	over = new makeArray(document.images.length);
+	away = new makeArray(document.images.length);
+
+	for (i = 0; i < document.images.length; i++) {
+		currName = document.images[i].src.slice(0, document.images[i].src.lastIndexOf('.')-1);
+		away[i].src = currName + "0.gif";
+		over[i].src = currName + "1.gif";
+	}
+}
+
+function overButton(n) {
+	currButton = document.images[n];
+
+	currButton.src = over[n].src;
+	if (showHelp) contextHelp(n);
+}
+
+function awayButton(n) {
+	currButton = document.images[n];
+
+	currButton.src = away[n].src;
+}
+
+function overItem(obj) {
+	changeBc("menu" + obj, '#770000');
+	clearTimeout(timeID);
+}
+
+function awayItem(obj) {
+	changeBc("menu" + obj, '#666666');
+	timeID = setTimeout("hideMenu()", 700);
+}
+
+var timeID = null;
+
+function changeMark(obj) {
+	var object;
+
+	if (browser.ns4) object = document.layers["menu" + obj].document.images[0];
+	else if (browser.dom) object = document.getElementById("mark" + obj);
+	else if (browser.ie) object = document.all["mark" + obj];
+	
+	var path = object.src.slice(0, object.src.lastIndexOf('/')+1);
+	
+	object.src = (object.src.indexOf("nomark") > -1) ? path + "mark.gif" : path + "nomark.gif";
+}
+
+function showMenu(obj) {
+	menu(obj, true);
+}
+
+function menu(obj, show) {
+	var currObj = "menu" + obj;
+	var idx = 0;
+	while(true) {
+		if (browser.ns4 && document.layers[currObj]) document.layers[currObj].visibility = (show) ? "show" : "hide";
+		else if (browser.dom && document.getElementById(currObj)) document.getElementById(currObj).style.visibility = (show) ? "visible" : "hidden";
+		else if (browser.ie && document.all[currObj]) document.all[currObj].style.visibility = (show) ? "visible" : "hidden";
+		else break;
+		
+		currObj = "menu" + obj + (++idx);
+	}
+	if (!show) activeMenu = '';
+	else activeMenu = obj;
+
+	timeID = setTimeout("hideMenu()", 2000);
+}
+
+function hideMenu() {
+	if (activeMenu != '') menu(activeMenu, false);
+	clearTimeout(timeID);
+}
+
+var activeMenu = '';
+
+
+// just to be sure, that no buffer overflow can arrive
+var semaphor = true;
+
+function contextHelp(n) {
+
+	if (helpWindow.closed) {
+		changeMark(31);
+		changeHelp();
+		return;
+	}
+
+	if ((navigator.appVersion.indexOf("Macintosh") < 0) && semaphor) {
+		semaphor = false;	
+		var help = helpText[n].split("|");
+	
+		helpWindow.focus();
+		helpWindow.document.open();
+		helpWindow.document.write('<html><head><title>Context Help</title>');
+		helpWindow.document.write('<style type="text/css">');
+		helpWindow.document.write('.title {font-family: Verdana, sans-serif, Arial; font-size: 12px; font-weight: bold; color: #FFFFFF}');
+		helpWindow.document.write('.text {font-family: Verdana, sans-serif, Arial; font-size: 10px; color: #000000}');
+		helpWindow.document.write('</style></head><body bgcolor="#CCCCCC" leftmargin="7" topmargin="7" marginwidth="7" marginheight="7" onload="opener.semaphor = true;">');
+		helpWindow.document.write('<table width="99%" border="0" cellspacing="0" cellpadding="3"><tr><td bgcolor="#666666" class="title">');
+		helpWindow.document.write(help[0] + '</tr><tr><td class="text">');
+		helpWindow.document.write(help[1] + '</tr></td></table></body></html>');
+		helpWindow.document.close();	
+
+		// stupid workaround because of netscape 6, that doesen't know the opener property
+		// this workaround is still ok because netscape 6 has eventbuffer checks so no overflow
+    	if (browser.ns6) {
+        	semaphor = true;
+		}
+
+		// next stupid workaround because of opera 6, that somehow don't start the 'onLoad'-
+		// attribute in the body tag (the helpwindow does not finish loading)
+    	if (browser.opera) {
+        	setTimeout("semaphor = true;", 50);
+		}
+
+	}
+}
+
+function openContextHelp() {
+	if (navigator.appVersion.indexOf("Macintosh") > -1) {
+		openContextHelpMac();
+		return;
+	}
+
+	semaphor = false;
+	
+	var winWidth = 270;
+	var winHeight = 130;
+
+	var xScreen = 0.9*(screen.width-winWidth);
+	var yScreen = 0.8*(screen.height-winHeight);
+
+	helpWindow = window.open("", "ContextHelp", "width=" + winWidth + ",height=" + winHeight + ",screenX=" + xScreen + ",screenY=" + yScreen + ",left=" + xScreen + ",top=" + yScreen);
+
+	helpWindow.focus();
+	helpWindow.document.open();
+	helpWindow.document.write('<html><head><title>Context Help</title>');
+	helpWindow.document.write('<style type="text/css">');
+	helpWindow.document.write('.title {font-family: Verdana, sans-serif, Arial; font-size: 12px; font-weight: bold; color: #FFFFFF}');
+	helpWindow.document.write('.text {font-family: Verdana, sans-serif, Arial; font-size: 10px; color: #000000}');
+	helpWindow.document.write('</style></head><body bgcolor="#CCCCCC" leftmargin="7" topmargin="7" marginwidth="7" marginheight="7">');
+	helpWindow.document.write('<table width="99%" border="0" cellspacing="0" cellpadding="3"><tr><td bgcolor="#666666" class="title">');
+	helpWindow.document.write('Context Help</tr><tr><td class="text">');
+	helpWindow.document.write('Move over any button to get some more information about its function</tr></td></table></body></html>');
+	helpWindow.document.close();
+	
+	// for some safety reason help-requests have to be blocked while opening the window
+	setTimeout("semaphor = true;", 200);
+}
+
+// because macs have a strange window focus behaviour we have to go a special
+// way for them - just opening a window that contains all button-descriptions
+function openContextHelpMac() {
+
+	var winWidth = 270;
+	var winHeight = 600;
+
+	var xScreen = 0.9*(screen.width-winWidth);
+	var yScreen = 0.8*(screen.height-winHeight);
+
+	helpWindow = window.open("", "ContextHelp", "width=" + winWidth + ",height=" + winHeight + ",screenX=" + xScreen + ",screenY=" + yScreen + ",left=" + xScreen + ",top=" + yScreen + ",scrollbars");
+
+	helpWindow.focus();
+	helpWindow.document.open();
+	helpWindow.document.write('<html><head><title>Context Help Macintosh</title>');
+	helpWindow.document.write('<style type="text/css">');
+	helpWindow.document.write('.title {font-family: Verdana, sans-serif, Arial; font-size: 12px; font-weight: bold; color: #FFFFFF}');
+	helpWindow.document.write('.text {font-family: Verdana, sans-serif, Arial; font-size: 10px; color: #000000}');
+	helpWindow.document.write('</style></head><body bgcolor="#CCCCCC" leftmargin="7" topmargin="7" marginwidth="7" marginheight="7">');
+	helpWindow.document.write('<table width="99%" border="0" cellspacing="0" cellpadding="3">');
+
+	for (n = 0; n < helpText.length; n++) {
+
+		help = helpText[n].split("|");
+		helpWindow.document.write('<tr><td bgcolor="#666666" class="title">');
+		helpWindow.document.write(help[0] + '</tr><tr><td class="text">');
+		helpWindow.document.write('<p>' + help[1] + '<br>&nbsp;</p></tr></td>');
+	}
+	helpWindow.document.write('</table></body></html>');
+	helpWindow.document.close();
+}
+
+
+function closeContextHelp() {
+	if (helpWindow != '' && !helpWindow.closed) {
+		helpWindow.close();
+	}
+	helpWindow = '';
+}
+
+function changeHelp() {
+	showHelp = !showHelp;
+	showHelp ? openContextHelp() : closeContextHelp();
+}
+
+
+// variable containing the contextwindow
+var helpWindow = '';
\ No newline at end of file
Binary file client/src/main/webapp/oldskin/buttons/moveto0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/moveto1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/newwindow0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/newwindow1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/next0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/next1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/nomark.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/page0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/page1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/questionmark0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/questionmark1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/reference0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/reference1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/refresh0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/refresh1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/relation0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/relation1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/scale0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/scale1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/spacer.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/type0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/type1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/work0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/work1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoomarea0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoomarea1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoomin0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoomin1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoomout0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoomout1.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoompoint0.gif has changed
Binary file client/src/main/webapp/oldskin/buttons/zoompoint1.gif has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/oldskin/dcMain.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,83 @@
+<%@ page language="java" %><%!
+// authentication stuff - robert
+// -----------------------------
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%><%
+
+// parsing the query
+// -----------------
+
+digilib.servlet.DigilibRequest dcRequest = new digilib.servlet.DigilibRequest(request);
+// check if authentication is needed and redirect if necessary
+docBean.doAuthentication(dcRequest, response);
+// set number of pages  
+dcRequest.setValue("pt", docBean.getNumPages(dcRequest));
+// chop off /oldskin -- ugly ;-(
+String baseUrl = dcRequest.getAsString("base.url");
+int p = baseUrl.lastIndexOf("/oldskin");
+if (p > 0) {
+   baseUrl = baseUrl.substring(0, p);
+}
+%>
+<html>
+<head>
+<script type="text/javascript" src="../baselib.js"></script>
+<script type="text/javascript" src="dclib.js"></script>
+<script type="text/javascript">
+base_init();
+var baseUrl = "<%= baseUrl %>";
+newParameter('fn', '', 1);
+newParameter('pn', 1, 1);
+newParameter('pt', 9, 9);
+newParameter('mx', '6x4', 1);
+newParameter('mo', '', 1);
+newParameter('dw', 0, 1);
+newParameter('dh', 0, 1);
+dc_init();
+</script>
+
+<style type="text/css">
+td {
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 11px;
+  color: #FFFFFF;
+  text-align: center;
+  vertical-align: middle;
+}
+.number {
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 11px;
+  color: #FFFFFF;
+  padding-top: 2px;
+}
+.nonumber {
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 11px;
+  color: #000000;
+  padding-top: 2px;
+}
+</style>
+</head>
+
+<body bgcolor="#666666">
+
+<div align="center">
+<script type="text/javascript">
+  dc_render(document);
+</script>
+</div>
+
+</body>
+
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/oldskin/dcMenu.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,49 @@
+<html>
+<head>
+<style type="text/css">
+.menu1 {position:absolute; top:122; left:41; width:44; height:138; clip:rect(0,44,138,0); visibility:hidden}
+.item1 {position:absolute; left:43; width:40; height:14; clip:rect(0,40,14,0); visibility:hidden}
+
+.text {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none}
+</style>
+<script language="JavaScript" src="buttons/menu.js"></script>
+<script language="JavaScript">
+// because on a netscape 4.xx bug (messing up with layers on resize) we cache the window
+// resize event and redisplay the navigation frame
+if (document.layers && !document.getElementById) {
+	window.onresize = function() {parent.rightFrame.location.reload();}
+}
+
+function reloadTable(row, col) {
+    parent.mainFrame.setParameter("mx", row+"x"+col);
+    parent.mainFrame.display();
+}
+
+// turn off the contexthelp
+var showHelp = false;
+</script>
+</head>
+
+<body bgcolor="#CCCCCC" leftmargin="8" marginwidth="8" topmargin="20" marginheight="20" onload="preloadImages();">
+<a href="javascript:parent.mainFrame.Backpage()" onmouseover="overButton(0)" onmouseout="awayButton(0)"><img src="buttons/back0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:parent.mainFrame.Nextpage()" onmouseover="overButton(1)" onmouseout="awayButton(1)"><img src="buttons/next0.gif" width="73" height="30" border="0"></a><br><br>
+<a href="javascript:hideMenu();showMenu(1);" onmouseover="overButton(2)" onmouseout="awayButton(2)"><img src="buttons/matrix0.gif" width="73" height="30" border="0"></a><br>
+
+<div id="menu1" class="menu1"></div>
+ <div id="menu11" class="item1" style="top:124"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(1, 2); return false;" onmouseover="overItem(11)" onmouseout="awayItem(11)">1x2</a></center></div>
+ <div id="menu12" class="item1" style="top:139"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(2, 3); return false;" onmouseover="overItem(12)" onmouseout="awayItem(12)">2x3</a></center></div>
+ <div id="menu13" class="item1" style="top:154"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(2, 4); return false;" onmouseover="overItem(13)" onmouseout="awayItem(13)">2x4</a></center></div>
+ <div id="menu14" class="item1" style="top:169"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 2); return false;" onmouseover="overItem(14)" onmouseout="awayItem(14)">3x2</a></center></div>
+ <div id="menu15" class="item1" style="top:184"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 3); return false;" onmouseover="overItem(15)" onmouseout="awayItem(15)">3x3</a></center></div>
+ <div id="menu16" class="item1" style="top:199"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 4); return false;" onmouseover="overItem(16)" onmouseout="awayItem(16)">3x4</a></center></div>
+ <div id="menu17" class="item1" style="top:214"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(3, 5); return false;" onmouseover="overItem(17)" onmouseout="awayItem(17)">3x5</a></center></div>
+ <div id="menu18" class="item1" style="top:229"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(4, 5); return false;" onmouseover="overItem(18)" onmouseout="awayItem(18)">4x5</a></center></div>
+ <div id="menu19" class="item1" style="top:244"><center><a href="#" class="text" onClick="hideMenu(); reloadTable(4, 6); return false;" onmouseover="overItem(19)" onmouseout="awayItem(19)">4x6</a></center></div>
+
+<script language="Javascript">
+// initial background color of the menues (has to be done like this, 
+// otherwise menues in ns4 you will have wrong dimensions)
+changeBc("menu1", "#666666");
+</script>
+</body>
+</html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/oldskin/dclib.js	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,124 @@
+/*
+Copyright (C) 2003-2004 WTWG Uni Bern, MPIWG Berlin
+ 
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+ 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ 
+Author: 
+  Christian Luginbuehl, 07.04.2004 , Version Alcatraz 0.6
+  Robert Casties 28.10.2004
+
+!! requires baselib.js !!
+
+*/
+
+function identify() {
+  return 'Digicat v0.4';
+}
+
+var cells = null;
+
+
+function dc_init() {
+  // put the query parameters (sans "?") in the parameters array
+  parseParameters(location.search.slice(1));
+}
+
+function display(detail) {
+    // redisplay the page
+    if (! detail) {
+	detail = 9;
+    }
+    var queryString = getAllParameters(detail);
+    location.href = location.protocol + "//" + location.host + location.pathname + "?" + queryString;
+}
+
+function dc_render(doc) {
+    // creates the HTML for the image table
+    var wsize = getWinSize();
+    var fWidth  = wsize.width;
+    var fHeight = wsize.height;
+
+    var mx = getParameter("mx");
+    cells = mx.split('x');
+  
+    var dw = getParameter("dw");
+    var dh = getParameter("dh");
+    var pt = getParameter("pt");
+    var pn = parseInt(getParameter("pn"));
+    var fn = getParameter("fn");
+    var par_mo = (hasParameter("mo")) ? "&mo="+getParameter("mo") : "";
+
+    var picWidth = (dw != 0) ? dw : Math.floor((fWidth-30)/cells[0])-2*cells[0]-1;
+    var picHeight = (dh != 0) ? dh : picWidth;
+
+    if (cells.length > 1) {
+	picHeight = (dh != 0) ? dh : Math.floor(((fHeight-30)-12*cells[1])/cells[1])-2*cells[1]-1;
+    } else {
+	cells[1] = Math.ceil(pt/cells[0]);
+    }
+
+    var cellWidth  = parseInt(picWidth)+8;
+    var cellHeight = parseInt(picHeight)+18;
+
+    doc.writeln('<table width="100%" height="100%" border="0" cellspacing="1" cellpadding="0">');
+
+    for (var j = 0; j < cells[1]; j++) {
+	doc.writeln('<tr>');
+	for (var i = 0; i < cells[0]; i++) {
+	    var idx  = pn+i+j*cells[0];
+	    var img  = baseUrl + "/servlet/Scaler?fn=" + fn + "&pn=" + idx;
+	    img += "&dw=" + picWidth + "&dh=" + picHeight + par_mo;
+	    doc.write('<td width="'+cellWidth+'" height="'+cellHeight+'">');
+	    if (idx <= pt) {
+		doc.write('<a href="'+dl_link(idx)+'" target="_blank"><img src="'+img+'" border="0"></a><div class="number">'+idx+'</div>');
+	    } else {
+		doc.write('<div class="nonumber">'+idx+'</div>');
+	    }
+	    doc.writeln('</td>');
+	}
+	doc.writeln(' </tr>');
+    }
+    doc.writeln('</table>');
+}
+
+
+function dl_link(i) {
+    var link = baseUrl+"/digilib.jsp?fn="+getParameter("fn")+"&pn="+i+"&mo="+getParameter("mo");
+    return link;
+}  
+
+
+function Backpage() {
+    var pn = parseInt(getParameter("pn"));
+    if (pn <= 1) {
+	pn = 1;
+        alert("You are already on the first page!");
+    }
+
+    pn = pn - parseInt(cells[0]*cells[1]);
+
+    if (pn < 1) {
+    	pn = 1;
+    }
+    setParameter("pn", pn);
+    display();
+}
+
+function Nextpage() {
+    var pn = parseInt(getParameter("pn"));
+    pn = pn + parseInt(cells[0]*cells[1]);
+    setParameter("pn", pn);
+    display();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/oldskin/dlMenu.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,151 @@
+<html>
+<head>
+<style type="text/css">
+.menu {position:absolute; visibility:hidden}
+
+.item1 {position:absolute; left:33; width:50; height:14; clip:rect(0,50,14,0); visibility:hidden}
+.item2 {position:absolute; left:43; width:40; height:14; clip:rect(0,40,14,0); visibility:hidden}
+.item3 {position:absolute; left:3; width:80; height:14; clip:rect(0,80,14,0); visibility:hidden}
+.logo { margin-left: 5px; margin-top: 10px; }
+
+.text {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none}
+</style>
+<script language="JavaScript" src="buttons/menu.js"></script>
+
+<script language="JavaScript">
+// because on a netscape 4.xx bug (messing up with layers on resize) we cache the window
+// resize event and redisplay the navigation frame
+if (document.layers && !document.getElementById) {
+    window.onresize = function() {parent.rightFrame.location.reload();}
+}
+
+/**
+ * overriding 'page' in navigation.js
+ */
+function page(page, keep) {
+
+    parent.mainFrame.gotoPage(page, keep);
+    if (parent.pageFrame.show) {
+      parent.pageFrame.show();
+    } else {
+      parent.pageFrame.location.reload();
+    }
+}
+
+/*
+ * new display function to refresh the pagesTotal frame
+ */
+
+function display(detail) {
+    if (parent.pageFrame.show) {
+      parent.pageFrame.show();
+    } else {
+      parent.pageFrame.location.reload();
+    }
+    parent.mainFrame.display(detail);
+}
+
+
+function askPage() {
+    do {
+	p = prompt("Goto Page:", 1);
+    } while ((p != null) && (p < 1));
+    page(p);
+}
+
+function showRef(select) {
+    var hyperlinkRef = parent.mainFrame.baseUrl + "/digilib.jsp?";
+    hyperlinkRef += parent.mainFrame.getAllParameters();
+    if ( select == 0 ) {
+	prompt("Link for LaTeX-documents", "\\href{" + hyperlinkRef + "}{TEXT}");
+    } else if ( select == 1 ) {
+	prompt("Link for HTML-documents", hyperlinkRef);
+    }
+}
+
+function setSize(size) {
+    parent.mainFrame.setParameter('ws', size);
+    display();
+}
+
+function digicat() {
+    var fn = parent.mainFrame.getParameter("fn");
+    var pn = parent.mainFrame.getParameter("pn");
+    var url = parent.mainFrame.baseUrl + "/digicat.jsp?fn=" + fn + "&pn=" + pn;
+    win = window.open(url, "digicat");
+    win.focus();
+}
+
+// boolean variable to either show or not show the additional help
+// change in the menuitem its original mark
+var showHelp = false;
+
+// variable to tell if while changing to another page it should keep the area
+// change in the menuitem its original mark
+var keepArea = false;
+
+
+// variable that store the texts for contexthelp
+var helpText = new Array();
+
+helpText[0]  = "'back'-button|Click on this button to load the previous image (usually the next page from a manuscript).";
+helpText[1]  = "'next'-button|Click on this button to load the next image (usually the next page from a manuscript).";
+helpText[2]  = "'page'-button|After clicking 'page' you will be prompted for a specific page you want to see.<br>Note that the page number refers to the same serie you are in now.";
+helpText[3]  = "'digicat'-button|Click here to open a new window containing thumbnails of the current series pages to navigate.";
+helpText[4]  = "'mark'-button|You can set marks into the picture. After hitting 'mark' you have to click on the desired picures location, a numbered mark appears.<br>Check out 'reference' to make these marks (up to 8) visible for others.";
+helpText[5]  = "'reference'-button|Choose LaTeX or HTML mode to get a link for the actual (zoomed) picture with all set marks.<br>This link can easily be included in a TeX- or HTML-formatted document/page.";
+helpText[6]  = "'zoom area'-button|With 'zoom area' you can zoom into any rectangular field for the current picture.<br>After clicking on the button click on the image to set any corner (ex. topleft), release the mousebutton and move the mouse until you have the desired size, then click again.";
+helpText[7]  = "'zoom in'-button|Clicking on 'zoom in' zooms in around the current center.";
+helpText[8]  = "'zoom out'-button|Clicking on 'zoom out' zooms out around the current center.";
+helpText[9]  = "'full page'-button|To gain the original unzoomed picture, click on 'full page'.<br>Note that any set marks are still saved at their positions.";
+helpText[10] = "'size'-button|By clicking on one of the menu entries you can select the size of the currently displayed picture in relation to your browser window.<br>Note: a scale factor of '1.0' means that the picture fits right into the working area, while '2.0' means that it will be twice as high and wide.";
+helpText[11] = "'?'-button|In its menu you are able change options like the visibility of this contextsensitive help, with 'Keep area' digilib keeps its current zoom area when changing to another page.";
+
+</script>
+</head>
+
+<body bgcolor="#CCCCCC" leftmargin="8" marginwidth="8" topmargin="5" marginheight="5" onload="preloadImages()" onunload="closeContextHelp()">
+
+<a href="javascript:page('-1', keepArea)" onmouseover="overButton(0)" onmouseout="awayButton(0)"><img src="buttons/back0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:page('+1', keepArea)" onmouseover="overButton(1)" onmouseout="awayButton(1)"><img src="buttons/next0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:askPage()" onmouseover="overButton(2)" onmouseout="awayButton(2)"><img src="buttons/page0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:digicat()" onmouseover="overButton(3)" onmouseout="awayButton(3)"><img src="buttons/digicat0.gif" width="73" height="30" border="0"></a><br><br>
+<a href="javascript:parent.mainFrame.setMark(false);" onmouseover="overButton(4)" onmouseout="awayButton(4)"><img src="buttons/mark0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:hideMenu(); showMenu(1)" onmouseover="overButton(5)" onmouseout="awayButton(5)"><img src="buttons/reference0.gif" width="73" height="30" border="0"></a><br><br>
+<a href="javascript:parent.mainFrame.zoomArea()" onmouseover="overButton(6)" onmouseout="awayButton(6)"><img src="buttons/zoomarea0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:parent.mainFrame.zoomBy(1.4142)" onmouseover="overButton(7)" onmouseout="awayButton(7)"><img src="buttons/zoomin0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:parent.mainFrame.zoomBy(0.7071)" onmouseover="overButton(8)" onmouseout="awayButton(8)"><img src="buttons/zoomout0.gif" width="73" height="30" border="0"></a><br>
+<a href="javascript:parent.mainFrame.zoomFullpage()" onmouseover="overButton(9)" onmouseout="awayButton(9)"><img src="buttons/fullpage0.gif" width="73" height="30" border="0"></a><br><br>
+<a href="javascript:hideMenu(); showMenu(2)" onmouseover="overButton(10)" onmouseout="awayButton(10)"><img src="buttons/scale0.gif" width="73" height="30" border="0"></a><br><br>
+<a href="javascript:hideMenu(); showMenu(3)" onmouseover="overButton(11)" onmouseout="awayButton(11)"><img src="buttons/questionmark0.gif" width="73" height="30" border="0"></a><br><br>
+
+<div id="menu1" class="menu" style="top:201; left:31; width:54; height:33; clip:rect(0,54,33,0)"></div>
+ <div id="menu11" class="item1" style="top:203"><center><a href="#" class="text" onClick="hideMenu(); showRef(0); return false;" onmouseover="overItem(11)" onmouseout="awayItem(11)">LaTeX</a></center></div>
+ <div id="menu12" class="item1" style="top:218"><center><a href="#" class="text" onClick="hideMenu(); showRef(1); return false;" onmouseover="overItem(12)" onmouseout="awayItem(12)">HTML</a></center></div>
+
+<div id="menu2" class="menu" style="top:379; left:41; width:44; height:93; clip:rect(0,44,93,0)"></div>
+ <div id="menu21" class="item2" style="top:381"><center><a href="#" class="text" onClick="hideMenu(); setSize(0.7); return false;" onmouseover="overItem(21)" onmouseout="awayItem(21)">0.7</a></center></div>
+ <div id="menu22" class="item2" style="top:396"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.0); return false;" onmouseover="overItem(22)" onmouseout="awayItem(22)">1.0</a></center></div>
+ <div id="menu23" class="item2" style="top:411"><center><a href="#" class="text" onClick="hideMenu(); setSize(1.5); return false;" onmouseover="overItem(23)" onmouseout="awayItem(23)">1.5</a></center></div>
+ <div id="menu24" class="item2" style="top:426"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.0); return false;" onmouseover="overItem(24)" onmouseout="awayItem(24)">2.0</a></center></div>
+ <div id="menu25" class="item2" style="top:441"><center><a href="#" class="text" onClick="hideMenu(); setSize(2.5); return false;" onmouseover="overItem(25)" onmouseout="awayItem(25)">2.5</a></center></div>
+ <div id="menu26" class="item2" style="top:456"><center><a href="#" class="text" onClick="hideMenu(); setSize(3.0); return false;" onmouseover="overItem(26)" onmouseout="awayItem(26)">3.0</a></center></div>
+
+<div id="menu3" class="menu" style="top:430; left:1; width:84; height:33; clip:rect(0,84,33,0)"></div>
+ <div id="menu31" class="item3" style="top:432"><center><a href="#" class="text" onclick="changeMark(31); hideMenu(); changeHelp(); return false;" onmouseover="overItem(31)" onmouseout="awayItem(31)"><img id="mark31" src="buttons/nomark.gif" border="0">Contexthelp</a></center></div>
+ <div id="menu32" class="item3" style="top:447"><center><a href="#" class="text" onclick="changeMark(32); keepArea = (keepArea) ? false : true; return false;" onmouseover="overItem(32)" onmouseout="awayItem(32)"><img id="mark32" src="buttons/nomark.gif" border="0">Keep&nbsp;area</a></center></div>
+<!-- <div id="logo" class="logo">
+ 	<a href="http://digilib.berlios.de" target="_blank" >
+ 		<img border="0" src="../img/digilib-logo-text1.png" title="digilib"></img>
+	</a>
+ </div> -->
+
+<script language="Javascript">
+// initial background color of the menues (has to be done like this, 
+// otherwise menues in ns4 you will have wrong dimensions)
+changeBc("menu1", "#666666");
+changeBc("menu2", "#666666");
+changeBc("menu3", "#666666");
+</script>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/oldskin/pageWin.html	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,24 @@
+<html>
+<head>
+<script type="text/javascript">
+var pn = "-";
+var pt = "-";
+if ((parent.mainFrame.getParameter)&&(parent.mainFrame.getParameter("pn"))) {
+    pt = parent.mainFrame.getParameter("pt");
+    pn = parent.mainFrame.getParameter("pn");
+} else {
+    // if the mainFrame is not ready then wait
+    setTimeout("show()", 500);
+}
+
+function show() {
+  location.reload();
+}
+</script>
+</head>
+<body bgcolor="#CCCCCC" topmargin="5" marginheight="5">
+<p style="font-family: Verdana, Arial, Helvetica, sans-serif; text-align: center; color: #CC3333; font-size: 11px">
+    <script type="text/javascript">document.write(pn+'<b> of </b>'+pt);</script>
+</p>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/pdf/error.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,13 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Error</title>
+</head>
+<body>
+<h1>Error</h1>
+There was an error while processing your request. Please check the parameters and try again.
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/pdf/wip.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="refresh" content="10">
+<title>Work in progress ...</title>
+</head>
+<body>
+<h1>Please wait ...</h1>
+your request is being processed. The download starts automatically when the document is finished. 
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/server/dlCache.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,73 @@
+<%@ page language="java" %>
+
+<%!
+// authentication stuff - robert
+// -----------------------------
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%>
+
+<%
+// get digilib config
+digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
+// dir cache
+digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+%>
+
+<html>
+<head>
+<title>Digilib cache info</title>
+</head>
+
+<h1>Digilib cache info</h1>
+
+
+ <table>
+  <tr>
+	<td>size (directories)</td><td><b><%= dirCache.size() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>numFiles</td><td><b><%= dirCache.getNumFiles() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>hits</td><td><b><%= dirCache.getHits() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>misses</td><td><b><%= dirCache.getMisses() %></b></td>
+    <td></td>
+  </tr>
+</table>
+
+<table>
+<%
+    Object[] keys = dirCache.getChildren("", true).toArray();
+    java.util.Arrays.sort(keys);
+    int l = keys.length;
+    for (int i = 0; i < l; i++) {
+	String key = (String) keys[i];
+	//	digilib.io.DocuDirectory val = (digilib.io.DocuDirectory) dirCache.getDirectory(key);
+%>
+  <tr>
+       <td valign="top"><%= key %></td><td><b><%= 1 /* val.getDirName() */ %></b></td>
+    <td></td>
+  </tr>
+<%
+       }
+%>
+</table>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/server/dlConfig.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,156 @@
+<%@page import="digilib.util.DigilibJobCenter"%>
+<%@ page language="java" %>
+
+<%!
+// authentication stuff - robert
+// -----------------------------
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%>
+
+<%
+// get digilib config
+digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
+// parsing the query
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+// add number of pages
+dlRequest.setValue("pt", docBean.getNumPages(dlRequest));
+// dir cache
+digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+// image JobCenter
+DigilibJobCenter imageProcessor =  (DigilibJobCenter)dlConfig.getValue("servlet.worker.imageexecutor");        
+
+%>
+
+<html>
+<head>
+<title>Digilib configuration page</title>
+</head>
+<body>
+
+<h1>Global servlet configuration</h1>
+
+<table>
+<%
+    Object[] keys = dlConfig.getParams().keySet().toArray();
+    java.util.Arrays.sort(keys);
+    int l = keys.length;
+    for (int i = 0; i < l; i++) {
+	String key = (String) keys[i];
+	String val = dlConfig.getAsString(key);
+	if (key.equals("basedir-list")) {
+	    String[] bd = (String[]) dlConfig.getValue("basedir-list");
+	    val = "";
+	    if (bd != null) {
+		for (int j = 0; j < bd.length; j++) {
+		    val += bd[j] + "<br> ";
+		}
+	    }
+	}
+	if (val.length() == 0) {
+	    val = "(none)";
+	}
+%>
+  <tr>
+    <td valign="top"><%= key %></td><td><b><%= val %></b></td>
+    <td></td>
+  </tr>
+<%
+       }
+%>
+</table>
+
+<h2>Threads</h2>
+
+<table>
+  <tr>
+    <td>currently waiting</td><td><b><%= imageProcessor.getWaitingJobs() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>currently running</td><td><b><%= imageProcessor.getRunningJobs() %></b></td>
+    <td></td>
+  </tr>
+</table>
+
+<h2>Directory cache</h2>
+
+<table>
+  <tr>
+	<td>size (directories)</td><td><b><%= dirCache.size() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>numFiles</td><td><b><%= dirCache.getNumFiles() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>hits</td><td><b><%= dirCache.getHits() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>misses</td><td><b><%= dirCache.getMisses() %></b></td>
+    <td></td>
+  </tr>
+</table>
+
+<h2>JVM configuration</h2>
+
+<table>
+  <tr>
+	<td>java.awt.headless</td><td><b><%= System.getProperty("java.awt.headless") %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>java.version</td><td><b><%= System.getProperty("java.version") %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>java.vendor</td><td><b><%= System.getProperty("java.vendor") %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>os.name</td><td><b><%= System.getProperty("os.name") %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>Runtime.maxMemory</td><td><b><%= Runtime.getRuntime().maxMemory() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>Runtime.totalMemory</td><td><b><%= Runtime.getRuntime().totalMemory() %></b></td>
+    <td></td>
+  </tr>
+  <tr>
+	<td>Runtime.freeMemory</td><td><b><%= Runtime.getRuntime().freeMemory() %></b></td>
+    <td></td>
+  </tr>
+</table>
+
+<h2>DocuImage configuration</h2>
+
+<p>Supported image types</p>
+<ul>
+<% 
+  java.util.Iterator dlfs = dlConfig.getDocuImageInstance().getSupportedFormats();
+  for (Object f = dlfs.next(); dlfs.hasNext(); f = dlfs.next()) {
+%>
+  <li><%= (String)f %></li>
+<% 
+  }
+%>
+</ul>
+
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/webapp/server/dlRequest.jsp	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,117 @@
+<%@ page language="java" %>
+
+<%!
+// authentication stuff - robert
+// -----------------------------
+// create DocumentBean instance for all JSP requests
+digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
+
+// initialize DocumentBean instance in JSP init
+public void jspInit() {
+    try {
+        // set servlet init-parameter
+        docBean.setConfig(getServletConfig());
+    } catch (javax.servlet.ServletException e) {
+        System.out.println(e);
+    }
+}
+%>
+
+<%
+// get digilib config
+digilib.servlet.DigilibConfiguration dlConfig = docBean.getDlConfig();
+// parsing the query
+digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
+// add number of pages
+dlRequest.setValue("pt", docBean.getNumPages(dlRequest));
+// dir cache
+digilib.io.DocuDirCache dirCache = (digilib.io.DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+%>
+
+<html>
+<head>
+<title>Digilib configuration page</title>
+</head>
+
+<body>
+<h1>Local request information</h1>
+
+<table>
+  <tr>
+    <td>Pt</td><td><b><%= dlRequest.getAsString("pt") %></b></td>
+    <td><i>total number of pages (generated by servlet)</i></td>
+  </tr>
+  <tr>
+    <td>RequestPath</td><td><b><%= dlRequest.getAsString("request.path") %></b></td>
+    <td><i>url of the page/document</i></td>
+  </tr>
+  <tr>
+    <td>Fn</td><td><b><b><%= dlRequest.getAsString("fn") %></b></td><td><i>url of the page/document</i></td>
+  </tr>
+  <tr>
+    <td>FilePath</td><td><b><%= dlRequest.getFilePath() %></b></td><td><i>effective path of the page/document</i></td>
+  </tr>
+  <tr>
+    <td>Pn</td><td><b><%= dlRequest.getAsString("pn") %></b></td><td><i>page number</i></td>
+  </tr>
+  <tr>
+    <td>Dw</td><td><b><%= dlRequest.getAsString("dw") %></b></td><td><i>width of client in pixels</i></td>
+  </tr>
+  <tr>
+    <td>Dh</td><td><b><%= dlRequest.getAsString("dh") %></b></td><td><i>height of client in pixels</i></td>
+  </tr>
+  <tr>
+    <td>Wx</td><td><b><%= dlRequest.getAsString("wx") %></b></td><td><i>left edge of image (float from 0 to 1)</i></td>
+  </tr>
+  <tr>
+    <td>Wy</td><td><b><%= dlRequest.getAsString("wy") %></b></td><td><i>top edge in image (float from 0 to 1)</i></td>
+  </tr>
+  <tr>
+    <td>Ww</td><td><b><%= dlRequest.getAsString("ww") %></b></td><td><i>width of image (float from 0 to 1)</i></td>
+  </tr>
+  <tr>
+    <td>Wh</td><td><b><%= dlRequest.getAsString("wh") %></b></td><td><i>height of image (float from 0 to 1)</i></td>
+  </tr>
+  <tr>
+    <td>Ws</td><td><b><%= dlRequest.getAsString("ws") %></b></td><td><i>scale factor</i></td>
+  </tr>
+  <tr>
+    <td>Mo</td><td><b><%= dlRequest.getAsString("mo") %></b></td><td><i>special options like 'fit' for gifs</i></td>
+  </tr>
+  <tr>
+    <td>Mk</td><td><b><%= dlRequest.getAsString("mk") %></b></td><td><i>marks</i></td>
+  </tr>
+  <tr>
+    <td>BaseURL</td><td colspan="2"><b><%= dlRequest.getAsString("base.url") %></b></td>
+  </tr>
+  <tr>
+    <td></td><td></td><td><i>base URL (from http:// to below /servlet)</i></td>
+  </tr>
+</table>
+
+<h2>All parameters<h2>
+
+<table>
+<%
+    Object[] keys = dlRequest.getParams().keySet().toArray();
+    java.util.Arrays.sort(keys);
+    int l = keys.length;
+    for (int i = 0; i < l; i++) {
+	String key = (String) keys[i];
+	String val = dlRequest.getAsString(key);
+	if (val.length() == 0) {
+	    val = "</b>(none)<b>";
+	}
+%>
+  <tr>
+    <td valign="top"><%= key %></td><td><b><%= val %></b></td>
+    <td><% if (! dlRequest.hasValue(key)) { %> (default) <% } %></td>
+  </tr>
+<%
+       }
+%>
+</table>
+
+
+</body>
+</html>
--- a/config/build.xml	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="build" name="digilib-servlet">
-  <property environment="env"/>
-  <property name="debuglevel" value="source,lines,vars"/>
-  <property name="target" value="1.4"/>
-  <property name="source" value="1.4"/>
-  <path id="digilib.classpath">
-    <pathelement location="bin"/>
-    <fileset dir="lib">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
-
-  <target name="init">
-    <tstamp/>
-    <mkdir dir="bin"/>
-    <mkdir dir="dist"/>
-    <available file="servlet/src" property="has.servlet.src"/>
-    <available file="client/digitallibrary" property="has.webapp.src"/>
-  </target>
-
-  <target name="clean">
-    <delete dir="bin"/>
-  </target>
-
-  <target name="cleanall" depends="clean">
-    <delete dir="client"/>
-    <delete dir="servlet"/>
-  </target>
-
-  <target name="build" depends="pkg-servlet,move-servlet"/>
-
-  <target name="dist" depends="build,copy-lib,pkg-webapp"/>
-
-  <target name="dist-nolib" depends="build,pkg-webapp"/>
-
-  <target depends="init,get-src" name="build-servlet">
-    <echo message="${ant.project.name}: ${ant.file}"/>
-    <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
-      <src path="servlet/src"/>
-      <classpath refid="digilib.classpath"/>
-    </javac>
-    <!-- Create the time stamp -->
-    <tstamp/>
-  </target>
-
-  <target name="pkg-servlet" depends="build-servlet">
-    <!-- Put everything in ${build} into the jar file -->
-    <jar destfile="dist/DigilibServlet-${DSTAMP}.jar" basedir="bin" index="yes"/>
-  </target>
-
-  <target name="move-servlet" depends="pkg-servlet,get-webapp">
-    <!-- put the new jar file in the webapp -->
-    <copy file="dist/DigilibServlet-${DSTAMP}.jar"
-          tofile="client/digitallibrary/WEB-INF/lib/DigilibServlet.jar"/>
-  </target>
-
-  <target name="copy-lib">
-    <!-- copy all files in lib in the webapp -->
-    <copy todir="client/digitallibrary/WEB-INF/lib" includeemptydirs="false">
-      <fileset dir="lib"/>
-    </copy>
-  </target>
-
-  <target name="pkg-webapp" depends="get-webapp">
-    <zip destfile="dist/digilib-${DSTAMP}.zip" basedir="client" />
-  </target>
-
-  <target name="get-all" depends="get-src,get-webapp"/>
-
-  <target name="get-src" depends="init" unless="has.servlet.src"
-          description="download fresh set of sources from CVS">
-    <cvs cvsRoot=":pserver:anonymous@cvs.digilib.berlios.de:/cvsroot/digilib"
-         package="servlet/src" compression="true"/>
-  </target>
-
-  <target name="get-webapp" depends="init" unless="has.webapp.src"
-          description="download fresh webapp directory from CVS">
-    <cvs cvsRoot=":pserver:anonymous@cvs.digilib.berlios.de:/cvsroot/digilib"
-         package="client/digitallibrary" compression="true"/>
-  </target>
-
-  <!-- CVS update should not be needed, checkout is preferrable -->
-  <target name="update" depends="init,update-src,update-webapp"/>
-
-  <target name="update-src" description="update sources from CVS" >
-    <cvs dest="servlet/src" command="update" compression="true"/>
-  </target>
-
-  <target name="update-webapp" description="update webapp from CVS" >
-    <cvs dest="client/digitallibrary" command="update" compression="true"/>
-  </target>
-</project>
--- a/config/tomcat/bin/catalina.sh	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-#!/bin/sh
-# -----------------------------------------------------------------------------
-# catalina.sh - Start/Stop Script for the CATALINA Server
-#
-# Environment Variable Prequisites
-#
-#   CATALINA_BASE (Optional) Base directory for resolving dynamic portions
-#                 of a Catalina installation.  If not present, resolves to
-#                 the same directory that CATALINA_HOME points to.
-#
-#   CATALINA_HOME (Optional) May point at your Catalina "build" directory.
-#                 If not present, the current working directory is assumed.
-#
-#   CATALINA_OPTS (Optional) Java runtime options used when the "start",
-#                 "stop", or "run" command is executed.
-#
-#   JAVA_HOME     Must point at your Java Development Kit installation.
-#
-#   JPDA_OPTS     (Optional) Java runtime options used when the "jpda start"
-#                 command is executed.  Defaults to
-#                 "-classic -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
-#
-#   JSSE_HOME     (Optional) May point at your Java Secure Sockets Extension
-#                 (JSSE) installation, whose JAR files will be added to the
-#                 system class path used to start Tomcat.
-#
-# $Id$
-# -----------------------------------------------------------------------------
-
-export JAVA_HOME=/usr/local/lib/IBMJava2-13
-export CATALINA_OPTS="-mx512m"
-
-
-# ----- Verify and Set Required Environment Variables -------------------------
-
-if [ -z "$CATALINA_HOME" ] ; then
-  ## resolve links - $0 may be a link to  home
-  PRG=$0
-  progname=`basename $0`
-  
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '.*/.*' > /dev/null; then
-	PRG="$link"
-    else
-	PRG="`dirname $PRG`/$link"
-    fi
-  done
-  
-  CATALINA_HOME_1=`dirname "$PRG"`/..
-  echo "Guessing CATALINA_HOME from catalina.sh to ${CATALINA_HOME_1}" 
-    if [ -d ${CATALINA_HOME_1}/conf ] ; then 
-	CATALINA_HOME=${CATALINA_HOME_1}
-	echo "Setting CATALINA_HOME to $CATALINA_HOME"
-    fi
-fi
-
-if [ -z "$CATALINA_OPTS" ] ; then
-  CATALINA_OPTS=""
-fi
-
-if [ -z "$JPDA_OPTS" ] ; then
-  JPDA_OPTS="-classic -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo You must set JAVA_HOME to point at your Java Development Kit installation
-  exit 1
-fi
-
-
-# ----- Cygwin Unix Paths Setup -----------------------------------------------
-
-# Cygwin support.  $cygwin _must_ be set to either true or false.
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  *) cygwin=false ;;
-esac
- 
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$CATALINA_HOME" ] &&
-    CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
-    [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-
-# ----- Set Up The System Classpath -------------------------------------------
-
-CP="$CATALINA_HOME/bin/bootstrap.jar"
-
-if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
-  CP=$CP:"$JAVA_HOME/lib/tools.jar"
-fi
-if [ -f "$JSSE_HOME/lib/jsse.jar" ] ; then
-  CP=$CP:"$JSSE_HOME/lib/jcert.jar":"$JSSE_HOME/lib/jnet.jar":"$JSSE_HOME/lib/jsse.jar"
-fi
-
-
-# ----- Cygwin Windows Paths Setup --------------------------------------------
-
-# convert the existing path to windows
-if $cygwin ; then
-   CP=`cygpath --path --windows "$CP"`
-   CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
-   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-fi
-
-
-# ----- Set Up CATALINA_BASE If Necessary -------------------------------------
-
-if [ -z "$CATALINA_BASE" ] ; then
-  CATALINA_BASE=$CATALINA_HOME
-fi
-
-
-# ----- Execute The Requested Command -----------------------------------------
-
-echo "Using CLASSPATH:     $CP"
-echo "Using CATALINA_BASE: $CATALINA_BASE"
-echo "Using CATALINA_HOME: $CATALINA_HOME"
-echo "Using JAVA_HOME:     $JAVA_HOME"
-
-if [ "$1" = "jpda" ] ; then
-  CATALINA_OPTS="${CATALINA_OPTS} ${JPDA_OPTS}"
-  shift
-fi
-
-if [ "$1" = "debug" ] ; then
-
-  shift
-  if [ "$1" = "-security" ] ; then
-    shift
-    $JAVA_HOME/bin/jdb \
-       $CATALINA_OPTS \
-       -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
-       -classpath $CP \
-       -Dcatalina.base=$CATALINA_BASE \
-       -Dcatalina.home=$CATALINA_HOME \
-       org.apache.catalina.startup.Bootstrap "$@" start
-  else
-    $JAVA_HOME/bin/jdb \
-       $CATALINA_OPTS \
-       -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
-       -classpath $CP \
-       -Dcatalina.base=$CATALINA_BASE \
-       -Dcatalina.home=$CATALINA_HOME \
-       org.apache.catalina.startup.Bootstrap "$@" start
-  fi
-
-elif [ "$1" = "embedded" ] ; then
-
-  shift
-  for i in ${CATALINA_HOME}/server/lib/*.jar ; do
-    CP=$i:${CP}
-  done
-  for i in ${CATALINA_HOME}/common/lib/*.jar ; do
-    CP=$i:${CP}
-  done
-  echo Embedded Classpath: $CP
-  $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-   -Dcatalina.base=$CATALINA_BASE \
-   -Dcatalina.home=$CATALINA_HOME \
-   org.apache.catalina.startup.Embedded "$@"
-
-elif [ "$1" = "env" ] ; then
-
-  export BP CATALINA_HOME CP
-  exit 0
-
-elif [ "$1" = "run" ] ; then
-
-  shift
-  if [ "$1" = "-security" ] ; then
-    echo Using Security Manager
-    shift
-    $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-     -Djava.security.manager \
-     -Djava.security.policy==$CATALINA_BASE/conf/catalina.policy \
-     -Dcatalina.base=$CATALINA_BASE \
-     -Dcatalina.home=$CATALINA_HOME \
-     org.apache.catalina.startup.Bootstrap "$@" start
-  else
-    $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-     -Dcatalina.base=$CATALINA_BASE \
-     -Dcatalina.home=$CATALINA_HOME \
-     org.apache.catalina.startup.Bootstrap "$@" start
-  fi
-
-elif [ "$1" = "start" ] ; then
-
-  shift
-  touch $CATALINA_BASE/logs/catalina.out
-  if [ "$1" = "-security" ] ; then
-    echo Using Security Manager
-    shift
-    $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-     -Djava.security.manager \
-     -Djava.security.policy==$CATALINA_BASE/conf/catalina.policy \
-     -Dcatalina.base=$CATALINA_BASE \
-     -Dcatalina.home=$CATALINA_HOME \
-     org.apache.catalina.startup.Bootstrap "$@" start \
-     >> $CATALINA_BASE/logs/catalina.out 2>&1 &
-  else
-    $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-     -Dcatalina.base=$CATALINA_BASE \
-     -Dcatalina.home=$CATALINA_HOME \
-     org.apache.catalina.startup.Bootstrap "$@" start \
-     >> $CATALINA_BASE/logs/catalina.out 2>&1 &
-  fi
-
-elif [ "$1" = "stop" ] ; then
-
-  shift
-  $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-   -Dcatalina.base=$CATALINA_BASE \
-   -Dcatalina.home=$CATALINA_HOME \
-   org.apache.catalina.startup.Bootstrap "$@" stop
-
-else
-
-  echo "Usage: catalina.sh ( env | run | start | stop)"
-  echo "Commands:"
-  echo "  debug             Start Catalina in a debugger"
-  echo "  debug -security   Debug Catalina with a security manager"
-  echo "  env               Set up environment variables that would be used"
-  echo "  jpda start        Start Catalina under JPDA debugger"
-  echo "  run               Start Catalina in the current window"
-  echo "  run -security     Start in the current window with security manager"
-  echo "  start             Start Catalina in a separate window"
-  echo "  start -security   Start in a separate window with security manager"
-  echo "  stop              Stop Catalina"
-  exit 1
-
-fi
--- a/config/tomcat/bin/rctomcat	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-#! /bin/sh
-#
-
-. /etc/rc.config
-
-# Determine the base and follow a runlevel link name.
-base=${0##*/}
-link=${base#*[SK][0-9][0-9]}
-
-# Force execution if not called by a runlevel directory.
-#test $link = $base && START_XNTPD=yes
-#test "$START_XNTPD" = yes || exit 0
-
-#
-# docuservers tomcat (ROC 2.11.01)
-#
-TOMCATLOG=/usr/local/httpd/logs/tomcat-err.log
-TOMCATDIR=/opt/tomcat
-
-TOMCAT_PID="";
-
-function tomcat_runs() {
-# we're looking at java vms executing org.apache.catalina.startup.Bootstrap
-#ALL_TOMS=$( ps xa | grep org.apache.catalina.startup | grep -v grep )
-#ALL_TOM_IDS=$( echo $ALL_TOMS | cut -d " " -f 1 )
-ALL_TOMS=$( pgrep -u wwwrun java )
-TOMCAT_PID=$( echo $ALL_TOMS | head -1 )
-test -n "$TOMCAT_PID"
-}
-
-return="$rc_done"
-
-case "$1" in
-    start)
-	echo -n "Starting Tomcat Servlet server "
-	su - wwwrun -c "$TOMCATDIR/bin/startup.sh" >> $TOMCATLOG 2>&1 || return=$rc_failed
-	echo -e "$return"
-	;;
-    stop)
-	echo -n "Stopping Tomcat Servlet server "
-	if su - wwwrun -c "$TOMCATDIR/bin/shutdown.sh" >> $TOMCATLOG 2>&1
-	then
-	    for i in 1 2 3 4 5
-	    do
-		if tomcat_runs
-		then
-		    return=$rc_failed
-		    echo -n "."
-		    sleep 2
-		else
-		    return=$rc_done
-		    break
-		fi
-	    done
-	    if tomcat_runs
-	    then
-		echo -n " killing."
-		kill $TOMCAT_PID
-		sleep 2
-	    fi
-	    if tomcat_runs
-	    then
-		return=$rc_failed
-	    else
-		return=$rc_done
-	    fi
-	else 
-	    return=$rc_failed
-	fi
-	
-	echo -e "$return"
-	;;
-    reload|restart)
-        $0 stop  &&  $0 start  ||  return=$rc_failed
-        ;;
-    status)
-	echo -n "Checking for service tomcat: "
-	tomcat_runs && echo OK || echo No process
-        ;;
-    *)
-	echo "Usage: $0 {start|stop|status|reload|restart}"
-	exit 1
-esac
-
-# Inform the caller not only verbosely and set an exit status.
-test "$return" = "$rc_done" || exit 1
-exit 0
--- a/config/tomcat/conf/server.xml	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<!-- Digilib Server Configuration File -->
-
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
-
-  <!-- Define an Apache-Connector Service -->
-  <Service name="Tomcat-Docuserver">
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector className="org.apache.catalina.connector.http.HttpConnector"
-               port="8080" minProcessors="5" maxProcessors="75"
-               acceptCount="10" debug="0" connectionTimeout="60000"/>
-
-    <!-- Replace "localhost" with what your Apache "ServerName" is set to -->
-    <Engine className="org.apache.catalina.connector.warp.WarpEngine"
-     name="Apache" debug="1" appBase="webapps" defaultHost="hera.unibe.ch">
-
-      <!-- Global logger unless overridden at lower levels -->
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="apache_log." suffix=".txt"
-              timestamp="true"/>
-
-      <!-- Define the default virtual host. Hostname must match the engine's. -->
-      <Host name="hera.unibe.ch" debug="0" appBase="/docuserver/tmp/digilib-test/docuserver">
-
-        <Context path="/docuserver/digitallibrary" docBase="/docuserver/tmp/digilib-test/docuserver/digitallibrary" debug="0" reloadable="false">
-	</Context>
-
-<!--
-        <Context path="/manager" docBase="/opt/tomcat/webapps/manager" debug="0" reloadable="false">
-	</Context>
--->
-
-      </Host>
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-
-    </Engine>
-
-  </Service>
-
-</Server>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pom.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>digilib</groupId>
+  <artifactId>digilib</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>digilib</name>
+  <description>The Digital Image Library</description>
+  <url>http://digilib.berlios.de</url>
+
+  <build>
+  	<plugins>
+  		<plugin>
+  			<groupId>org.apache.maven.plugins</groupId>
+  			<artifactId>maven-scm-plugin</artifactId>
+  			<version>1.5</version>
+            <configuration>
+                <goals>install</goals>
+            </configuration>
+  		</plugin>
+  	</plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>itextpdf.com</id>
+      <name>Maven Repository for iText</name>
+      <url>http://maven.itextpdf.com/</url>
+    </repository>
+  <!-- This provides the required versions of JAI-ImageIO -->
+    <repository>
+        <id>geotools.osgeo.org</id>
+        <name>Geotools repository</name>
+        <url>http://download.osgeo.org/webdav/geotools/</url>
+    </repository>
+  </repositories>
+
+  <dependencyManagement>
+  	<dependencies>
+  		<dependency>
+  			<groupId>digilib</groupId>
+  			<artifactId>digilib-servlet</artifactId>
+  			<version>2.0-SNAPSHOT</version>
+  			<type>jar</type>
+  			<scope>compile</scope>
+  		</dependency>
+  		<dependency>
+  			<groupId>digilib</groupId>
+  			<artifactId>digilib-webapp</artifactId>
+  			<version>2.0-SNAPSHOT</version>
+  			<type>war</type>
+  			<scope>compile</scope>
+  		</dependency>
+    <dependency>
+      <groupId>javax.media</groupId>
+      <artifactId>jai_imageio</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.media</groupId>
+      <artifactId>jai_codec</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.media</groupId>
+      <artifactId>jai_core</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+        <groupId>org.devlib.schmidt</groupId>
+        <artifactId>imageinfo</artifactId>
+        <version>1.9</version>
+        <type>jar</type>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.jdom</groupId>
+        <artifactId>jdom</artifactId>
+        <version>1.1</version>
+        <type>jar</type>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.14</version>
+        <type>jar</type>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <version>5.0.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>3.0.20100224</version>
+        <type>jar</type>
+        <scope>provided</scope>
+    </dependency>
+  	</dependencies>
+  </dependencyManagement>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <inceptionYear>2001</inceptionYear>
+  <developers>
+  	<developer>
+  		<id>robcast</id>
+  		<name>Robert Casties</name>
+  		<email>robcast@berlios.de</email>
+  		<organization>Max Planck Institute for the History of Science</organization>
+  		<organizationUrl>http://www.mpiwg-berlin.mpg.de</organizationUrl>
+  		<roles>
+  		</roles>
+  	</developer>
+  	<developer>
+  		<id>hertzhaft</id>
+  		<name>Martin Raspe</name>
+  		<email>hertzhaft@berlios.de</email>
+  		<organization>Bibliotheca Hertziana</organization>
+  		<organizationUrl>http://www.biblhertz.it</organizationUrl>
+  	</developer>
+  </developers>
+  <scm>
+  	<connection>scm:hg:http://hg.berlios.de/repos/digilib</connection>
+  	<developerConnection>scm:hg:https://hg.berlios.de/repos/digilib</developerConnection>
+  	<url>http://hg.berlios.de/repos/digilib</url>
+  </scm>
+  <dependencies>
+  </dependencies>
+  <modules>
+    <module>client</module>
+    <module>servlet</module>
+  </modules>
+</project>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/pom.xml	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>digilib</artifactId>
+    <groupId>digilib</groupId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
+  <groupId>digilib</groupId>
+  <artifactId>digilib-servlet</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <name>digilib-servlet</name>
+  <description>The Digital Image Library - Servlet</description>
+  <url>http://digilib.berlios.de</url>
+  <packaging>jar</packaging>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.media</groupId>
+      <artifactId>jai_imageio</artifactId>
+        <type>jar</type>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.media</groupId>
+      <artifactId>jai_codec</artifactId>
+        <type>jar</type>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.media</groupId>
+      <artifactId>jai_core</artifactId>
+        <type>jar</type>
+        <scope>compile</scope>
+    </dependency>
+  	<dependency>
+  		<groupId>org.devlib.schmidt</groupId>
+  		<artifactId>imageinfo</artifactId>
+  		<type>jar</type>
+  		<scope>compile</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.jdom</groupId>
+  		<artifactId>jdom</artifactId>
+  		<type>jar</type>
+  		<scope>compile</scope>
+  	</dependency>
+  	<dependency>
+  		<groupId>log4j</groupId>
+  		<artifactId>log4j</artifactId>
+  		<type>jar</type>
+  		<scope>compile</scope>
+  	</dependency>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+    	<groupId>org.mortbay.jetty</groupId>
+    	<artifactId>servlet-api</artifactId>
+    	<type>jar</type>
+    	<scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
--- a/servlet/src/META-INF/MANIFEST.MF	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
--- a/servlet/src/digilib/auth/AuthOpException.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*  AuthOpException -- Authentication exception class
-
- Digital Image Library servlet components
-
- Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- */
-
-package digilib.auth;
-
-public class AuthOpException extends Exception {
-
-	private static final long serialVersionUID = 4908131122710826645L;
-
-	public AuthOpException() {
-	}
-
-	public AuthOpException(String s) {
-		super(s);
-	}
-}
--- a/servlet/src/digilib/auth/AuthOps.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/*  AuthOps -- Authentication interface class
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-package digilib.auth;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import digilib.servlet.DigilibRequest;
-
-/** Class of operations requiring authentication. */
-public interface AuthOps {
-
-	/** Test if the request must be authorized to access the filepath.
-	 *
-	 * Information about the user is taken from the ServletRequest.
-	 * @param filepath filepath to be accessed.
-	 * @param request ServletRequest with user information.
-	 * @throws AuthOpException Exception thrown on error.
-	 * @return true if the user request must be authorized.
-	 */
-	public boolean isAuthRequired(String filepath, HttpServletRequest request)
-		throws AuthOpException;
-
-	/** Test if the request must be authorized to access the filepath.
-	 *
-	 * Information about the user is taken from the DigilibRequest.
-	 * @param request DigilibRequest with user information.
-	 * @throws AuthOpException Exception thrown on error.
-	 * @return true if the user request must be authorized.
-	 */
-	public boolean isAuthRequired(DigilibRequest request)
-		throws AuthOpException;
-
-	/** Test if the request is allowed to access filepath.
-	 * 
-	 * @param filepath filepath to be acessed.
-	 * @param request Request with user information.
-	 * @throws AuthOpException Exception thrown on error.
-	 * @return true if the request is allowed.
-	 */
-	public boolean isAuthorized(String filepath, HttpServletRequest request)
-		throws AuthOpException;
-
-	/** Test if the request is allowed to access filepath.
-	 * 
-	 * @param request Request with user information.
-	 * @throws AuthOpException Exception thrown on error.
-	 * @return true if the request is allowed.
-	 */
-	public boolean isAuthorized(DigilibRequest request)
-		throws AuthOpException;
-
-	/** Authorization roles needed for request.
-	 *
-	 * Returns the list of authorization roles that are needed to access the
-	 * specified path. No list means the path is free.
-	 *
-	 * The location information of the request is also considered.
-	 *
-	 * @param filepath filepath to be accessed.
-	 * @param request ServletRequest with address information.
-	 * @throws AuthOpException Exception thrown on error.
-	 * @return List of Strings with role names.
-	 */
-	public List<String> rolesForPath(String filepath, HttpServletRequest request)
-		throws AuthOpException;
-
-	/** Authorization roles needed for request.
-	 *
-	 * Returns the list of authorization roles that are needed to access the
-	 * specified path. No list means the path is free.
-	 *
-	 * The location information of the request is also considered.
-	 *
-	 * @param request DigilibRequest with address information.
-	 * @throws AuthOpException Exception thrown on error.
-	 * @return List of Strings with role names.
-	 */
-	public List<String> rolesForPath(DigilibRequest request)
-		throws AuthOpException;
-
-	/** Test request authorization against a list of roles.
-	 * @param roles List of Strings with role names.
-	 * @param request ServletRequest with address information.
-	 * @return true if the user information in the request authorizes one of the roles.
-	 */
-	public boolean isRoleAuthorized(List<String> roles, HttpServletRequest request);
-
-	/** Test request authorization against a list of roles.
-	 * @param roles List of Strings with role names.
-	 * @param request ServletRequest with address information.
-	 * @return true if the user information in the request authorizes one of the roles.
-	 */
-	public boolean isRoleAuthorized(List<String> roles, DigilibRequest request);
-
-}
--- a/servlet/src/digilib/auth/AuthOpsImpl.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*  AuthOps -- Authentication class implementation
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-package digilib.auth;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.log4j.Logger;
-
-import digilib.servlet.DigilibRequest;
-
-/** Basic implementation of AuthOps interface.
- *
- * Provides basic implementations. Only rolesForPath needs to be implemented
- * by specific implementations.
- */
-public abstract class AuthOpsImpl implements AuthOps {
-
-	/** general logger for this class */
-	protected Logger logger = Logger.getLogger(this.getClass());
-	
-  /** Default constructor. */  
-  public AuthOpsImpl() {
-    try {
-      init();
-    } catch (AuthOpException e) {
-    }
-  }
-
-
-  /** Test if the request is allowed to access filepath.
-   * @param filepath filepath to be acessed.
-   * @param request Request with user information.
-   * @throws AuthOpException Exception thrown on error.
-   * @return true if the request is allowed.
-   */
-  public boolean isAuthRequired(String filepath, HttpServletRequest request) throws AuthOpException {
-    // check permissions
-    List<String> rolesRequired = rolesForPath(filepath, request);
-    return (rolesRequired != null);
-  }
-
-  /**
-   * @see digilib.auth.AuthOps#isAuthRequired(digilib.servlet.DigilibRequest)
-   */
-  public boolean isAuthRequired(DigilibRequest request)
-	  throws AuthOpException {
-		// check permissions
-		List<String> rolesRequired = rolesForPath(request);
-		return (rolesRequired != null);
-  }
-
-  /** Return authorization roles needed for request.
-   *
-   * Returns a list of authorization roles that would be allowed to access the
-   * specified path. The location information of the request is considered also.
-   * @param filepath filepath to be accessed.
-   * @param request ServletRequest with address information.
-   * @throws AuthOpException Exception thrown on error.
-   * @return List of Strings with role names.
-   */
-  public boolean isAuthorized(String filepath, HttpServletRequest request) throws AuthOpException {
-    List<String> rolesAllowed = rolesForPath(filepath, request);
-    return isRoleAuthorized(rolesAllowed, request);
-  }
-
-  /**
-   * @see digilib.auth.AuthOps#isAuthorized(digilib.servlet.DigilibRequest)
-   */
-  public boolean isAuthorized(DigilibRequest request)
-	  throws AuthOpException {
-		List<String> rolesAllowed = rolesForPath(request);
-		return isRoleAuthorized(rolesAllowed, request);
-  }
-
-  /** Test request authorization against a list of roles.
-   * @param roles List of Strings with role names.
-   * @param request ServletRequest with address information.
-   * @return true if the user information in the request authorizes one of the roles.
-   */
-  public boolean isRoleAuthorized(List<String> roles, HttpServletRequest request) {
-    for (String s: roles) {
-      logger.debug("Testing role: "+s);
-      if (request.isUserInRole(s)) {
-      	logger.debug("Role Authorized");
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * @see digilib.auth.AuthOps#isRoleAuthorized(java.util.List, digilib.servlet.DigilibRequest)
-   */
-  public boolean isRoleAuthorized(List<String> roles, DigilibRequest request) {
-	for (String s: roles) {
-	  logger.debug("Testing role: "+s);
-	  if (((HttpServletRequest)request.getServletRequest()).isUserInRole(s)) {
-	  	logger.debug("Role Authorized");
-		return true;
-	  }
-	}
-	return false;
-  }
-
-  public abstract void init() throws AuthOpException;
-
-  public abstract List<String> rolesForPath(String filepath, HttpServletRequest request) throws AuthOpException;
-
-  public abstract List<String> rolesForPath(DigilibRequest request) throws AuthOpException;
-
-}
--- a/servlet/src/digilib/auth/HashTree.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/*  HashTree -- Tree in a Hashtable
-
- Digital Image Library servlet components
-
- Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- */
-
-package digilib.auth;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-/**
- * Tree representation wrapper for a HashMap.
- * 
- * The HashTree is constructed from a HashMap filled with 'branches' with
- * 'leaves'. The branches are stored as String keys in the HashMap. The String
- * values are leaves.
- * 
- * Branches are matched in 'twigs' separated by 'twig separator' Strings. The
- * return values for a match are leaf values separated by 'leaf separator'
- * Strings.
- * 
- * @author casties
- */
-public class HashTree {
-
-    private Map<String, String> table;
-
-    private String twigSep = "/";
-
-    private String leafSep = ",";
-
-    /**
-     * Constructor of a HashTree.
-     * 
-     * Creates a HashTree wrapper around a given HashMap, using the given twig
-     * separator and leaf separator.
-     * 
-     * @param t
-     * @param twig_separator
-     * @param leaf_separator
-     */
-    public HashTree(Map<String, String> t, String twig_separator, String leaf_separator) {
-        table = t;
-        twigSep = twig_separator;
-        leafSep = leaf_separator;
-        optimizeTable();
-    }
-
-    void optimizeTable() {
-    }
-
-    /**
-     * Matches the given branch against the HashTree.
-     * 
-     * Returns a LinkedList of all leaves on all matching branches in the tree.
-     * Branches in the tree match if they are substrings starting at the same
-     * root.
-     * 
-     * @param branch
-     * @return
-     */
-    List<String> match(String branch) {
-        String b = "";
-        String m;
-        LinkedList<String> matches = new LinkedList<String>();
-
-        // split branch
-        StringTokenizer twig = new StringTokenizer(branch, twigSep);
-        // walk branch and check with tree
-        while (twig.hasMoreTokens()) {
-            if (b.length() == 0) {
-                b = twig.nextToken();
-            } else {
-                b += twigSep + twig.nextToken();
-            }
-            m = table.get(b);
-            if (m != null) {
-                if (m.indexOf(leafSep) < 0) {
-                    // single leaf
-                    matches.add(m);
-                } else {
-                    // split leaves
-                    StringTokenizer leaf = new StringTokenizer(m, leafSep);
-                    while (leaf.hasMoreTokens()) {
-                        matches.add(leaf.nextToken());
-                    }
-                }
-            }
-        }
-        if (matches.size() > 0) {
-            return matches;
-        } else {
-            return null;
-        }
-    }
-}
--- a/servlet/src/digilib/auth/XMLAuthOps.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/* XMLAuthOps -- Authentication class implementation using XML files
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-package digilib.auth;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import digilib.io.XMLListLoader;
-import digilib.servlet.DigilibRequest;
-
-/** Implementation of AuthOps using XML files.
- *
- * The configuration file is read by an XMLListLoader into HashTree objects for 
- * authentication paths and IP numbers.
- */
-public class XMLAuthOps extends AuthOpsImpl {
-
-	private File configFile;
-	private HashTree authPaths;
-	private HashTree authIPs;
-
-	/** Constructor taking an XML config file.
-	 *
-	 * @param u utils object
-	 * @param confFile Configuration file.
-	 * @throws AuthOpException Exception thrown on error.
-	 */
-	public XMLAuthOps(File confFile) throws AuthOpException {
-		configFile = confFile;
-		init();
-	}
-
-	/** Set configuration file.
-	 *
-	 * @param confFile XML config file.
-	 * @throws AuthOpException Exception thrown on error.
-	 */
-	public void setConfig(File confFile) throws AuthOpException {
-		configFile = confFile;
-		init();
-	}
-
-	/** Initialize.
-	 *
-	 * Read configuration files and setup authentication arrays.
-	 *
-	 * @throws AuthOpException Exception thrown on error.
-	 */
-	public void init() throws AuthOpException {
-		logger.debug("xmlauthops.init (" + configFile + ")");
-		Map<String, String> pathList = null;
-		Map<String, String> ipList = null;
-		try {
-			// load authPaths
-			XMLListLoader pathLoader =
-				new XMLListLoader("digilib-paths", "path", "name", "role");
-			pathList = pathLoader.loadURL(configFile.toURL().toString());
-			// load authIPs
-			XMLListLoader ipLoader =
-				new XMLListLoader("digilib-addresses", "address", "ip", "role");
-			ipList = ipLoader.loadURL(configFile.toURL().toString());
-		} catch (Exception e) {
-			throw new AuthOpException(
-				"ERROR loading authorization config file: " + e);
-		}
-		if ((pathList == null) || (ipList == null)) {
-			throw new AuthOpException("ERROR unable to load authorization config file!");
-		}
-		// setup path tree
-		authPaths = new HashTree(pathList, "/", ",");
-		// setup ip tree
-		authIPs = new HashTree(ipList, ".", ",");
-	}
-
-	/** Return authorization roles needed for request.
-	 *
-	 * Returns the list of authorization roles that are needed to access the
-	 * specified path. No list means the path is free.
-	 *
-	 * The location information of the request is also considered.
-	 *
-	 * @param filepath filepath to be accessed.
-	 * @param request ServletRequest with address information.
-	 * @throws AuthOpException Exception thrown on error.
-	 * @return List of Strings with role names.
-	 */
-	public List<String> rolesForPath(String filepath, HttpServletRequest request)
-		throws digilib.auth.AuthOpException {
-		logger.debug("rolesForPath ("
-				+ filepath
-				+ ") by ["
-				+ request.getRemoteAddr()
-				+ "]");
-
-		// check if the requests address provides a role
-		List<String> provided = authIPs.match(request.getRemoteAddr());
-		if ((provided != null) && (provided.contains("ALL"))) {
-			// ALL switches off checking;
-			return null;
-		}
-		// which roles are required?
-		List<String> required = authPaths.match(filepath);
-		// do any provided roles match?
-		if ((provided != null) && (required != null)) {
-			for (int i = 0; i < provided.size(); i++) {
-				if (required.contains(provided.get(i))) {
-					// satisfied
-					return null;
-				}
-			}
-		}
-		return required;
-	}
-
-	/**
-	 * @see digilib.auth.AuthOps#rolesForPath(digilib.servlet.DigilibRequest)
-	 */
-	public List<String> rolesForPath(DigilibRequest request) throws AuthOpException {
-		logger.debug("rolesForPath ("
-				+ request.getFilePath()
-				+ ") by ["
-				+ request.getServletRequest().getRemoteAddr()
-				+ "]");
-
-		// check if the requests address provides a role
-		List<String> provided =
-			authIPs.match(request.getServletRequest().getRemoteAddr());
-		if ((provided != null) && (provided.contains("ALL"))) {
-			// ALL switches off checking;
-			return null;
-		}
-		// which roles are required?
-		List<String> required = authPaths.match(request.getFilePath());
-		// do any provided roles match?
-		if ((provided != null) && (required != null)) {
-			for (int i = 0; i < provided.size(); i++) {
-				if (required.contains(provided.get(i))) {
-					// satisfied
-					return null;
-				}
-			}
-		}
-		return required;
-	}
-
-}
--- a/servlet/src/digilib/image/DocuImage.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-/* DocuImage -- General image interface class
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-package digilib.image;
-
-import java.awt.Rectangle;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import javax.servlet.ServletException;
-
-import digilib.io.ImageFile;
-import digilib.io.FileOpException;
-
-/** The basic class for the representation of a digilib image.
- *
- * The actual image object is hidden in the class, only methods for loading,
- * manipulation, and saving are exported. This strategy enables implementations
- * using different toolkits that rely on different image base classes (like
- * JIMI, Java2D and JAI).
- */
-public interface DocuImage {
-
-	/** Loads an image file into the Object.
-	 * 
-	 * @param f Image File.
-	 * @throws FileOpException Exception thrown if any error occurs.
-	 */
-	public void loadImage(ImageFile f) throws FileOpException;
-
-	/** This DocuImage support the loadSubImage operation.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isSubimageSupported();
-
-	/** Load only a subsampled region of the image file.
-	 * 
-	 * @param f
-	 * @param region
-	 * @param subsample
-	 * @throws FileOpException
-	 */
-	public void loadSubimage(ImageFile f, Rectangle region, int subsample)
-		throws FileOpException;
-
-	/** Writes the current image to a ServletResponse.
-	 *
-	 * The image is encoded to the mime-type <code>mt</code> and sent to the output
-	 * stream of the <code>ServletResponse</code> <code>res</code>.
-	 *
-	 * Currently only mime-types "image/jpeg" and "image/png" are supported.
-	 * 
-	 * @param mt mime-type of the image to be sent.
-	 * @param res ServletResponse where the image is sent.
-	 * @throws ServletException Exception thrown on sending data.
-	 * @throws ImageOpException Exception in other cases.
-	 */
-	public void writeImage(String mt, OutputStream ostream)
-		throws ServletException, ImageOpException;
-
-	/** The width of the current image in pixel.
-	 * 
-	 * @return Image width in pixels.
-	 */
-	public int getWidth();
-
-	/** The height of the current image in pixel.
-	 * 
-	 * @return Image height in pixels.
-	 */
-	public int getHeight();
-	
-	/** The size of the current image in pixel.
-	 * 
-	 * @return
-	 */
-	public ImageSize getSize();
-
-	/** The mime-type of the current image.
-	 * 
-	 * @return String the mime-type of this image.
-	 */
-	public String getMimetype();
-
-	/** Crops the current image.
-	 * 
-	 * Cuts out a region of the size <code>width</code> x <code>height</code> at
-	 * the offset <code>xoff</code>, <code>yoff</code> from the current image
-	 * and replaces the current image with the result.
-	 * 
-	 * @param xoff X offset of crop region
-	 * @param yoff Y offset of crop region
-	 * @param width width of crop region
-	 * @param height height of crop region
-	 * @throws ImageOpException
-	 */
-	public void crop(int xoff, int yoff, int width, int height)
-		throws ImageOpException;
-
-	/** Scales the current image.
-	 * 
-	 * Replaces the current image with an image scaled by the factor
-	 * <code>scale</code>.
-	 * 
-	 * @param scale scaling factor
-	 * @throws ImageOpException
-	 */
-	public void scale(double scaleX, double scaleY) throws ImageOpException;
-
-	/** Crops and scales the current image.
-	 *
-	 * The current image is cropped to a rectangle of <code>width</code>,
-	 * <code>height</code> at position <code>x_off</code>, <code>y_off</code>. The
-	 * resulting image is scaled by the factor <code>scale</code> using the
-	 * interpolation quality <code>qual</code> (0=worst).
-	 * 
-	 * @param x_off x offset of the crop rectangle in pixel.
-	 * @param y_off y offset of the crop rectangle in pixel.
-	 * @param width width of the crop rectangle in pixel.
-	 * @param height height of the crop rectangle in pixel.
-	 * @param scale scaling factor.
-	 * @param qual interpolation quality (0=worst).
-	 * @throws ImageOpException exception thrown on any error.
-	 */
-	public void cropAndScale(
-		int x_off,
-		int y_off,
-		int width,
-		int height,
-		double scale,
-		int qual)
-		throws ImageOpException;
-
-	/** Rotates the current image.
-	 * 
-	 * Replaces the current image with a rotated image. The image is rotated
-	 * around the center by the <code>angle</code> 
-	 * given in degrees [0, 360] clockwise.
-	 * Image size and aspect ratio are likely to change.
-	 * 
-	 * @param angle rotation angle in degree
-	 */
-	public void rotate(double angle) throws ImageOpException;
-
-	/** Mirrors the current image.
-	 * 
-	 * Replaces  the current image with a mirrored image. The mirror axis goes
-	 * through the center of the image and is rotated by <code>angle</code>
-	 * degrees. Currently only horizontal and vertical mirroring (0 and 90
-	 * degree) are supported. 
-	 * 
-	 * @param angle angle of mirror axis
-	 * @throws ImageOpException
-	 */
-	public void mirror(double angle) throws ImageOpException;
-
-	/** Enhances brightness and contrast of the current image.
-	 * 
-	 * Replaces the current image with a brightness and contrast enhanced image.
-	 * Contrast is enhanced by multiplying the pixel value with the constant
-	 * <code>mult</code>. Brightness is enhanced by adding the constant
-	 * <code>add</code> to the pixel value. Operation: p1 = (p0*mult)+add.
-	 * 
-	 * @param mult multiplicative constant for contrast enhancement
-	 * @param add additive constant for brightness enhancement
-	 * @throws ImageOpException
-	 */
-	public void enhance(float mult, float add) throws ImageOpException;
-
-	/** Manipulates the colors of the current image.
-	 * 
-	 * Replaces the current image with a color modified image.
-	 * For the red, green and blue color channels all pixel values are multiplied
-	 * by the constant
-	 * <code>m</code> and added to the constant
-	 * <code>a</code>. Operation: p1 = (p0*m)+a.
-	 * 
-	 * @param rgbm multiplicative constants for red, green, blue
-	 * @param rgba additive constant for red, green, blue
-	 * @throws ImageOpException
-	 */
-	public void enhanceRGB(float[] rgbm, float[] rgba)
-		throws ImageOpException;
-
-	/**
-	 * Returns the interpolation quality.
-	 * @return int
-	 */
-	public int getQuality();
-
-	/**
-	 * Sets the interpolation quality.
-	 * @param quality The quality to set
-	 */
-	public void setQuality(int quality);
-	
-	/** Frees all resources bound to the DocuImage.
-	 * 
-	 * Things that should be freed are image objects and open files.
-	 * 
-	 */
-	public void dispose();
-
-    /**
-     * Check image size and type and store in ImageFile f
-     */
-    public ImageFile identify(ImageFile imgf) throws IOException;
-
-    /**
-     * Returns a list of supported image formats
-     */
-	public Iterator<String> getSupportedFormats();
-	
-	/**
-	 * returns the underlying image as java.awt.Image (if possible, or null)
-	 * @return
-	 */
-	public java.awt.Image getAwtImage();
-
-}
--- a/servlet/src/digilib/image/DocuImageImpl.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-/* DocuImage -- General image interface class implementation
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-package digilib.image;
-
-import java.awt.Image;
-import java.awt.Rectangle;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.servlet.ServletException;
-
-import org.apache.log4j.Logger;
-
-import digilib.io.FileOpException;
-import digilib.io.ImageFile;
-
-/** Simple abstract implementation of the <code>DocuImage</code> interface.
- *
- * This implementation provides basic functionality for the utility methods like
- * <code>getKnownFileTypes</code>. Image methods like
- * <code>loadImage</code>, <code>writeImage</code>, <code>getWidth</code>,
- * <code>getHeight</code>, <code>crop</code> and <code>scale</code> must be
- * implemented by derived classes.
- */
-public abstract class DocuImageImpl implements DocuImage {
-
-	/** logger */
-	protected static final Logger logger = Logger.getLogger(DocuImage.class);
-	
-	/** Interpolation quality. */
-	protected int quality = 0;
-	
-	/** epsilon for float comparisons. */
-	public final double epsilon = 1e-5;
-	
-	/** image mime-type */
-	protected String mimeType = null;
-
-	/** image size */
-    protected ImageSize imgSize = null;
-
-	/**
-	 * Returns the quality.
-	 * @return int
-	 */
-	public int getQuality() {
-		return quality;
-	}
-
-	/**
-	 * Sets the quality.
-	 * @param quality The quality to set
-	 */
-	public void setQuality(int quality) {
-		this.quality = quality;
-	}
-
-	/** Crop and scale the current image.
-	 *
-	 * The current image is cropped to a rectangle of width, height at position
-	 * x_off, y_off. The resulting image is scaled by the factor scale using the
-	 * interpolation quality qual (0=worst).
-	 * 
-	 * @param x_off X offset of the crop rectangle in pixel.
-	 * @param y_off Y offset of the crop rectangle in pixel.
-	 * @param width Width of the crop rectangle in pixel.
-	 * @param height Height of the crop rectangle in pixel.
-	 * @param scale Scaling factor.
-	 * @param qual Interpolation quality (0=worst).
-	 * @throws ImageOpException Exception thrown on any error.
-	 */
-	public void cropAndScale(
-		int x_off, int y_off, int width, int height, double scale, int qual) 
-		throws ImageOpException {
-		// default implementation: first crop, then scale
-		setQuality(qual);
-		crop(x_off, y_off, width, height);
-		scale(scale, scale);
-	}
-	
-	public String getMimetype() {
-		return mimeType;
-	}
-
-    /* (non-Javadoc)
-     * @see digilib.image.DocuImage#identify(digilib.io.ImageFile)
-     */
-    public ImageFile identify(ImageFile imgf) throws IOException {
-        // just a do-nothing implementation
-        return null;
-    }
-
-	public void rotate(double angle) throws ImageOpException {
-		// just a do-nothing implementation
-	}
-
-	public void mirror(double angle) throws ImageOpException {
-		// just a do-nothing implementation
-	}
-
-	public void enhance(float mult, float add) throws ImageOpException {
-		// just a do-nothing implementation
-	}
-
-	public boolean isSubimageSupported() {
-		// partial loading not supported per default
-		return false;
-	}
-
-	public void loadSubimage(ImageFile f, Rectangle region, int subsample)
-		throws FileOpException {
-		// empty implementation
-	}
-
-	public void enhanceRGB(float[] rgbm, float[] rgba)
-		throws ImageOpException {
-		// emtpy implementation
-	}
-
-	public void dispose() {
-		// emtpy implementation
-	}
-
-	public Iterator<String> getSupportedFormats() {
-		List<String> empty = new LinkedList<String>();
-		return empty.iterator();
-	}
-
-    public void crop(int xoff, int yoff, int width, int height)
-            throws ImageOpException {
-        // TODO Auto-generated method stub
-    }
-
-    public Image getAwtImage() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public int getHeight() {
-        ImageSize is = getSize();
-        if (is != null) {
-            return is.getHeight();
-        }
-        return 0;
-    }
-
-    public int getWidth() {
-        ImageSize is = getSize();
-        if (is != null) {
-            return is.getWidth();
-        }
-        return 0;
-    }
-
-    public ImageSize getSize() {
-        return imgSize;
-    }
-
-    public void loadImage(ImageFile f) throws FileOpException {
-        // TODO Auto-generated method stub
-        
-    }
-
-    public void scale(double scaleX, double scaleY) throws ImageOpException {
-        // TODO Auto-generated method stub
-        
-    }
-
-    public void writeImage(String mt, OutputStream ostream)
-            throws ServletException, ImageOpException {
-        // TODO Auto-generated method stub
-    }
-	
-}
--- a/servlet/src/digilib/image/ImageInfoDocuImage.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/**
- * 
- */
-package digilib.image;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-import org.marcoschmidt.image.ImageInfo;
-
-import digilib.io.ImageFile;
-
-/** Simple abstract implementation of the <code>DocuImage</code> interface.
- * Implements only the identify method using the ImageInfo class.
- * @author casties
- *
- */
-public abstract class ImageInfoDocuImage extends DocuImageImpl {
-
-    /** Check image size and type and store in ImageFile f */
-    public ImageFile identify(ImageFile imgf) throws IOException {
-        // fileset to store the information
-        File f = imgf.getFile();
-        if (f == null) {
-            throw new IOException("File not found!");
-        }
-        RandomAccessFile raf = new RandomAccessFile(f, "r");
-        // set up ImageInfo object
-        ImageInfo iif = new ImageInfo();
-        iif.setInput(raf);
-        iif.setCollectComments(false);
-        iif.setDetermineImageNumber(false);
-        logger.debug("identifying (ImageInfo) " + f);
-        // try with ImageInfo first
-        if (iif.check()) {
-            ImageSize d = new ImageSize(iif.getWidth(), iif.getHeight());
-            imgf.setSize(d);
-            imgf.setMimetype(iif.getMimeType());
-            //logger.debug("  format:"+iif.getFormatName());
-            raf.close();
-            logger.debug("image size: " + imgf.getSize());
-            return imgf;
-        } else {
-            raf.close();
-        }
-        return null;
-    }
-        
-
-}
--- a/servlet/src/digilib/image/ImageJobDescription.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,492 +0,0 @@
-package digilib.image;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.log4j.Logger;
-
-import digilib.io.DocuDirCache;
-import digilib.io.DocuDirectory;
-import digilib.io.FileOpException;
-import digilib.io.FileOps;
-import digilib.io.FileOps.FileClass;
-import digilib.io.ImageFile;
-import digilib.io.ImageFileset;
-import digilib.servlet.DigilibConfiguration;
-import digilib.util.OptionsSet;
-import digilib.util.Parameter;
-import digilib.util.ParameterMap;
-
-
-/** 
- * A container class for storing a set of instructional parameters 
- * used for content generating classes like MakePDF.  
- * 
- * This contains the functionality formerly found in Scaler, processRequest, only factorized.
- * 
- * TODO clean up...
- * 
- * @author cmielack, casties
- *
- */
-
-public class ImageJobDescription extends ParameterMap {
-	
-	DigilibConfiguration dlConfig = null;
-	protected static Logger logger = Logger.getLogger("digilib.servlet");
-
-	ImageFile fileToLoad = null;
-	ImageFileset fileset = null;
-	DocuDirectory fileDir = null;
-	String filePath = null;
-	ImageSize expectedSourceSize = null;
-	Float scaleXY = null;
-	Rectangle2D userImgArea = null;
-	Rectangle2D outerUserImgArea= null;
-	Boolean imageSendable = null;
-	String mimeType;
-	Integer paramDW;
-	Integer paramDH;
-
-	/** create empty ImageJobDescription.
-	 * @param dlcfg
-	 */
-	public ImageJobDescription(DigilibConfiguration dlcfg) {
-		super(30);
-		dlConfig = dlcfg;
-	}
-
-
-	/** set up Parameters
-	 * @see digilib.util.ParameterMap#initParams()
-	 */
-	@Override
-	protected void initParams() {
-		// url of the page/document (second part)
-		newParameter("fn", "", null, 's');
-		// page number
-		newParameter("pn", new Integer(1), null, 's');
-		// width of client in pixels
-		newParameter("dw", new Integer(0), null, 's');
-		// height of client in pixels
-		newParameter("dh", new Integer(0), null, 's');
-		// left edge of image (float from 0 to 1)
-		newParameter("wx", new Float(0), null, 's');
-		// top edge in image (float from 0 to 1)
-		newParameter("wy", new Float(0), null, 's');
-		// width of image (float from 0 to 1)
-		newParameter("ww", new Float(1), null, 's');
-		// height of image (float from 0 to 1)
-		newParameter("wh", new Float(1), null, 's');
-		// scale factor
-		newParameter("ws", new Float(1), null, 's');
-		// special options like 'fit' for gifs
-		newParameter("mo", this.options, null, 's');
-		// rotation angle (degree)
-		newParameter("rot", new Float(0), null, 's');
-		// contrast enhancement factor
-		newParameter("cont", new Float(0), null, 's');
-		// brightness enhancement factor
-		newParameter("brgt", new Float(0), null, 's');
-		// color multiplicative factors
-		newParameter("rgbm", "0/0/0", null, 's');
-		// color additive factors
-		newParameter("rgba", "0/0/0", null, 's');
-		// display dpi resolution (total)
-		newParameter("ddpi", new Float(0), null, 's');
-		// display dpi X resolution
-		newParameter("ddpix", new Float(0), null, 's');
-		// display dpi Y resolution
-		newParameter("ddpiy", new Float(0), null, 's');
-		// scale factor for mo=ascale
-		newParameter("scale", new Float(1), null, 's');
-	}
-
-
-	/* (non-Javadoc)
-	 * @see digilib.servlet.ParameterMap#initOptions()
-	 */
-	@Override
-	protected void initOptions() {
-		String s = this.getAsString("mo");
-		options = new OptionsSet(s);
-	}
-
-
-	/** Creates new ImageJobDescription by merging Parameters from another ParameterMap.
-	 * @param pm
-	 * @param dlcfg
-	 * @return
-	 */
-	public static ImageJobDescription getInstance(ParameterMap pm, DigilibConfiguration dlcfg) {
-		ImageJobDescription newMap = new ImageJobDescription(dlcfg);
-		// add all params to this map
-		newMap.params.putAll(pm.getParams());
-		newMap.initOptions();
-		return newMap;
-	}
-
-	
-	public String getMimeType() throws IOException {
-		if (mimeType == null) {
-			fileToLoad = getFileToLoad();
-			if(! fileToLoad.isChecked()){
-				DigilibConfiguration.docuImageIdentify(fileToLoad);
-			}
-			mimeType = fileToLoad.getMimetype();
-		}
-		return mimeType;
-	}
-	
-	public ImageFile getFileToLoad() throws IOException {
-		
-		if(fileToLoad == null){
-			fileset = getFileset();
-			
-			/* select a resolution */
-			if (getHiresOnly()) {
-				// get first element (= highest resolution)
-				fileToLoad = fileset.getBiggest();
-			} else if (getLoresOnly()) {
-				// enforced lores uses next smaller resolution
-				fileToLoad = fileset.getNextSmaller(getExpectedSourceSize());
-				if (fileToLoad == null) {
-					// this is the smallest we have
-					fileToLoad = fileset.getSmallest();
-				}
-			} else {
-				// autores: use next higher resolution
-				fileToLoad = fileset.getNextBigger(getExpectedSourceSize());
-				if (fileToLoad == null) {
-					// this is the highest we have
-					fileToLoad = fileset.getBiggest();
-				}
-			}
-			logger.info("Planning to load: " + fileToLoad.getFile());
-		}
-		
-		return fileToLoad;
-
-	}
-	
-	public DocuDirectory getFileDirectory() throws FileOpException {
-		if(fileDir == null){
-			DocuDirCache dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-			String fp = getFilePath();
-			fileDir = dirCache.getDirectory(fp);
-			if (fileDir == null) {
-				throw new FileOpException("Directory " + getFilePath() + " not found.");
-			}
-		}
-		return fileDir;
-	}
-	
-    public ImageFileset getFileset() throws FileOpException {
-        if(fileset==null){
-            DocuDirCache dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-    
-            fileset = (ImageFileset) dirCache.getFile(getFilePath(), getAsInt("pn"), FileClass.IMAGE);
-            if (fileset == null) {
-                throw new FileOpException("File " + getFilePath() + "("
-                        + getAsInt("pn") + ") not found.");
-            }
-        }
-        return fileset;
-    }
-    
-	public String getFilePath() {
-		if(filePath == null){
-			String s = this.getAsString("request.path");
-			s += this.getAsString("fn");
-			filePath = FileOps.normalName(s);
-		}
-		return filePath;
-	}
-
-	public boolean getHiresOnly(){
-		return hasOption("clip") || hasOption("hires");
-	}
-	
-	public boolean getLoresOnly(){
-		return hasOption("lores");
-	}
-
-	public boolean getScaleToFit() {
-		return !(hasOption("clip") || hasOption("osize") || hasOption("ascale"));
-	}
-
-	public boolean getAbsoluteScale(){
-		return hasOption("osize") || hasOption("ascale");
-	}
-	
-	
-	public ImageSize getExpectedSourceSize() throws IOException {
-		if (expectedSourceSize == null){
-			expectedSourceSize = new ImageSize();
-			if (getScaleToFit()) {
-				// scale to fit -- calculate minimum source size
-				float scale = (1 / Math.min(getAsFloat("ww"), getAsFloat("wh"))) * getAsFloat("ws");
-				expectedSourceSize.setSize((int) (getDw() * scale),
-						(int) (getDh() * scale));
-			} else if (getAbsoluteScale() && hasOption("ascale")) {
-				// absolute scale -- apply scale to hires size
-				expectedSourceSize = getHiresSize().getScaled(getAsFloat("scale"));
-			} else {
-				// clip to fit -- source = destination size
-				expectedSourceSize.setSize((int) (getDw() * getAsFloat("ws")),
-						(int) (getDh() * getAsFloat("ws")));
-			}
-		}
-		return expectedSourceSize;
-	}
-	
-	public ImageSize getHiresSize() throws IOException {
-		logger.debug("get_hiresSize()");
-
-		ImageSize hiresSize = null;
-		ImageFileset fileset = getFileset();
-		if (getAbsoluteScale()) {
-			ImageFile hiresFile = fileset.getBiggest();
-			if (!hiresFile.isChecked()) {
-				DigilibConfiguration.docuImageIdentify(hiresFile);
-			}
-			hiresSize = hiresFile.getSize();
-		}
-		return hiresSize;
-	}
-	
-	/** Returns image scaling factor.
-	 * Uses image size and user parameters.
-	 * Modifies scaleXY, userImgArea. 
-	 * @return
-	 * @throws IOException
-	 * @throws ImageOpException
-	 */
-	public float getScaleXY() throws IOException, ImageOpException {
-		//logger.debug("get_scaleXY()");
-		if(scaleXY == null){
-			// coordinates and scaling
-			float areaWidth;
-			float areaHeight;
-			float ws = getAsFloat("ws");
-			ImageSize imgSize = getFileToLoad().getSize();
-			// user window area in [0,1] coordinates
-			Rectangle2D relUserArea = new Rectangle2D.Float(getAsFloat("wx"), getAsFloat("wy"),
-					getAsFloat("ww"), getAsFloat("wh"));
-			// transform from relative [0,1] to image coordinates.
-			AffineTransform imgTrafo = AffineTransform.getScaleInstance(imgSize
-					.getWidth(), imgSize.getHeight());
-			// transform user coordinate area to image coordinate area
-			userImgArea = imgTrafo.createTransformedShape(
-					relUserArea).getBounds2D();
-	
-			if (getScaleToFit()) {
-				// calculate scaling factors based on inner user area
-				areaWidth = (float) userImgArea.getWidth();
-				areaHeight = (float) userImgArea.getHeight();
-				float scaleX = getDw() / areaWidth * ws;
-				float scaleY = getDh() / areaHeight * ws;
-				scaleXY = (scaleX > scaleY) ? scaleY : scaleX;
-			} else if (getAbsoluteScale()) {
-				// absolute scaling factor
-				if (hasOption("osize")) {
-					// get original resolution from metadata
-					fileset.checkMeta();
-					float origResX = fileset.getResX();
-					float origResY = fileset.getResY();
-					if ((origResX == 0) || (origResY == 0)) {
-						throw new ImageOpException("Missing image DPI information!");
-					}
-					if ((getAsFloat("ddpix") == 0) || (getAsFloat("ddpiy") == 0)) {
-						throw new ImageOpException("Missing display DPI information!");
-					}
-					// calculate absolute scale factor
-					float sx = getAsFloat("ddpix") / origResX;
-					float sy = getAsFloat("ddpiy") / origResY;
-					// currently only same scale -- mean value
-					scaleXY = (sx + sy) / 2f;
-				} else {
-					scaleXY = getAsFloat("scale");
-				}
-				// we need to correct the factor if we use a pre-scaled image
-				ImageSize hiresSize = getHiresSize();
-				if (imgSize.getWidth() != hiresSize.getWidth()) {
-					scaleXY *= (float)hiresSize.getWidth() / (float)imgSize.getWidth();
-				}
-				areaWidth = getDw() / scaleXY * ws;
-				areaHeight = getDh() / scaleXY * ws;
-				// reset user area size
-				userImgArea.setRect(userImgArea.getX(), userImgArea.getY(),
-						areaWidth, areaHeight);
-			} else {
-				// crop to fit -- don't scale
-				areaWidth = getDw() * ws;
-				areaHeight = getDh() * ws;
-				// reset user area size
-				userImgArea.setRect(userImgArea.getX(), userImgArea.getY(),
-						areaWidth, areaHeight);
-				scaleXY = 1f;
-			}
-		}
-		return (float) scaleXY;
-	}
-	
-	public int getDw() throws IOException {
-		logger.debug("get_paramDW()");
-		if (paramDW == null) {
-
-			paramDW = getAsInt("dw");
-			paramDH = getAsInt("dh");
-
-			float imgAspect = getFileToLoad().getAspect();
-			if (paramDW == 0) {
-				// calculate dw
-				paramDW = Math.round(paramDH * imgAspect);
-				setValue("dw", paramDW);
-			} else if (paramDH == 0) {
-				// calculate dh
-				paramDH = Math.round(paramDW / imgAspect);
-				setValue("dh", paramDH);
-			}
-		}
-		return paramDW;
-	}
-	
-	public int getDh() throws IOException {
-		logger.debug("get_paramDH()");
-		if (paramDH == null) {
-			
-			paramDW = getAsInt("dw");
-			paramDH = getAsInt("dh");
-
-			float imgAspect = getFileToLoad().getAspect();
-			if (paramDW == 0) {
-				// calculate dw
-				paramDW = Math.round(paramDH * imgAspect);
-				setValue("dw", paramDW);
-			} else if (paramDH == 0) {
-				// calculate dh
-				paramDH = Math.round(paramDW / imgAspect);
-				setValue("dh", paramDH);
-			}
-		}
-		return paramDH;
-	}
-	
-	public Integer getScaleQual(){
-		logger.debug("get_scaleQual()");
-		Integer qual = dlConfig.getAsInt("default-quality");
-		if(hasOption("q0"))
-			qual = 0;
-		else if(hasOption("q1"))
-			qual = 1;
-		else if(hasOption("q2"))
-			qual = 2;
-		return qual;
-	}
-
-	
-	public Rectangle2D getUserImgArea() throws IOException, ImageOpException{
-		if(userImgArea == null) {
-			// getScaleXY sets userImgArea
-			getScaleXY();
-		}
-		return userImgArea;		
-		
-	}
-	
-	public Rectangle2D getOuterUserImgArea() throws IOException, ImageOpException {
-		if(outerUserImgArea == null){
-			outerUserImgArea = getUserImgArea();
-			
-			// image size in pixels
-			ImageSize imgSize = getFileToLoad().getSize();
-			Rectangle2D imgBounds = new Rectangle2D.Float(0, 0, imgSize.getWidth(), 
-					imgSize.getHeight());
-			
-			// clip area at the image border
-			outerUserImgArea = outerUserImgArea.createIntersection(imgBounds);
-	
-			// check image parameters sanity
-			scaleXY = getScaleXY();
-			logger.debug("outerUserImgArea.getWidth()=" + outerUserImgArea.getWidth());
-			logger.debug("get_scaleXY() * outerUserImgArea.getWidth() = " + (scaleXY * outerUserImgArea.getWidth()));
-			
-			if ((outerUserImgArea.getWidth() < 1)
-					|| (outerUserImgArea.getHeight() < 1)
-					|| (scaleXY * outerUserImgArea.getWidth() < 2)
-					|| (scaleXY * outerUserImgArea.getHeight() < 2)) {
-				logger.error("ERROR: invalid scale parameter set!");
-				throw new ImageOpException("Invalid scale parameter set!");
-			}
-		}
-		return outerUserImgArea;
-	}
-	
-	
-	public float[] getRGBM(){
-		float[] paramRGBM = null;//{0f,0f,0f};
-		Parameter p = params.get("rgbm");
-		if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
-			return p.parseAsFloatArray("/");
-		}	
-		return paramRGBM;
-	}
-	
-	public float[] getRGBA(){
-		float[] paramRGBA =  null;//{0f,0f,0f};
-		Parameter p = params.get("rgba");
-		if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
-			paramRGBA = p.parseAsFloatArray("/");
-		}
-		return paramRGBA;
-	}
-	
-	/** Has send-as-file been requested?
-	 * @return
-	 */
-	public boolean getSendAsFile(){
-		return hasOption("file")
-		|| hasOption("rawfile");
-	}
-	
-	/** Could the image be sent without processing?
-	 * Takes image type and additional image operations into account. 
-	 * Does not check requested size transformation.
-	 * @return
-	 * @throws IOException 
-	 */
-	public boolean isImageSendable() throws IOException {
-		// cached result?
-		if (imageSendable == null) {
-			String mimeType = getMimeType();
-			imageSendable = ( (mimeType.equals("image/jpeg")
-				        	|| mimeType.equals("image/png")
-				        	|| mimeType.equals("image/gif") )
-				        	&& 
-				        	!(hasOption("hmir")
-							|| hasOption("vmir") 
-							|| (getAsFloat("rot") != 0.0)
-							|| (getRGBM() != null) 
-							|| (getRGBA() != null)
-							|| (getAsFloat("cont") != 0.0) 
-							|| (getAsFloat("brgt") != 0.0)));
-		}
-		
-		return imageSendable;
-	}
-	
-	
-	public boolean isTransformRequired() throws IOException {
-		ImageSize is = getFileToLoad().getSize();
-		ImageSize ess = getExpectedSourceSize();
-		// nt = no transform required
-		boolean nt = isImageSendable() && (
-			// lores: send if smaller
-			(getLoresOnly() && is.isSmallerThan(ess))
-			// else send if it fits
-			|| (!(getLoresOnly() || getHiresOnly()) && is.fitsIn(ess)));
-		return ! nt;
-	}
-}
\ No newline at end of file
--- a/servlet/src/digilib/image/ImageLoaderDocuImage.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,532 +0,0 @@
-/* ImageLoaderDocuImage -- Image class implementation using JDK 1.4 ImageLoader
-
- Digital Image Library servlet components
-
- Copyright (C) 2002, 2003 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package digilib.image;
-
-import java.awt.Image;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.awt.image.ConvolveOp;
-import java.awt.image.Kernel;
-import java.awt.image.RescaleOp;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.FileImageInputStream;
-import javax.imageio.stream.ImageInputStream;
-import javax.imageio.stream.ImageOutputStream;
-import javax.servlet.ServletException;
-
-import digilib.io.FileOpException;
-import digilib.io.FileOps;
-import digilib.io.ImageFile;
-import digilib.io.ImageFileset;
-
-/** Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. */
-public class ImageLoaderDocuImage extends ImageInfoDocuImage {
-
-	/** image object */
-	protected BufferedImage img;
-	
-	/** interpolation type */
-	protected RenderingHints renderHint;
-
-	/** ImageIO image reader */
-	protected ImageReader reader;
-
-	/** File that was read */
-	protected File imgFile;
-
-	/* loadSubimage is supported. */
-	public boolean isSubimageSupported() {
-		return true;
-	}
-
-	public void setQuality(int qual) {
-		quality = qual;
-		renderHint = new RenderingHints(null);
-		// hint.put(RenderingHints.KEY_ANTIALIASING,
-		// RenderingHints.VALUE_ANTIALIAS_OFF);
-		// setup interpolation quality
-		if (qual > 0) {
-			logger.debug("quality q1");
-			renderHint.put(RenderingHints.KEY_INTERPOLATION,
-					RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-		} else {
-			logger.debug("quality q0");
-			renderHint.put(RenderingHints.KEY_INTERPOLATION,
-					RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
-		}
-	}
-
-    /* returns the size of the current image */
-    public ImageSize getSize() {
-        ImageSize is = null;
-        // TODO: do we want to cache imageSize?
-        int h = 0;
-        int w = 0;
-        try {
-            if (img == null) {
-                // get size from ImageReader
-                h = reader.getHeight(0);
-                w = reader.getWidth(0);
-            } else {
-                // get size from image
-                h = img.getHeight();
-                w = img.getWidth();
-            }
-            is = new ImageSize(w, h);
-        } catch (IOException e) {
-            logger.debug("error in getSize:", e);
-        }
-        return is;
-    }
-
-	/* returns a list of supported image formats */
-	public Iterator<String> getSupportedFormats() {
-		String[] formats = ImageIO.getReaderFormatNames();
-		return Arrays.asList(formats).iterator();
-	}
-
-    /** Check image size and type and store in ImageFile f */
-    public ImageFile identify(ImageFile imageFile) throws IOException {
-        // try parent method first
-        ImageFile imf = super.identify(imageFile);
-        if (imf != null) {
-            return imf;
-        }
-        // fileset to store the information
-        ImageFileset imgfs = imageFile.getParent();
-        File f = imageFile.getFile();
-        if (f == null) {
-            throw new IOException("File not found!");
-        }
-        logger.debug("identifying (ImageIO) " + f);
-        /*
-         * try ImageReader
-         */
-        if ((reader == null) || (imgFile != imageFile.getFile())) {
-            getReader(imageFile);
-        }
-        ImageSize d = new ImageSize(reader.getWidth(0), reader.getHeight(0));
-        imageFile.setSize(d);
-        // String t = reader.getFormatName();
-        String t = FileOps.mimeForFile(f);
-        imageFile.setMimetype(t);
-        // logger.debug("  format:"+t);
-        if (imgfs != null) {
-            imgfs.setAspect(d);
-        }
-        return imageFile;
-    }
-    
-    /* load image file */
-	public void loadImage(ImageFile f) throws FileOpException {
-		logger.debug("loadImage " + f.getFile());
-		try {
-			img = ImageIO.read(f.getFile());
-            mimeType = f.getMimetype();
-		} catch (IOException e) {
-			throw new FileOpException("Error reading image.");
-		}
-	}
-
-	/**
-	 * Get an ImageReader for the image file.
-	 * 
-	 * @return
-	 */
-	public ImageReader getReader(ImageFile f) throws IOException {
-		logger.debug("preloadImage " + f.getFile());
-		if (reader != null) {
-			logger.debug("Reader was not null!");
-			// clean up old reader
-			dispose();
-		}
-		RandomAccessFile rf = new RandomAccessFile(f.getFile(), "r");
-		ImageInputStream istream = new FileImageInputStream(rf);
-		Iterator<ImageReader> readers;
-		String mt = f.getMimetype();
-		if (mt == null) {
-			logger.debug("No mime-type. Trying automagic.");
-			readers = ImageIO.getImageReaders(istream);
-		} else {
-			logger.debug("File type:" + mt);
-			readers = ImageIO.getImageReadersByMIMEType(mt);
-		}
-		if (!readers.hasNext()) {
-		    rf.close();
-			throw new FileOpException("Can't find Reader to load File!");
-		}
-		reader = readers.next();
-		/* are there more readers? */
-		logger.debug("ImageIO: this reader: " + reader.getClass());
-		/* while (readers.hasNext()) {
-			logger.debug("ImageIO: next reader: " + readers.next().getClass());
-		} */
-		reader.setInput(istream);
-		imgFile = f.getFile();
-		return reader;
-	}
-
-	/* Load an image file into the Object. */
-	public void loadSubimage(ImageFile f, Rectangle region, int prescale)
-			throws FileOpException {
-		logger.debug("loadSubimage");
-		try {
-			if ((reader == null) || (imgFile != f.getFile())) {
-				getReader(f);
-			}
-			// set up reader parameters
-			ImageReadParam readParam = reader.getDefaultReadParam();
-			readParam.setSourceRegion(region);
-			if (prescale > 1) {
-				readParam.setSourceSubsampling(prescale, prescale, 0, 0);
-			}
-			// read image
-			logger.debug("loading..");
-			img = reader.read(0, readParam);
-			mimeType = f.getMimetype();
-			logger.debug("loaded");
-		} catch (IOException e) {
-			throw new FileOpException("Unable to load File!");
-		}
-	}
-
-	/* write image of type mt to Stream */
-	public void writeImage(String mt, OutputStream ostream)
-			throws ImageOpException, ServletException {
-		logger.debug("writeImage");
-		// setup output
-		ImageWriter writer = null;
-		ImageOutputStream imgout = null;
-		try {
-			imgout = ImageIO.createImageOutputStream(ostream);
-			if (mt == "image/jpeg") {
-				/*
-				 * JPEG doesn't do transparency so we have to convert any RGBA
-				 * image to RGB :-( *Java2D BUG*
-				 */
-				if (img.getColorModel().hasAlpha()) {
-					logger.debug("BARF: JPEG with transparency!!");
-					int w = img.getWidth();
-					int h = img.getHeight();
-					// BufferedImage.TYPE_INT_RGB seems to be fastest (JDK1.4.1,
-					// OSX)
-					int destType = BufferedImage.TYPE_INT_RGB;
-					BufferedImage img2 = new BufferedImage(w, h, destType);
-					img2.createGraphics().drawImage(img, null, 0, 0);
-					img = img2;
-				}
-				writer = (ImageWriter) ImageIO.getImageWritersByFormatName(
-						"jpeg").next();
-				if (writer == null) {
-					throw new ImageOpException("Unable to get JPEG writer");
-				}
-				ImageWriteParam param = writer.getDefaultWriteParam();
-				if (quality > 1) {
-					// change JPEG compression quality
-					param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
-					//logger.debug("JPEG qual before: "
-					//		+ Float.toString(param.getCompressionQuality()));
-					param.setCompressionQuality(0.9f);
-					//logger.debug("JPEG qual now: "
-					//		+ Float.toString(param.getCompressionQuality()));
-				}
-				writer.setOutput(imgout);
-				// render output
-				logger.debug("writing");
-				writer.write(null, new IIOImage(img, null, null), param);
-			} else if (mt == "image/png") {
-				// render output
-				writer = (ImageWriter) ImageIO.getImageWritersByFormatName(
-						"png").next();
-				if (writer == null) {
-					throw new ImageOpException("Unable to get PNG writer");
-				}
-				writer.setOutput(imgout);
-				logger.debug("writing");
-				writer.write(img);
-			} else {
-				// unknown mime type
-				throw new ImageOpException("Unknown mime type: " + mt);
-			}
-
-		} catch (IOException e) {
-		    logger.error("Error writing image:", e);
-			throw new ServletException("Error writing image:", e);
-		} finally {
-			// clean up
-			if (writer != null) {
-				writer.dispose();
-			}
-		}
-	}
-
-	public void scale(double scale, double scaleY) throws ImageOpException {
-		logger.debug("scale");
-		/* for downscaling in high quality the image is blurred first */
-		if ((scale <= 0.5) && (quality > 1)) {
-			int bl = (int) Math.floor(1 / scale);
-			blur(bl);
-		}
-		/* then scaled */
-		AffineTransformOp scaleOp = new AffineTransformOp(AffineTransform
-				.getScaleInstance(scale, scale), renderHint);
-		BufferedImage scaledImg = null;
-		/* enforce destination image type (*Java2D BUG*)
-		int type = img.getType();
-		if ((quality > 0) && (type != 0)) {
-			logger.debug("creating destination image");
-			Rectangle2D dstBounds = scaleOp.getBounds2D(img);
-			scaledImg = new BufferedImage((int) dstBounds.getWidth(),
-					(int) dstBounds.getHeight(), type);
-		} */
-		logger.debug("scaling...");
-		scaledImg = scaleOp.filter(img, scaledImg);
-		if (scaledImg == null) {
-			throw new ImageOpException("Unable to scale");
-		}
-		// DEBUG
-		logger.debug("destination image type " + scaledImg.getType());
-		logger.debug("SCALE: " + scale + " ->" + scaledImg.getWidth() + "x"
-				+ scaledImg.getHeight());
-		img = scaledImg;
-	}
-
-	public void blur(int radius) throws ImageOpException {
-		// DEBUG
-		logger.debug("blur: " + radius);
-		// minimum radius is 2
-		int klen = Math.max(radius, 2);
-		// FIXME: use constant kernels for most common sizes
-		int ksize = klen * klen;
-		// kernel is constant 1/k
-		float f = 1f / ksize;
-		float[] kern = new float[ksize];
-		for (int i = 0; i < ksize; i++) {
-			kern[i] = f;
-		}
-		Kernel blur = new Kernel(klen, klen, kern);
-		// blur with convolve operation
-		ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP,
-				renderHint);
-		BufferedImage blurredImg = null;
-		// blur needs explicit destination image type for color *Java2D BUG*
-		if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) {
-			logger.debug("blur: fixing destination image type");
-			blurredImg = new BufferedImage(img.getWidth(), img.getHeight(), img
-					.getType());
-		}
-		blurredImg = blurOp.filter(img, blurredImg);
-		img = blurredImg;
-	}
-
-	public void crop(int x_off, int y_off, int width, int height)
-			throws ImageOpException {
-		// setup Crop
-		BufferedImage croppedImg = img.getSubimage(x_off, y_off, width, height);
-		if (croppedImg == null) {
-			throw new ImageOpException("Unable to crop");
-		}
-		logger.debug("CROP:" + croppedImg.getWidth() + "x"
-				+ croppedImg.getHeight());
-		img = croppedImg;
-	}
-
-	public void enhance(float mult, float add) throws ImageOpException {
-		/*
-		 * Only one constant should work regardless of the number of bands
-		 * according to the JDK spec. Doesn't work on JDK 1.4 for OSX and Linux
-		 * (at least). RescaleOp scaleOp = new RescaleOp( (float)mult,
-		 * (float)add, null); scaleOp.filter(img, img);
-		 */
-
-		/* The number of constants must match the number of bands in the image. */
-		int ncol = img.getColorModel().getNumComponents();
-		float[] dm = new float[ncol];
-		float[] da = new float[ncol];
-		for (int i = 0; i < ncol; i++) {
-			dm[i] = (float) mult;
-			da[i] = (float) add;
-		}
-		RescaleOp scaleOp = new RescaleOp(dm, da, null);
-		scaleOp.filter(img, img);
-	}
-
-	public void enhanceRGB(float[] rgbm, float[] rgba) throws ImageOpException {
-		/*
-		 * The number of constants must match the number of bands in the image.
-		 * We do only 3 (RGB) bands.
-		 */
-		int ncol = img.getColorModel().getNumColorComponents();
-		if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) {
-			logger
-					.debug("ERROR(enhance): unknown number of color bands or coefficients ("
-							+ ncol + ")");
-			return;
-		}
-		RescaleOp scaleOp = new RescaleOp(rgbOrdered(rgbm), rgbOrdered(rgba),
-				null);
-		scaleOp.filter(img, img);
-	}
-
-	/**
-	 * Ensures that the array f is in the right order to map the images RGB
-	 * components. (not shure what happens
-	 */
-	public float[] rgbOrdered(float[] fa) {
-		/*
-		 * TODO: this is UGLY, UGLY!!
-		 */
-		float[] fb;
-		int t = img.getType();
-		if (img.getColorModel().hasAlpha()) {
-			fb = new float[4];
-			if ((t == BufferedImage.TYPE_INT_ARGB)
-					|| (t == BufferedImage.TYPE_INT_ARGB_PRE)) {
-				// RGB Type
-				fb[0] = fa[0];
-				fb[1] = fa[1];
-				fb[2] = fa[2];
-				fb[3] = 1f;
-			} else {
-				// this isn't tested :-(
-				fb[0] = 1f;
-				fb[1] = fa[0];
-				fb[2] = fa[1];
-				fb[3] = fa[2];
-			}
-		} else {
-			fb = new float[3];
-			if (t == BufferedImage.TYPE_3BYTE_BGR) {
-				// BGR Type (actually it looks like RBG...)
-				fb[0] = fa[0];
-				fb[1] = fa[2];
-				fb[2] = fa[1];
-			} else {
-				fb[0] = fa[0];
-				fb[1] = fa[1];
-				fb[2] = fa[2];
-			}
-		}
-		return fb;
-	}
-
-	public void rotate(double angle) throws ImageOpException {
-		// setup rotation
-		double rangle = Math.toRadians(angle);
-		// create offset to make shure the rotated image has no negative
-		// coordinates
-		double w = img.getWidth();
-		double h = img.getHeight();
-		AffineTransform trafo = new AffineTransform();
-		// center of rotation
-		double x = (w / 2);
-		double y = (h / 2);
-		trafo.rotate(rangle, x, y);
-		// try rotation to see how far we're out of bounds
-		AffineTransformOp rotOp = new AffineTransformOp(trafo, renderHint);
-		Rectangle2D rotbounds = rotOp.getBounds2D(img);
-		double xoff = rotbounds.getX();
-		double yoff = rotbounds.getY();
-		// move image back in line
-		trafo.preConcatenate(AffineTransform.getTranslateInstance(-xoff, -yoff));
-		// transform image
-		rotOp = new AffineTransformOp(trafo, renderHint);
-		BufferedImage rotImg = rotOp.filter(img, null);
-		// calculate new bounding box
-		// Rectangle2D bounds = rotOp.getBounds2D(img);
-		img = rotImg;
-		// crop new image (with self-made rounding)
-		/*
-		 * img = rotImg.getSubimage( (int) (bounds.getX()+0.5), (int)
-		 * (bounds.getY()+0.5), (int) (bounds.getWidth()+0.5), (int)
-		 * (bounds.getHeight()+0.5));
-		 */
-	}
-
-	public void mirror(double angle) throws ImageOpException {
-		// setup mirror
-		double mx = 1;
-		double my = 1;
-		double tx = 0;
-		double ty = 0;
-		if (Math.abs(angle - 0) < epsilon) { // 0 degree
-			mx = -1;
-			tx = getWidth();
-		} else if (Math.abs(angle - 90) < epsilon) { // 90 degree
-			my = -1;
-			ty = getHeight();
-		} else if (Math.abs(angle - 180) < epsilon) { // 180 degree
-			mx = -1;
-			tx = getWidth();
-		} else if (Math.abs(angle - 270) < epsilon) { // 270 degree
-			my = -1;
-			ty = getHeight();
-		} else if (Math.abs(angle - 360) < epsilon) { // 360 degree
-			mx = -1;
-			tx = getWidth();
-		}
-		AffineTransformOp mirOp = new AffineTransformOp(new AffineTransform(mx,
-				0, 0, my, tx, ty), renderHint);
-		BufferedImage mirImg = mirOp.filter(img, null);
-		img = mirImg;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#finalize()
-	 */
-	protected void finalize() throws Throwable {
-		dispose();
-		super.finalize();
-	}
-
-	public void dispose() {
-		// we must dispose the ImageReader because it keeps the filehandle
-		// open!
-		if (reader != null) {
-			reader.dispose();
-			reader = null;
-		}
-		img = null;
-	}
-
-	public Image getAwtImage(){
-		return (Image) img;
-	}
-	
-	
-}
--- a/servlet/src/digilib/image/ImageOpException.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/* ImageOpException -- Exception class for image operations
-
- Digital Image Library servlet components
-
- Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- */
-
-package digilib.image;
-
-public class ImageOpException extends Exception {
-
-	private static final long serialVersionUID = -8662921779682407942L;
-
-	public ImageOpException() {
-	}
-
-	public ImageOpException(String s) {
-		super(s);
-	}
-}
--- a/servlet/src/digilib/image/ImageSize.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/*
- * ImageSize.java -- digilib image size class. 
- * Digital Image Library servlet components 
- * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de) 
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version. Please read license.txt for the full details. A copy of the GPL may
- * be found at http://www.gnu.org/copyleft/lgpl.html You should have received a
- * copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA Created on 26.08.2003
- */
-
-package digilib.image;
-
-/** Class for image size (width, height).
- * 
- * A width or height of 0 is treated as a 'wildcard' that matches any size.
- * 
- * @author casties
- *          
- */
-public class ImageSize {
-	public int width;
-	public int height;
-
-	public ImageSize() {
-		super();
-	}
-
-	public ImageSize(int width, int height) {
-		this.width = width;
-		this.height = height;
-	}
-
-	public ImageSize(ImageSize i) {
-		this.width = i.width;
-		this.height = i.height;
-	}
-
-	public void setSize(int width, int height) {
-		this.width = width;
-		this.height = height;
-	}
-
-	/**
-	 * Returns if the size of this image is smaller in every dimension than the
-	 * other image.
-	 * 
-	 * 
-	 * 
-	 * @param is
-	 * @return
-	 */
-	public boolean isTotallySmallerThan(ImageSize is) {
-		if ((this.width == 0)||(is.width == 0)) {
-			// width wildcard
-			return (this.height <= is.height);
-		}
-		if ((this.height == 0)||(is.height == 0)) {
-			// height wildcard
-			return (this.width <= is.width);
-		}
-		return ((this.width <= is.width)&&(this.height <= is.height));
-	}
-
-	/**
-	 * Returns if the size of this image is smaller in at least one dimension
-	 * than the other image.
-	 * 
-	 * @param is
-	 * @return
-	 */
-	public boolean isSmallerThan(ImageSize is) {
-		if ((this.width == 0)||(is.width == 0)) {
-			// width wildcard
-			return (this.height <= is.height);
-		}
-		if ((this.height == 0)||(is.height == 0)) {
-			// height wildcard
-			return (this.width <= is.width);
-		}
-		return ((this.width <= is.width) || (this.height <= is.height));
-	}
-
-	/**
-	 * Returns if the size of this image is bigger in every dimension than the
-	 * other image.
-	 * 
-	 * 
-	 * 
-	 * @param is
-	 * @return
-	 */
-	public boolean isTotallyBiggerThan(ImageSize is) {
-		if ((this.width == 0)||(is.width == 0)) {
-			// width wildcard
-			return (this.height >= is.height);
-		}
-		if ((this.height == 0)||(is.height == 0)) {
-			// height wildcard
-			return (this.width >= is.width);
-		}
-		return ((this.width >= is.width) && (this.height >= is.height));
-	}
-
-	/**
-	 * Returns if the size of this image is bigger in at least one dimension
-	 * than the other image.
-	 * 
-	 * 
-	 * 
-	 * @param is
-	 * @return
-	 */
-	public boolean isBiggerThan(ImageSize is) {
-		if ((this.width == 0)||(is.width == 0)) {
-			// width wildcard
-			return (this.height >= is.height);
-		}
-		if ((this.height == 0)||(is.height == 0)) {
-			// height wildcard
-			return (this.width >= is.width);
-		}
-		return ((this.width >= is.width) || (this.height >= is.height));
-	}
-
-	/**
-	 * Returns if this image has the same size or height as the other image.
-	 * 
-	 * 
-	 * 
-	 * @param is
-	 * @return
-	 */
-	public boolean fitsIn(ImageSize is) {
-		if ((this.width == 0)||(is.width == 0)) {
-			// width wildcard
-			return (this.height == is.height);
-		}
-		if ((this.height == 0)||(is.height == 0)) {
-			// height wildcard
-			return (this.width == is.width);
-		}
-		return (
-			(this.width == is.width)
-				&& (this.height <= is.height)
-				|| (this.width <= is.width)
-				&& (this.height == is.height));
-	}
-
-	/**
-	 * Returns if the size of this image is the same as the other image.
-	 * 
-	 * 
-	 * 
-	 * @param is
-	 * @return
-	 */
-	public boolean equals(ImageSize is) {
-		if ((this.width == 0)||(is.width == 0)) {
-			// width wildcard
-			return (this.height == is.height);
-		}
-		if ((this.height == 0)||(is.height == 0)) {
-			// height wildcard
-			return (this.width == is.width);
-		}
-		return ((this.width == is.width) && (this.height == is.height));
-	}
-
-	/**
-	 * @return
-	 */
-	public int getHeight() {
-		return height;
-	}
-
-	/**
-	 * @param height
-	 */
-	public void setHeight(int height) {
-		this.height = height;
-	}
-
-	/**
-	 * @return
-	 */
-	public int getWidth() {
-		return width;
-	}
-
-	/**
-	 * @param width
-	 */
-	public void setWidth(int width) {
-		this.width = width;
-	}
-
-	/**
-	 * Returns the aspect ratio.
-	 * 
-	 * Aspect ratio is (width/height). So it's <1 for portrait and  >1 for
-	 * landscape.
-	 * 
-	 * @return
-	 */
-	public float getAspect() {
-		return (height > 0) ? ((float) width / (float) height) : 0;
-	}
-	
-	/**
-	 * Returns a scaled copy of this image size. 
-	 * 
-	 * @param scale
-	 * @return
-	 */
-	public ImageSize getScaled(float scale) {
-		return new ImageSize((int) (width * scale), (int) (height * scale));
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		String s = "[" + width + "x" + height + "]";
-		return s;
-	}
-}
--- a/servlet/src/digilib/image/ImageWorker.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/** Worker (Callable) that renders an image.
- * 
- */
-package digilib.image;
-
-import java.awt.Rectangle;
-import java.io.IOException;
-import java.util.concurrent.Callable;
-
-import org.apache.log4j.Logger;
-
-import digilib.io.FileOpException;
-import digilib.servlet.DigilibConfiguration;
-
-/** Worker that renders an image.
- * 
- * @author casties
- *
- */
-public class ImageWorker implements Callable<DocuImage> {
-
-    
-    protected static Logger logger = Logger.getLogger(ImageWorker.class);
-    private DigilibConfiguration dlConfig;
-    private ImageJobDescription jobinfo;
-
-    public ImageWorker(DigilibConfiguration dlConfig, ImageJobDescription jobinfo) {
-        super();
-        this.dlConfig = dlConfig;
-        this.jobinfo = jobinfo;
-    }
-
-    /**
-     * render and return the image
-     */
-    public DocuImage call() throws FileOpException, IOException, ImageOpException {
-        
-        logger.debug("image worker starting");
-        long startTime = System.currentTimeMillis();
-
-        /* crop and scale image */
-
-        // new DocuImage instance
-        DocuImage docuImage = DigilibConfiguration.getDocuImageInstance();
-        if (docuImage == null) {
-            throw new ImageOpException("Unable to load DocuImage class!");
-        }
-
-        // set interpolation quality
-        docuImage.setQuality(jobinfo.getScaleQual());
-
-        Rectangle loadRect = jobinfo.getOuterUserImgArea().getBounds();
-        float scaleXY = jobinfo.getScaleXY();
-        
-        // use subimage loading if possible
-        if (docuImage.isSubimageSupported()) {
-            logger.debug("Subimage: scale " + scaleXY + " = " + (1 / scaleXY));
-            float subf = 1f;
-            float subsamp = 1f;
-            if (scaleXY < 1) {
-                subf = 1 / scaleXY;
-                // for higher quality reduce subsample factor by minSubsample
-                if (jobinfo.getScaleQual() > 0) {
-                    subsamp = (float) Math.max(Math.floor(subf / dlConfig.getAsFloat("subsample-minimum")), 1d);
-                } else {
-                    subsamp = (float) Math.floor(subf);
-                }
-                scaleXY = subsamp / subf;
-                logger.debug("Using subsampling: " + subsamp + " rest "
-                        + scaleXY);
-            }
-
-            docuImage.loadSubimage(jobinfo.getFileToLoad(), loadRect, (int) subsamp);
-
-            logger.debug("SUBSAMP: " + subsamp + " -> " + docuImage.getSize());
-
-            docuImage.scale(scaleXY, scaleXY);
-
-        } else {
-            // else load and crop the whole file
-            docuImage.loadImage(jobinfo.getFileToLoad());
-            docuImage.crop((int) loadRect.getX(), (int) loadRect.getY(),
-                    (int) loadRect.getWidth(), (int) loadRect.getHeight());
-
-            docuImage.scale(scaleXY, scaleXY);
-        }
-
-        // mirror image
-        // operation mode: "hmir": mirror horizontally, "vmir": mirror
-        // vertically
-        if (jobinfo.hasOption("hmir")) {
-            docuImage.mirror(0);
-        }
-        if (jobinfo.hasOption("vmir")) {
-            docuImage.mirror(90);
-        }
-
-        // rotate image
-        if (jobinfo.getAsFloat("rot") != 0d) {
-            docuImage.rotate(jobinfo.getAsFloat("rot"));
-            /* if (jobinfo.get_wholeRotArea()) {
-                // crop to the inner bounding box
-                float xcrop = (float) (docuImage.getWidth() - jobinfo.get_innerUserImgArea().getWidth()
-                        * scaleXY);
-                float ycrop = (float) (docuImage.getHeight() - jobinfo.get_innerUserImgArea().getHeight()
-                        * scaleXY);
-                if ((xcrop > 0) || (ycrop > 0)) {
-                    // only crop smaller
-                    xcrop = (xcrop > 0) ? xcrop : 0;
-                    ycrop = (ycrop > 0) ? ycrop : 0;
-                    // crop image
-                    docuImage.crop((int) (xcrop / 2), (int) (ycrop / 2),
-                            (int) (docuImage.getWidth() - xcrop),
-                            (int) (docuImage.getHeight() - ycrop));
-                }
-            } */
-
-        }
-
-        // color modification
-        float[] paramRGBM = jobinfo.getRGBM();
-        float[] paramRGBA = jobinfo.getRGBA();
-        if ((paramRGBM != null) || (paramRGBA != null)) {
-            // make sure we actually have two arrays
-            if (paramRGBM == null) {
-                paramRGBM = new float[3];
-            }
-            if (paramRGBA == null) {
-                paramRGBA = new float[3];
-            }
-            // calculate "contrast" values (c=2^x)
-            float[] mult = new float[3];
-            for (int i = 0; i < 3; i++) {
-                mult[i] = (float) Math.pow(2, (float) paramRGBM[i]);
-            }
-            docuImage.enhanceRGB(mult, paramRGBA);
-        }
-
-        // contrast and brightness enhancement
-        float paramCONT = jobinfo.getAsFloat("cont");
-        float paramBRGT = jobinfo.getAsFloat("brgt");
-        if ((paramCONT != 0f) || (paramBRGT != 0f)) {
-            float mult = (float) Math.pow(2, paramCONT);
-            docuImage.enhance(mult, paramBRGT);
-        }
-
-        logger.debug("rendered in " + (System.currentTimeMillis() - startTime) + "ms");
-
-        return docuImage;
-    }
-
-}
--- a/servlet/src/digilib/image/JAIDocuImage.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,473 +0,0 @@
-/* JAIDocuImage -- Image class implementation using JAI (Java Advanced Imaging)
-
- Digital Image Library servlet components
-
- Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- */
-
-package digilib.image;
-
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.ParameterBlock;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.media.jai.BorderExtender;
-import javax.media.jai.Interpolation;
-import javax.media.jai.JAI;
-import javax.media.jai.KernelJAI;
-import javax.media.jai.ParameterBlockJAI;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.operator.TransposeDescriptor;
-import javax.media.jai.operator.TransposeType;
-import javax.servlet.ServletException;
-
-import com.sun.media.jai.codec.ImageCodec;
-
-import digilib.io.FileOpException;
-import digilib.io.FileOps;
-import digilib.io.ImageFile;
-import digilib.io.ImageFileset;
-
-/** A DocuImage implementation using Java Advanced Imaging Library. */
-/**
- * @author casties
- *
- */
-public class JAIDocuImage extends ImageInfoDocuImage {
-
-	protected RenderedImage img;
-
-	protected Interpolation interpol = null;
-
-	/*
-	 * static { // we could set our own tile cache size here TileCache tc =
-	 * JAI.createTileCache(100*1024*1024);
-	 * JAI.getDefaultInstance().setTileCache(tc); }
-	 */
-
-	public boolean isSubimageSupported() {
-		return true;
-	}
-
-	/*
-	 * Real setQuality implementation. Creates the correct Interpolation.
-	 */
-	public void setQuality(int qual) {
-		quality = qual;
-		// setup interpolation quality
-		if (qual > 1) {
-			logger.debug("quality q2");
-			interpol = Interpolation.getInstance(Interpolation.INTERP_BICUBIC);
-		} else if (qual == 1) {
-			logger.debug("quality q1");
-			interpol = Interpolation.getInstance(Interpolation.INTERP_BILINEAR);
-		} else {
-			logger.debug("quality q0");
-			interpol = Interpolation.getInstance(Interpolation.INTERP_NEAREST);
-		}
-	}
-
-	/* returns a list of supported image formats */
-    @SuppressWarnings("unchecked") // ImageCodec.getCodecs() returns a naked Enumeration
-    public Iterator<String> getSupportedFormats() {
-        Enumeration<ImageCodec> codecs = ImageCodec.getCodecs();
-        List<String> formats = new ArrayList<String>();
-        for (ImageCodec codec = codecs.nextElement(); codecs.hasMoreElements(); codec = codecs
-                .nextElement()) {
-            logger.debug("known format:"+codec.getFormatName());
-            formats.add(codec.getFormatName());
-        }
-        logger.debug("tilecachesize:"
-                + JAI.getDefaultInstance().getTileCache().getMemoryCapacity());
-        return formats.iterator();
-    }
-
-	/* Check image size and type and store in ImageFile f */
-	public ImageFile identify(ImageFile imageFile) throws IOException {
-        // try parent method first
-	    ImageFile imf = super.identify(imageFile);
-		if (imf != null) {
-			return imf;
-		}
-		// fileset to store the information
-		ImageFileset imgfs = imageFile.getParent();
-		File f = imageFile.getFile();
-		if (f == null) {
-			throw new IOException("File not found!");
-		}
-		/*
-		 * try JAI
-		 */
-		logger.debug("identifying (JAI) " + f);
-		try {
-			RenderedOp img = JAI.create("fileload", f.getAbsolutePath());
-			ImageSize d = new ImageSize(img.getWidth(), img.getHeight());
-			imageFile.setSize(d);
-			String t = FileOps.mimeForFile(f);
-			imageFile.setMimetype(t);
-			// logger.debug(" format:"+t);
-			if (imgfs != null) {
-				imgfs.setAspect(d);
-			}
-			logger.debug("image size: " + imageFile.getSize());
-			return imageFile;
-		} catch (Exception e) {
-			throw new FileOpException("ERROR: unknown image file format!");
-		}
-	}
-
-	/* Load an image file into the Object. */
-	public void loadImage(ImageFile f) throws FileOpException {
-		img = JAI.create("fileload", f.getFile().getAbsolutePath());
-		if (img == null) {
-			throw new FileOpException("Unable to load File!");
-		}
-        mimeType = f.getMimetype();
-	}
-
-	/* Load an image file into the Object. */
-	public void loadSubimage(ImageFile f, Rectangle region, int subsample)
-			throws FileOpException {
-		logger.debug("loadSubimage");
-		img = JAI.create("fileload", f.getFile().getAbsolutePath());
-		if ((region.width < img.getWidth())
-				|| (region.height < img.getHeight())) {
-			// setup Crop
-			ParameterBlock cp = new ParameterBlock();
-			cp.addSource(img);
-			cp.add((float) region.x);
-			cp.add((float) region.y);
-			cp.add((float) region.width);
-			cp.add((float) region.height);
-			logger.debug("loadSubimage: crop");
-			img = JAI.create("crop", cp);
-		}
-		if (subsample > 1) {
-			float sc = 1f / subsample;
-			ParameterBlockJAI sp = new ParameterBlockJAI("scale");
-			sp.addSource(img);
-			sp.setParameter("xScale", sc);
-			sp.setParameter("yScale", sc);
-			sp.setParameter("interpolation", Interpolation
-					.getInstance(Interpolation.INTERP_NEAREST));
-			// scale
-			logger.debug("loadSubimage: scale");
-			img = JAI.create("scale", sp);
-            mimeType = f.getMimetype();
-		}
-	}
-
-	/* Write the current image to an OutputStream. */
-	public void writeImage(String mt, OutputStream ostream) throws ServletException, ImageOpException {
-		try {
-			// setup output
-			ParameterBlock pb3 = new ParameterBlock();
-			pb3.addSource(img);
-			pb3.add(ostream);
-			if (mt == "image/jpeg") {
-				pb3.add("JPEG");
-			} else if (mt == "image/png") {
-				pb3.add("PNG");
-			} else {
-				// unknown mime type
-				throw new ImageOpException("Unknown mime type: " + mt);
-			}
-			// render output
-			JAI.create("encode", pb3);
-
-		} catch (RuntimeException e) {
-		    // JAI likes to throw RuntimeExceptions
-			throw new ServletException("Error writing image:", e);
-		}
-	}
-
-    /* returns the current image size
-     * @see digilib.image.DocuImageImpl#getSize()
-     */
-    public ImageSize getSize() {
-        ImageSize is = null;
-        // TODO: do we want to cache imgSize?
-        int h = 0;
-        int w = 0;
-        if (img != null) {
-            // get size from image
-            h = img.getHeight();
-            w = img.getWidth();
-            is = new ImageSize(w, h);
-        }
-        return is;
-    }
-
-	/* scales the current image */
-	public void scale(double scale, double scaleY) throws ImageOpException {
-		logger.debug("scale");
-		if ((scale < 1) && (img.getColorModel().getPixelSize() == 1)
-				&& (quality > 0)) {
-			/*
-			 * "SubsampleBinaryToGray" for downscaling BW
-			 */
-			scaleBinary((float) scale);
-		} else if ((scale <= 0.5) && (quality > 1)) {
-			/*
-			 * blur and "Scale" for downscaling color images
-			 */
-			if ((scale <= 0.5) && (quality > 1)) {
-				int bl = (int) Math.floor(1 / scale);
-				// don't blur more than 3
-				blur(Math.min(bl, 3));
-			}
-			scaleAll((float) scale);
-		} else {
-			/*
-			 * "Scale" for the rest
-			 */
-			scaleAll((float) scale);
-		}
-
-		// DEBUG
-		logger.debug("SCALE: " + scale + " ->" + img.getWidth() + "x"
-				+ img.getHeight());
-
-	}
-
-	public void scaleAll(float scale) throws ImageOpException {
-		RenderedImage scaledImg;
-		// DEBUG
-		logger.debug("scaleAll: " + scale);
-		ParameterBlockJAI param = new ParameterBlockJAI("Scale");
-		param.addSource(img);
-		param.setParameter("xScale", scale);
-		param.setParameter("yScale", scale);
-		param.setParameter("interpolation", interpol);
-		// hint with border extender
-		RenderingHints hint = new RenderingHints(JAI.KEY_BORDER_EXTENDER,
-				BorderExtender.createInstance(BorderExtender.BORDER_COPY));
-		// scale
-		scaledImg = JAI.create("Scale", param, hint);
-
-		if (scaledImg == null) {
-			throw new ImageOpException("Unable to scale");
-		}
-		img = scaledImg;
-	}
-
-	public void blur(int radius) throws ImageOpException {
-		RenderedImage blurredImg;
-		int klen = Math.max(radius, 2);
-		logger.debug("blur: " + klen);
-		int ksize = klen * klen;
-		float f = 1f / ksize;
-		float[] kern = new float[ksize];
-		for (int i = 0; i < ksize; i++) {
-			kern[i] = f;
-		}
-		KernelJAI blur = new KernelJAI(klen, klen, kern);
-		ParameterBlockJAI param = new ParameterBlockJAI("Convolve");
-		param.addSource(img);
-		param.setParameter("kernel", blur);
-		// hint with border extender
-		RenderingHints hint = new RenderingHints(JAI.KEY_BORDER_EXTENDER,
-				BorderExtender.createInstance(BorderExtender.BORDER_COPY));
-		blurredImg = JAI.create("Convolve", param, hint);
-		if (blurredImg == null) {
-			throw new ImageOpException("Unable to scale");
-		}
-		img = blurredImg;
-	}
-
-	public void scaleBinary(float scale) throws ImageOpException {
-		RenderedImage scaledImg;
-		// DEBUG
-		logger.debug("scaleBinary: " + scale);
-		ParameterBlockJAI param = new ParameterBlockJAI("SubsampleBinaryToGray");
-		param.addSource(img);
-		param.setParameter("xScale", scale);
-		param.setParameter("yScale", scale);
-		// hint with border extender
-		RenderingHints hint = new RenderingHints(JAI.KEY_BORDER_EXTENDER,
-				BorderExtender.createInstance(BorderExtender.BORDER_COPY));
-		// scale
-		scaledImg = JAI.create("SubsampleBinaryToGray", param, hint);
-		if (scaledImg == null) {
-			throw new ImageOpException("Unable to scale");
-		}
-		img = scaledImg;
-	}
-
-	/* crops the current image */
-	public void crop(int x_off, int y_off, int width, int height)
-			throws ImageOpException {
-		// setup Crop
-		ParameterBlock param = new ParameterBlock();
-		param.addSource(img);
-		param.add((float) x_off);
-		param.add((float) y_off);
-		param.add((float) width);
-		param.add((float) height);
-		RenderedImage croppedImg = JAI.create("crop", param);
-
-		logger.debug("CROP: " + x_off + "," + y_off + ", " + width + ","
-				+ height + " ->" + croppedImg.getWidth() + "x"
-				+ croppedImg.getHeight());
-		img = croppedImg;
-	}
-
-	/* rotates the current image */
-	public void rotate(double angle) throws ImageOpException {
-		RenderedImage rotImg;
-		// convert degrees to radians
-		double rangle = Math.toRadians(angle);
-		double x = img.getWidth() / 2;
-		double y = img.getHeight() / 2;
-
-		// optimize rotation by right angles
-		TransposeType rotOp = null;
-		if (Math.abs(angle - 0) < epsilon) {
-			// 0 degree
-			return;
-		} else if (Math.abs(angle - 90) < epsilon) {
-			// 90 degree
-			rotOp = TransposeDescriptor.ROTATE_90;
-		} else if (Math.abs(angle - 180) < epsilon) {
-			// 180 degree
-			rotOp = TransposeDescriptor.ROTATE_180;
-		} else if (Math.abs(angle - 270) < epsilon) {
-			// 270 degree
-			rotOp = TransposeDescriptor.ROTATE_270;
-		} else if (Math.abs(angle - 360) < epsilon) {
-			// 360 degree
-			return;
-		}
-		if (rotOp != null) {
-			// use Transpose operation
-			ParameterBlock pb = new ParameterBlock();
-			pb.addSource(img);
-			pb.add(rotOp);
-			rotImg = JAI.create("transpose", pb);
-		} else {
-			// setup "normal" rotation
-			ParameterBlock param = new ParameterBlock();
-			param.addSource(img);
-			param.add((float) x);
-			param.add((float) y);
-			param.add((float) rangle);
-			param.add(interpol);
-
-			rotImg = JAI.create("rotate", param);
-		}
-
-		logger.debug("ROTATE: " + x + "," + y + ", " + angle + " (" + rangle
-				+ ")" + " ->" + rotImg.getWidth() + "x" + rotImg.getHeight());
-		img = rotImg;
-	}
-
-	/*
-	 * mirrors the current image works only horizontal and vertical
-	 */
-	public void mirror(double angle) throws ImageOpException {
-		RenderedImage mirImg;
-		// only mirroring by right angles
-		TransposeType rotOp = null;
-		if (Math.abs(angle) < epsilon) {
-			// 0 degree
-			rotOp = TransposeDescriptor.FLIP_HORIZONTAL;
-		} else if (Math.abs(angle - 90) < epsilon) {
-			// 90 degree
-			rotOp = TransposeDescriptor.FLIP_VERTICAL;
-		} else if (Math.abs(angle - 180) < epsilon) {
-			// 180 degree
-			rotOp = TransposeDescriptor.FLIP_HORIZONTAL;
-		} else if (Math.abs(angle - 270) < epsilon) {
-			// 270 degree
-			rotOp = TransposeDescriptor.FLIP_VERTICAL;
-		} else if (Math.abs(angle - 360) < epsilon) {
-			// 360 degree
-			rotOp = TransposeDescriptor.FLIP_HORIZONTAL;
-		}
-		// use Transpose operation
-		ParameterBlock param = new ParameterBlock();
-		param.addSource(img);
-		param.add(rotOp);
-		mirImg = JAI.create("transpose", param);
-
-		if (mirImg == null) {
-			throw new ImageOpException("Unable to flip");
-		}
-		img = mirImg;
-	}
-
-	/* contrast and brightness enhancement */
-	public void enhance(float mult, float add) throws ImageOpException {
-		RenderedImage enhImg;
-		double[] ma = { mult };
-		double[] aa = { add };
-		// use Rescale operation
-		ParameterBlock param = new ParameterBlock();
-		param.addSource(img);
-		param.add(ma);
-		param.add(aa);
-		enhImg = JAI.create("rescale", param);
-
-		logger.debug("ENHANCE: *" + mult + ", +" + add + " ->"
-				+ enhImg.getWidth() + "x" + enhImg.getHeight());
-		// DEBUG
-		img = enhImg;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see digilib.image.DocuImage#enhanceRGB(float[], float[])
-	 */
-	public void enhanceRGB(float[] rgbm, float[] rgba) throws ImageOpException {
-		RenderedImage enhImg;
-		int nb = rgbm.length;
-		double[] ma = new double[nb];
-		double[] aa = new double[nb];
-		for (int i = 0; i < nb; i++) {
-			ma[i] = rgbm[i];
-			aa[i] = rgba[i];
-		}
-		// use Rescale operation
-		ParameterBlock param = new ParameterBlock();
-		param.addSource(img);
-		param.add(ma);
-		param.add(aa);
-		enhImg = JAI.create("rescale", param);
-
-		logger.debug("ENHANCE_RGB: *" + rgbm + ", +" + rgba + " ->"
-				+ enhImg.getWidth() + "x" + enhImg.getHeight());
-		img = enhImg;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see digilib.image.DocuImage#dispose()
-	 */
-	public void dispose() {
-		img = null;
-	}
-
-}
--- a/servlet/src/digilib/image/JAIImageLoaderDocuImage.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/* JAIImageLoaderDocuImage -- Image class implementation using JAI's ImageLoader Plugin
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2002, 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-package digilib.image;
-
-import java.awt.Image;
-import java.awt.Rectangle;
-import java.awt.image.renderable.ParameterBlock;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
-import java.util.Iterator;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.FileImageInputStream;
-import javax.imageio.stream.ImageInputStream;
-import javax.media.jai.JAI;
-import javax.servlet.ServletException;
-
-import digilib.io.FileOpException;
-import digilib.io.ImageFile;
-
-/** DocuImage implementation using the Java Advanced Imaging API and the ImageLoader
- * API of Java 1.4.
- */
-public class JAIImageLoaderDocuImage extends JAIDocuImage {
-
-	/** ImageIO image reader */
-	protected ImageReader reader;
-	/** current image file */
-	protected File imgFile;
-
-	/* loadSubimage is supported. */
-	public boolean isSubimageSupported() {
-		return true;
-	}
-
-    /* returns the size of the current image */
-    public ImageSize getSize() {
-        ImageSize is = null;
-        // TODO: can we cache imageSize?
-        int h = 0;
-        int w = 0;
-        try {
-            if (img == null) {
-                // get size from ImageReader
-                h = reader.getHeight(0);
-                w = reader.getWidth(0);
-            } else {
-                // get size from image
-                h = img.getHeight();
-                w = img.getWidth();
-            }
-            is = new ImageSize(w, h);
-        } catch (IOException e) {
-            logger.debug("error in getSize:", e);
-        }
-        return is;
-    }
-
-
-	/* Load an image file into the Object. */
-	public void loadImage(ImageFile f) throws FileOpException {
-		logger.debug("loadImage: "+f.getFile());
-		//System.gc();
-		img = JAI.create("ImageRead", f.getFile().getAbsolutePath());
-		if (img == null) {
-			throw new FileOpException("Unable to load File!");
-		}
-        mimeType = f.getMimetype();
-	}
-
-	/* Get an ImageReader for the image file. */
-	public ImageReader getReader(ImageFile f) throws IOException {
-		logger.debug("preloadImage: "+f.getFile());
-		//System.gc();
-		RandomAccessFile rf = new RandomAccessFile(f.getFile(), "r");
-		ImageInputStream istream = new FileImageInputStream(rf);
-		//Iterator readers = ImageIO.getImageReaders(istream);
-		Iterator<ImageReader> readers = ImageIO.getImageReadersByMIMEType(f.getMimetype());
-		if (! readers.hasNext()) {
-			throw new FileOpException("Unable to load File!");
-		}
-		reader = readers.next();
-		logger.debug("JAIImageIO: this reader: " + reader.getClass());
-		while (readers.hasNext()) {
-			logger.debug("  next reader: " + readers.next().getClass());
-		}
-		reader.setInput(istream);
-		return reader;
-	}
-
-	/* Load an image file into the Object. */
-	public void loadSubimage(ImageFile f, Rectangle region, int prescale)
-		throws FileOpException {
-		logger.debug("loadSubimage: "+f.getFile());
-		//System.gc();
-		try {
-			if ((reader == null) || (imgFile != f.getFile())) {
-				getReader(f);
-			}
-			ImageReadParam readParam = reader.getDefaultReadParam();
-			readParam.setSourceRegion(region);
-			readParam.setSourceSubsampling(prescale, prescale, 0, 0);
-			img = reader.read(0, readParam);
-			/* JAI imageread seems to ignore the readParam :-(
-			ImageInputStream istream = (ImageInputStream) reader.getInput();
-			ParameterBlockJAI pb = new ParameterBlockJAI("imageread");
-			pb.setParameter("Input", istream);
-			pb.setParameter("ReadParam", readParam);
-			pb.setParameter("Reader", reader);
-			img = JAI.create("imageread", pb);
-			*/
-		} catch (IOException e) {
-			throw new FileOpException("Unable to load File!");
-		}
-		if (img == null) {
-			throw new FileOpException("Unable to load File!");
-		}
-		imgFile = f.getFile();
-        mimeType = f.getMimetype();
-	}
-
-
-	/* Write the current image to an OutputStream. */
-	public void writeImage(String mt, OutputStream ostream)
-		throws ImageOpException, ServletException {
-		logger.debug("writeImage");
-		try {
-			// setup output
-			ParameterBlock pb3 = new ParameterBlock();
-			pb3.addSource(img);
-			pb3.add(ostream);
-			if (mt == "image/jpeg") {
-				pb3.add("JPEG");
-			} else if (mt == "image/png") {
-				pb3.add("PNG");
-			} else {
-				// unknown mime type
-				throw new ImageOpException("Unknown mime type: " + mt);
-			}
-			// render output
-			JAI.create("ImageWrite", pb3);
-		} catch (RuntimeException e) {
-			throw new ServletException("Error writing image.");
-		}
-	}
-
-	@Override
-    public Image getAwtImage() {
-        // TODO Auto-generated method stub
-        return (Image) img;
-    }
-
-    /* (non-Javadoc)
-	 * @see java.lang.Object#finalize()
-	 */
-	protected void finalize() throws Throwable {
-		dispose();
-		super.finalize();
-	}
-
-	public void dispose() {
-		// we must dispose the ImageReader because it keeps the filehandle open!
-		reader.dispose();
-		reader = null;
-		img = null;
-	}
-
-}
--- a/servlet/src/digilib/io/AliasingDocuDirCache.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * AliasingDocuDirCache -- DocuDirCache using alias entries from config file
- * 
- * Digital Image Library servlet components
- * 
- * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * Created on 04.11.2003
- */
-
-package digilib.io;
-
-import java.io.File;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import digilib.io.FileOps.FileClass;
-import digilib.servlet.DigilibConfiguration;
-
-/**
- * @author casties
- *  
- */
-public class AliasingDocuDirCache extends DocuDirCache {
-
-	/**
-	 * @param baseDirs
-	 * @param fcs
-	 * @param confFileName
-	 * @throws FileOpException
-	 */
-	public AliasingDocuDirCache(String[] baseDirs, FileClass[] fcs,
-			File confFile, DigilibConfiguration dlConfig)
-			throws FileOpException {
-		// create standard DocuDirCache
-		super(baseDirs, fcs, dlConfig);
-		Map<String,String> pathMap = null;
-		// read alias config file
-		try {
-			// load into pathMap
-			XMLListLoader mapLoader = new XMLListLoader("digilib-aliases",
-					"mapping", "link", "dir");
-			pathMap = mapLoader.loadURL(confFile.toURL().toString());
-		} catch (Exception e) {
-			throw new FileOpException("ERROR loading mapping file: " + e);
-		}
-		if (pathMap == null) {
-			throw new FileOpException("ERROR: unable to load mapping file!");
-		}
-
-		/*
-		 * load map entries into cache
-		 */
-
-		for (Entry<String, String> linkdir: pathMap.entrySet()) {
-			if (linkdir.getValue() == null) {
-				logger.error("Key mismatch in mapping file!");
-				break;	
-			}
-			DocuDirectory destDir = new DocuDirectory(linkdir.getValue(), this);
-			if (destDir.isValid()) {
-				logger.debug("Aliasing dir: " + linkdir.getKey());
-				// add the alias name
-				putName(FileOps.normalName(linkdir.getKey()), destDir);
-				// add the real dir
-				putDir(destDir);
-			}
-		}
-	}
-
-	/**
-	 * Adds a DocuDirectory under another name to the cache.
-	 * 
-	 * @param name
-	 * @param newdir
-	 */
-    public void putName(String name, DocuDirectory newdir) {
-        if (map.containsKey(name)) {
-            logger.warn("Duplicate key in AliasingDocuDirCache.put -- ignored!");
-        } else {
-            map.put(name, newdir);
-        }
-    }
-
-}
--- a/servlet/src/digilib/io/DigilibInfoReader.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-package digilib.io;
-
-/** DigilibInfoReader 
- * A class for reading the information from info.xml files used in digilib image directories.
- *
- */
-
-import java.io.File;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-
-
-
-public class DigilibInfoReader {
-
-	/** gengeral logger for this class */
-	protected static Logger logger = Logger.getLogger("digilib.servlet");
-	
-	private String filename = null;
-	//private static String base_element = "info";
-	
-	public DigilibInfoReader(String fn){
-		filename = fn;
-	}
-
-	/**
-	 * Returns the attribute defined by 'attr' as a String.
-	 * 
-	 * @param attr
-	 * @return
-	 */
-	@SuppressWarnings("unchecked") // Element.getChildren() returns naked List
-    public String getAsString(String attr){
-		try{
-			SAXBuilder builder = new SAXBuilder();
-			Document doc = builder.build(new File(filename));
-			Element root = doc.getRootElement();
-			List<Element> mainElements = root.getChildren();
-			// logger.debug("XML mainElements:"+mainElements.toString());
-
-			for(int i=0; i<mainElements.size(); i++){
-				Element elem = mainElements.get(i);
-				if(elem.getName()==attr){
-					// logger.debug(attr+" == "+(String)elem.getTextTrim());
-					return (String)elem.getTextTrim();
-				}
-			}
-
-		}
-		catch(Exception e){
-			logger.error(e.getMessage());
-		}
-		return null;
-	}
-	
-	
-	/**
-	 * Find out if the info.xml exists
-	 * @return
-	 */
-	public boolean hasInfo(){
-		try {
-			SAXBuilder builder = new SAXBuilder();
-			builder.build(new File(filename));
-			return true;
-		}
-		catch(Exception e){
-			return false;
-		}
-	}
-	
-}
--- a/servlet/src/digilib/io/Directory.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/* Directory -- Filesystem directory object
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- * Created on 26.08.2003
- *
- */
-package digilib.io;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.apache.log4j.Logger;
-
-/** Class for filesystem directories
- * @author casties
- *
- */
-public class Directory {
-
-	protected Logger logger = Logger.getLogger(this.getClass());
-
-	/** File object pointing to the directory */
-	protected File dir = null;
-	/** parent directory */
-	protected Directory parent = null;
-	/** list of filenames in the directory */
-	protected String[] list = null;
-
-	/** Default constructor.
-	 * 
-	 */
-	public Directory() {
-		super();
-	}
-	
-	/** Constructor taking a File object.
-	 * 
-	 * @param d
-	 */
-	public Directory(File d) {
-		dir = d;
-	}
-
-	/** Constructor taking a File object and a parent.
-	 * 
-	 * @param dir
-	 * @param parent
-	 */
-	public Directory(File dir, Directory parent) {
-		this.dir = dir;
-		this.parent = parent;
-	}
-
-	/** Constructor taking a directory name.
-	 * 
-	 * @param d
-	 */
-	public Directory(String dn) {
-		dir = new File(dn);
-	}
-	
-	
-	/** Reads the names of the files in the directory.
-	 * Fills the filenames array. Returns if the operation was successful.
-	 * 
-	 * @return
-	 */
-	public boolean readDir() {
-		if (dir != null) {
-			//logger.debug("reading dir: "+dir.getPath());
-			list = dir.list();
-			if (list != null) {
-				Arrays.sort(list);
-			}
-			//logger.debug("  done");
-		}
-		return (list != null);
-	}
-	
-	/**
-	 * @return
-	 */
-	public File getDir() {
-		return dir;
-	}
-
-	/**
-	 * @param dir
-	 */
-	public void setDir(File dir) {
-		this.dir = dir;
-	}
-	
-	/**
-	 * @return
-	 */
-	Directory getParent() {
-		return parent;
-	}
-
-	/**
-	 * @param parent
-	 */
-	void setParent(Directory parent) {
-		this.parent = parent;
-	}
-
-
-	/**
-	 * @return Returns the filenames.
-	 */
-	public String[] getFilenames() {
-		return list;
-	}
-	
-	/**
-	 * @param filenames The filenames to set.
-	 */
-	public void setFilenames(String[] filenames) {
-		this.list = filenames;
-	}
-	
-	public void clearFilenames() {
-		this.list = null;
-	}
-}
--- a/servlet/src/digilib/io/DocuDirCache.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,357 +0,0 @@
-/*
- * DocuDirCache.java
- * 
- * Digital Image Library servlet components
- * 
- * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * Created on 03.03.2003
- */
-
-package digilib.io;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-
-import digilib.io.FileOps.FileClass;
-import digilib.servlet.DigilibConfiguration;
-
-/**
- * @author casties
- */
-public class DocuDirCache {
-
-	/** general logger for this class */
-	Logger logger = Logger.getLogger(this.getClass());
-
-	/** HashMap of directories */
-	Map<String, DocuDirectory> map = null;
-
-	/** names of base directories */
-	String[] baseDirNames = null;
-
-	/** array of allowed file classes (image/text) */
-	private FileClass[] fileClasses = null;
-
-	/** number of files in the whole cache (approximate) */
-	long numFiles = 0;
-
-	/** number of cache hits */
-	long hits = 0;
-
-	/** number of cache misses */
-	long misses = 0;
-
-	/** the root directory element */
-	public static Directory ROOT = null;
-
-	/**
-	 * Constructor with array of base directory names and file classes.
-	 * 
-	 * @param bd
-	 *            base directory names
-	 */
-	public DocuDirCache(String[] bd, FileClass[] fcs,
-			DigilibConfiguration dlConfig) {
-		baseDirNames = bd;
-		map = new HashMap<String, DocuDirectory>();
-		this.fileClasses = fcs;
-	}
-
-	/**
-	 * Constructor with array of base directory names.
-	 * 
-	 * @param bd
-	 *            base directory names
-	 */
-	public DocuDirCache(String[] bd) {
-		baseDirNames = bd;
-		map = new HashMap<String, DocuDirectory>();
-		// default file class is CLASS_IMAGE
-		fileClasses = new FileClass[] { FileClass.IMAGE };
-	}
-
-	/**
-	 * The number of directories in the cache.
-	 * 
-	 * @return
-	 */
-	public int size() {
-		return (map != null) ? map.size() : 0;
-	}
-
-	/**
-	 * Add a DocuDirectory to the cache.
-	 * 
-	 * @param newdir
-	 */
-	public void put(DocuDirectory newdir) {
-		String s = newdir.getDirName();
-		if (map.containsKey(s)) {
-			logger.warn("Duplicate key in DocuDirCache.put -- ignoring!");
-		} else {
-			map.put(s, newdir);
-			numFiles += newdir.size();
-		}
-	}
-
-	/**
-	 * Add a directory to the cache and check its parents.
-	 * 
-	 * @param newDir
-	 */
-	public synchronized void putDir(DocuDirectory newDir) {
-		put(newDir);
-		String parent = FileOps.parent(newDir.getDirName());
-		if (parent != "") {
-			// check the parent in the cache
-			DocuDirectory pd = map.get(parent);
-			if (pd == null) {
-				// the parent is unknown
-				pd = new DocuDirectory(parent, this);
-				putDir(pd);
-			}
-			newDir.setParent(pd);
-		}
-	}
-
-	/**
-	 * Get a list with all children of a directory.
-	 * 
-	 * Returns a List of DocuDirectory's. Returns an empty List if the directory
-	 * has no children. If recurse is false then only direct children are
-	 * returned.
-	 * 
-	 * @param dirname
-	 * @param recurse
-	 *            find all children and their children.
-	 * @return
-	 */
-	public List<DocuDirectory> getChildren(String dirname, boolean recurse) {
-		List<DocuDirectory> l = new LinkedList<DocuDirectory>();
-		for (DocuDirectory dd: map.values()) {
-			if (recurse) {
-				if (dd.getDirName().startsWith(dirname)) {
-					l.add(dd);
-				}
-			} else {
-				if (FileOps.parent(dd.getDirName()).equals(dirname)) {
-					l.add(dd);
-				}
-			}
-		}
-		return l;
-	}
-
-	/**
-	 * Returns the DocuDirent with the pathname <code>fn</code> and the index
-	 * <code>in</code> and the class <code>fc</code>.
-	 * 
-	 * If <code>fn</code> is a file then the corresponding DocuDirent is
-	 * returned and the index is ignored.
-	 * 
-	 * @param fn
-	 *            digilib pathname
-	 * @param in
-	 *            file index
-	 * @param fc
-	 *            file class
-	 * @return
-	 */
-	public DocuDirent getFile(String fn, int in, FileClass fc) {
-		DocuDirectory dd;
-		// file number is 1-based, vector index is 0-based
-		int n = in - 1;
-		// first, assume fn is a directory and look in the cache
-		dd = map.get(fn);
-        // logger.debug("fn: " + fn);
-        // logger.debug("dd: " + dd);
-		if (dd == null) {
-			// cache miss
-			misses++;
-			/*
-			 * see if fn is a directory
-			 */
-			File f = new File(baseDirNames[0], fn);
-			if (f.isDirectory()) {
-                // logger.debug(fn + " is a dir");
-				dd = new DocuDirectory(fn, this);
-				if (dd.isValid()) {
-					// add to the cache
-					putDir(dd);
-				}
-			} else {
-				/*
-				 * maybe it's a file
-				 */
-				// get the parent directory string (like we store it in the
-				// cache)
-				String d = FileOps.parent(fn);
-				// try it in the cache
-                // logger.debug(fn + " is a file in dir " + d);
-				dd = map.get(d);
-				if (dd == null) {
-					// try to read from disk
-					dd = new DocuDirectory(d, this);
-					if (dd.isValid()) {
-						// add to the cache
-                        // logger.debug(dd + " is valid");
-						putDir(dd);
-					} else {
-						// invalid path
-						return null;
-					}
-				} else {
-					// it was not a real cache miss
-					misses--;
-				}
-				// get the file's index
-				n = dd.indexOf(f.getName(), fc);
-                // logger.debug(f.getName() + ", index is " + n + ", fc = " + fc);
-			}
-		} else {
-			// cache hit
-			hits++;
-		}
-		dd.refresh();
-        // logger.debug(dd + " refreshed");
-		if (dd.isValid()) {
-			try {
-                // logger.debug(dd + " is valid");
-				return dd.get(n, fc);
-			} catch (IndexOutOfBoundsException e) {
-                // logger.debug(fn + " not found in directory");
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the DocuDirectory indicated by the pathname <code>fn</code>.
-	 * 
-	 * If <code>fn</code> is a file then its parent directory is returned.
-	 * 
-	 * @param fn
-	 *            digilib pathname
-	 * @return
-	 */
-	public DocuDirectory getDirectory(String fn) {
-		DocuDirectory dd;
-		// first, assume fn is a directory and look in the cache
-		dd = map.get(fn);
-		if (dd == null) {
-			// cache miss
-			misses++;
-			// see if it's a directory
-			File f = new File(baseDirNames[0], fn);
-			if (f.isDirectory()) {
-				dd = new DocuDirectory(fn, this);
-				if (dd.isValid()) {
-					// add to the cache
-					putDir(dd);
-				}
-			} else {
-				// maybe it's a file
-				if (f.canRead()) {
-					// try the parent directory in the cache
-					dd = map.get(f.getParent());
-					if (dd == null) {
-						// try to read from disk
-						dd = new DocuDirectory(f.getParent(), this);
-						if (dd.isValid()) {
-							// add to the cache
-							putDir(dd);
-						} else {
-							// invalid path
-							return null;
-						}
-					} else {
-						// not a real cache miss then
-						misses--;
-					}
-				} else {
-					// it's not even a file :-(
-					return null;
-				}
-			}
-		} else {
-			// cache hit
-			hits++;
-		}
-		dd.refresh();
-		if (dd.isValid()) {
-			return dd;
-		}
-		return null;
-	}
-
-	/**
-	 * @return String[]
-	 */
-	public String[] getBaseDirNames() {
-		return baseDirNames;
-	}
-
-	/**
-	 * @return long
-	 */
-	public long getNumFiles() {
-		return numFiles;
-	}
-
-	/**
-	 * Sets the baseDirNames.
-	 * 
-	 * @param baseDirNames
-	 *            The baseDirNames to set
-	 */
-	public void setBaseDirNames(String[] baseDirNames) {
-		this.baseDirNames = baseDirNames;
-	}
-
-	/**
-	 * @return long
-	 */
-	public long getHits() {
-		return hits;
-	}
-
-	/**
-	 * @return long
-	 */
-	public long getMisses() {
-		return misses;
-	}
-
-	/**
-	 * @return
-	 */
-	public FileClass[] getFileClasses() {
-		return fileClasses;
-	}
-
-	/**
-	 * @param fileClasses
-	 */
-	public void setFileClasses(FileClass[] fileClasses) {
-		this.fileClasses = fileClasses;
-	}
-
-}
--- a/servlet/src/digilib/io/DocuDirectory.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,573 +0,0 @@
-/* DocuDirectory -- Directory of DocuFilesets.
-
- Digital Image Library servlet components
-
- Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- * Created on 25.02.2003
- */
-
-package digilib.io;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.xml.sax.SAXException;
-
-import digilib.io.FileOps.FileClass;
-
-/**
- * @author casties
- */
-public class DocuDirectory extends Directory {
-
-	/** list of files (DocuDirent) */
-	private List<List<DocuDirent>> list = null;
-
-	/** default FileClass for unspecified calls */
-	public static FileClass defaultFileClass = FileClass.IMAGE;
-	
-	/** directory object is valid (exists on disk) */
-	private boolean isValid = false;
-
-	/** reference of the parent DocuDirCache */
-	private DocuDirCache cache = null;
-
-	/** directory name (digilib canonical form) */
-	private String dirName = null;
-
-	/** directory metadata */
-	private MetadataMap dirMeta = null;
-
-	/** state of metadata is valid */
-	private boolean metaChecked = false;
-
-	/** unresolved file metadata */
-	private Map<String, MetadataMap> unresolvedFileMeta = null;
-
-	/** time of last access of this object (not the filesystem) */
-	private long objectATime = 0;
-
-	/** time directory was last modified on the file system */
-	private long dirMTime = 0;
-
-	/**
-	 * Constructor with digilib directory path and a parent DocuDirCache.
-	 * 
-	 * Directory names at the given path are appended to the base directories
-	 * from the cache. The directory is checked on disk and isValid is set.
-	 * 
-	 * @see readDir
-	 * 
-	 * @param path
-	 *            digilib directory path name
-	 * @param cache
-	 *            parent DocuDirCache
-	 */
-	public DocuDirectory(String path, DocuDirCache cache) {
-		this.dirName = path;
-		this.cache = cache;
-		initDir();
-		checkDir();
-	}
-
-	/**
-	 * Sets and checks the dir object.
-	 *  
-	 */
-	protected void initDir() {
-		String baseDirName = cache.getBaseDirNames()[0];
-		// clear directory list
-		FileClass[] fcs = FileClass.values();
-		list = new ArrayList<List<DocuDirent>>(fcs.length);
-		// create empty list for all classes
-		for (@SuppressWarnings("unused") FileClass fc: fcs) {
-		    list.add(null);
-		}
-		isValid = false;
-		dirMTime = 0;
-		// the first directory has to exist
-		dir = new File(baseDirName, dirName);
-	}
-
-	/**
-	 * number of DocuFiles in this directory.
-	 *  
-	 */
-	public int size() {
-	    return size(defaultFileClass);
-	}
-
-	/**
-	 * number of files of this class in this directory.
-	 * 
-	 * @param fc
-	 *            fileClass
-	 */
-	public int size(FileClass fc) {
-        if (list != null) {
-            List<DocuDirent> l = list.get(fc.ordinal());
-            if (l != null) {
-                return l.size();
-            }
-        }
-        return 0;
-	}
-
-	/**
-	 * Returns the ImageFileSet at the index.
-	 * 
-	 * @param index
-	 * @return
-	 */
-	public ImageFileset get(int index) {
-		return (ImageFileset) get(index, defaultFileClass);
-	}
-
-	/**
-	 * Returns the file of the class at the index.
-	 * 
-	 * @param index
-	 * @param fc
-	 *            fileClass
-	 * @return
-	 */
-	public DocuDirent get(int index, FileClass fc) {
-		if ((list == null) || (list.get(fc.ordinal()) == null) || (index >= list.get(fc.ordinal()).size())) {
-			return null;
-		}
-		return (DocuDirent) list.get(fc.ordinal()).get(index);
-	}
-
-	/**
-	 * Checks if the directory exists on the filesystem.
-	 * 
-	 * Sets isValid.
-	 * 
-	 * @return
-	 */
-	public boolean checkDir() {
-		if (dir == null) {
-			initDir();
-		}
-		isValid = dir.isDirectory();
-		return isValid;
-	}
-
-	/**
-	 * Read the filesystem directory and fill this object.
-	 * 
-	 * Clears the List and (re)reads all files.
-	 * 
-	 * @return boolean the directory exists
-	 */
-	public synchronized boolean readDir() {
-		// check directory first
-		checkDir();
-		if (!isValid) {
-			return false;
-		}
-		// first file extension to try for scaled directories
-		String scalext = null;
-		// read all filenames
-		logger.debug("reading directory " + dir.getPath());
-		/*
-		 * using ReadableFileFilter is safer (we won't get directories with file
-		 * extensions) but slower.
-		 */
-		File[] allFiles = null;
-		//	allFiles = dir.listFiles(new FileOps.ReadableFileFilter());
-		allFiles = dir.listFiles();
-		//logger.debug("  done");
-		if (allFiles == null) {
-			// not a directory
-			return false;
-		}
-		// list of base dirs from the parent cache
-		String[] baseDirNames = cache.getBaseDirNames();
-		// number of base dirs
-		int nb = baseDirNames.length;
-		// array of base dirs
-		Directory[] dirs = new Directory[nb];
-		// first entry is this directory
-		dirs[0] = this;
-		// fill array with the remaining directories
-		for (int j = 1; j < nb; j++) {
-			File d = new File(baseDirNames[j], dirName);
-			if (d.isDirectory()) {
-				dirs[j] = new Directory(d);
-				logger.debug("  reading scaled directory " + d.getPath());
-				dirs[j].readDir();
-				//logger.debug("    done");
-			}
-		}
-
-		// go through all file classes
-        //for (int classIdx = 0; classIdx < FileOps.NUM_CLASSES; classIdx++) {
-		for (FileClass fileClass: cache.getFileClasses()) {
-			//fileClass = cache.getFileClasses()[classIdx];
-			File[] fileList = FileOps.listFiles(allFiles, FileOps
-					.filterForClass(fileClass));
-			//logger.debug(" done");
-			// number of files in the directory
-			int numFiles = fileList.length;
-			if (numFiles > 0) {
-				// create new list
-				list.set(fileClass.ordinal(), new ArrayList<DocuDirent>(numFiles));
-				// sort the file names alphabetically and iterate the list
-				// Arrays.sort(fileList); // not needed <hertzhaft>
-				Map<Integer, Object> hints = FileOps.newHints(FileOps.HINT_BASEDIRS, dirs);
-				hints.put(FileOps.HINT_FILEEXT, scalext);
-				for (int i = 0; i < numFiles; i++) {
-					DocuDirent f = FileOps.fileForClass(fileClass, fileList[i],
-							hints);
-					// add the file to our list
-                    // logger.debug(f.getName());
-
-					list.get(fileClass.ordinal()).add(f);
-					f.setParent(this);
-				}
-                // we sort the inner ArrayList (the list of files not the list of file types)
-				// for binarySearch to work (DocuDirent's natural sort order is by filename)
-                Collections.sort(list.get(fileClass.ordinal()));
-			}
-		}
-		// clear the scaled directories
-		for (int j = 1; j < nb; j++) {
-			if (dirs[j] != null) {
-				dirs[j].clearFilenames();
-			}
-		}
-		// update number of cached files if this was the first time
-		if (dirMTime == 0) {
-			cache.numFiles += size();
-		}
-		dirMTime = dir.lastModified();
-		// read metadata as well
-		readMeta();
-		return isValid;
-	}
-
-	/**
-	 * Check to see if the directory has been modified and reread if necessary.
-	 * 
-	 * @return boolean the directory is valid
-	 */
-	public boolean refresh() {
-		if (isValid) {
-			if (dir.lastModified() > dirMTime) {
-				// on-disk modification time is more recent
-				readDir();
-			}
-			touch();
-		}
-		return isValid;
-	}
-
-	/**
-	 * Read directory metadata.
-	 *  
-	 */
-	public void readMeta() {
-		// check for directory metadata...
-		File mf = new File(dir, "index.meta");
-		if (mf.canRead()) {
-			XMLMetaLoader ml = new XMLMetaLoader();
-			try {
-				// read directory meta file
-				Map<String, MetadataMap> fileMeta = ml.loadURL(mf.getAbsolutePath());
-				if (fileMeta == null) {
-					return;
-				}
-				// meta for the directory itself is in the "" bin
-				dirMeta = fileMeta.remove("");
-				// read meta for files in this directory
-				readFileMeta(fileMeta, null);
-				// is there meta for other files left?
-				if (fileMeta.size() > 0) {
-					unresolvedFileMeta = fileMeta;
-				}
-			} catch (SAXException e) {
-				logger.warn("error parsing index.meta", e);
-			} catch (IOException e) {
-				logger.warn("error reading index.meta", e);
-			}
-		}
-		readParentMeta();
-		metaChecked = true;
-	}
-
-	/**
-	 * Read metadata from all known parent directories.
-	 *  
-	 */
-	public void readParentMeta() {
-		// check the parent directories for additional file meta
-		Directory dd = parent;
-		String path = dir.getName();
-		while (dd != null) {
-			if (((DocuDirectory) dd).hasUnresolvedFileMeta()) {
-				readFileMeta(((DocuDirectory) dd).unresolvedFileMeta, path);
-			}
-			// prepend parent dir path
-			path = dd.dir.getName() + "/" + path;
-			// become next parent
-			dd = dd.parent;
-		}
-	}
-
-	/**
-	 * Read metadata for the files in this directory.
-	 * 
-	 * Takes a Map with meta-information, adding the relative path before the
-	 * lookup.
-	 * 
-	 * @param fileMeta
-	 * @param relPath
-	 * @param fc
-	 *            fileClass
-	 */
-	protected void readFileMeta(Map<String,MetadataMap> fileMeta, String relPath) {
-		if (list == null) {
-			// there are no files
-			return;
-		}
-		String path = (relPath != null) ? (relPath + "/") : "";
-		// go through all file classes
-		for (FileClass fc: FileClass.values()) {
-			if (list.get(fc.ordinal()) == null) {
-				continue;
-			}
-			// iterate through the list of files in this directory
-			for (DocuDirent f: list.get(fc.ordinal())) {
-				// prepend path to the filename
-				String fn = path + f.getName();
-				// look up meta for this file and remove from dir
-				MetadataMap meta = fileMeta.remove(fn);
-				if (meta != null) {
-					// store meta in file
-					f.setFileMeta(meta);
-				}
-			}
-		}
-	}
-
-	protected void notifyChildMeta(MetadataMap childmeta) {
-		List<DocuDirectory> children = cache.getChildren(this.dirName, true);
-		if (children.size() > 0) {
-			/*for (DocuDirectory d: children) {
-				// TODO: finish this!
-				//((DocuDirectory) i.next()).readFileMeta()
-			}*/
-		}
-	}
-
-	/**
-	 * Update access time.
-	 * 
-	 * @return long time of last access.
-	 */
-	public long touch() {
-		long t = objectATime;
-		objectATime = System.currentTimeMillis();
-		return t;
-	}
-
-	/**
-	 * Searches for the file with the name <code>fn</code>.
-	 * 
-	 * Searches the directory for the file with the name <code>fn</code> and
-	 * returns its index. Returns -1 if the file cannot be found.
-	 * 
-	 * @param fn
-	 *            filename
-	 * @param fc
-	 *            file class
-	 * @return int index of file <code>fn</code>
-	 */
-	public int indexOf(String fn) {
-		FileClass fc = FileOps.classForFilename(fn);
-		return indexOf(fn, fc);
-	}
-
-	/**
-	 * Searches for the file with the name <code>fn</code> and class fc.
-	 * 
-	 * Searches the directory for the file with the name <code>fn</code> and
-	 * returns its index. Returns -1 if the file cannot be found.
-	 * 
-	 * @param fn
-	 *            filename
-	 * @return int index of file <code>fn</code>
-	 */
-	public int indexOf(String fn, FileClass fc) {
-		if (!isRead()) {
-			// read directory now
-			if (!readDir()) {
-				return -1;
-			}
-		}
-		List<DocuDirent> fileList = list.get(fc.ordinal());
-		// empty directory?
-		if (fileList == null) {
-			return -1;
-		}
-        
-		// search for exact match (DocuDirent does compareTo<String>)
-        // OBS: fileList needs to be sorted first (see )! <hertzhaft>
-		int idx = Collections.binarySearch(fileList, fn);
-		if (idx >= 0) {
-			return idx;
-		} else {
-            logger.debug(fn + " not found by binarysearch");
-			// try closest matches without extension
-			idx = -idx - 1;
-			if ((idx < fileList.size())
-					&& isBasenameInList(fileList, idx, fn)) {
-				// idx matches
-				return idx;
-			} else if ((idx > 0)
-					&& isBasenameInList(fileList, idx-1, fn)) {
-				// idx-1 matches
-				return idx - 1;
-			} else if ((idx + 1 < fileList.size())
-					&& isBasenameInList(fileList, idx+1, fn)) {
-				// idx+1 matches
-				return idx + 1;
-			}
-
-		}
-		return -1;
-	}
-
-	private boolean isBasenameInList(List<DocuDirent> fl, int idx, String fn) {
-		String dfn = FileOps.basename((fl.get(idx))
-				.getName());
-		return (dfn.equals(fn)||dfn.equals(FileOps.basename(fn))); 
-	}
-	
-	
-	/**
-	 * Finds the DocuDirent with the name <code>fn</code>.
-	 * 
-	 * Searches the directory for the DocuDirent with the name <code>fn</code>
-	 * and returns it. Returns null if the file cannot be found.
-	 * 
-	 * @param fn
-	 *            filename
-	 * @return DocuDirent
-	 */
-	public DocuDirent find(String fn) {
-		return find(fn, defaultFileClass);
-	}
-
-	/**
-	 * Finds the DocuDirent with the name <code>fn</code> and class
-	 * <code>fc</code>.
-	 * 
-	 * Searches the directory for the DocuDirent with the name <code>fn</code>
-	 * and returns it. Returns null if the file cannot be found.
-	 * 
-	 * @param fn
-	 *            filename
-	 * @return DocuDirent
-	 */
-	public DocuDirent find(String fn, FileClass fc) {
-		int i = indexOf(fn, fc);
-		if (i >= 0) {
-			return (DocuDirent) list.get(fc.ordinal()).get(i);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the digilib canonical name.
-	 * 
-	 * @return
-	 */
-	public String getDirName() {
-		return dirName;
-	}
-
-	/**
-	 * The directory is valid (exists on disk).
-	 * 
-	 * @return boolean
-	 */
-	public boolean isValid() {
-		return isValid;
-	}
-
-	/**
-	 * The directory has been read from disk.
-	 * 
-	 * @return
-	 */
-	public boolean isRead() {
-		return (dirMTime != 0);
-	}
-
-	/**
-	 * @return long
-	 */
-	public long getAccessTime() {
-		return objectATime;
-	}
-
-	/**
-	 * @return Hashtable
-	 */
-	public MetadataMap getDirMeta() {
-		return dirMeta;
-	}
-
-	/**
-	 * Checks metadata
-	 *  
-	 */
-	public void checkMeta() {
-		if (metaChecked) {
-			return;
-		} else {
-			readMeta();
-		}
-	}
-
-	/**
-	 * @return long
-	 */
-	public long getDirMTime() {
-		return dirMTime;
-	}
-
-	/**
-	 * Sets the dirMeta.
-	 * 
-	 * @param dirMeta
-	 *            The dirMeta to set
-	 */
-	public void setDirMeta(MetadataMap dirMeta) {
-		this.dirMeta = dirMeta;
-	}
-
-	public boolean hasUnresolvedFileMeta() {
-		return (this.unresolvedFileMeta != null);
-	}
-
-}
--- a/servlet/src/digilib/io/DocuDirent.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
- * DocuDirent.java -- Abstract directory entry in a DocuDirectory
- * 
- * Digital Image Library servlet components
- * 
- * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- * 
- * Created on 15.09.2003 by casties
- *  
- */
-package digilib.io;
-
-import java.io.File;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-
-import digilib.io.FileOps.FileClass;
-
-/**
- * Abstract directory entry in a DocuDirectory.
- * 
- * @author casties
- *  
- */
-public abstract class DocuDirent implements Comparable<Object> {
-
-	/** the file class of this file */
-	protected static FileClass fileClass = FileClass.NONE;
-	/** HashMap with metadata */
-	protected MetadataMap fileMeta = null;
-	/** Is the Metadata valid */
-	protected boolean metaChecked = false;
-	/** the parent directory */
-	protected Directory parent = null;
-
-	/**
-	 * Checks metadata and does something with it.
-	 *  
-	 */
-	public abstract void checkMeta();
-
-	/**
-	 * gets the (default) File
-	 * 
-	 * @return
-	 */
-	public abstract File getFile();
-
-	/**
-	 * Reads meta-data for this Fileset if there is any.
-	 *  
-	 */
-	public void readMeta() {
-		if ((fileMeta != null) || (getFile() == null)) {
-			// there is already metadata or there is no file
-			return;
-		}
-		// metadata is in the file {filename}.meta
-		String fn = getFile().getAbsolutePath();
-		File mf = new File(fn + ".meta");
-		if (mf.canRead()) {
-			XMLMetaLoader ml = new XMLMetaLoader();
-			try {
-				// read meta file
-				Map<String, MetadataMap> meta = ml.loadURL(mf.getAbsolutePath());
-				if (meta == null) {
-					return;
-				}
-				fileMeta = meta.get(getName());
-			} catch (Exception e) {
-				Logger.getLogger(this.getClass()).warn("error reading file .meta", e);
-			}
-		}
-	}
-
-	/**
-	 * The name of the file.
-	 * 
-	 * If this is a Fileset, the method returns the name of the default file
-	 * (for image filesets the highest resolution file).
-	 * 
-	 * @return
-	 */
-	public String getName() {
-		File f = getFile();
-		return (f != null) ? f.getName() : null;
-	} 
-	
-	/**
-	 * Returns the parent Directory.
-	 * 
-	 * @return DocuDirectory
-	 */
-	public Directory getParent() {
-		return parent;
-	}
-	
-	/**
-	 * Sets the parent Directory.
-	 * 
-	 * @param parent
-	 *            The parent to set
-	 */
-	public void setParent(Directory parent) {
-		this.parent = parent;
-	} 
-	
-	/**
-	 * Returns the meta-data for this file(set).
-	 * 
-	 * @return HashMap
-	 */
-	public MetadataMap getFileMeta() {
-		return fileMeta;
-	} 
-	
-	/**
-	 * Sets the meta-data for this file(set) .
-	 * 
-	 * @param fileMeta
-	 *            The fileMeta to set
-	 */
-	public void setFileMeta(MetadataMap fileMeta) {
-		this.fileMeta = fileMeta;
-	} 
-	
-	/**
-	 * @return
-	 */
-	public boolean isMetaChecked() {
-		return metaChecked;
-	} 
-	
-	/**
-	 * @return
-	 */
-	public static FileClass getFileClass() {
-		return fileClass;
-	}
-
-	/** Comparator using the file name.
-	 * Compares to a String (for binarySearch)
-     * or to another DocuDirent (for sort)
-	 * 
-	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-	 */
-	public int compareTo(Object arg0) {
-		if (arg0 instanceof DocuDirent) {
-		    return getName().compareTo(((DocuDirent) arg0).getName());
-		} else {
-		    return getName().compareTo((String) arg0);
-		}
-	}
-
-	
-}
--- a/servlet/src/digilib/io/FileOpException.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*  FileOpException -- Exception class for file operations
-
- Digital Image Library servlet components
-
- Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- */
-
-package digilib.io;
-
-import java.io.IOException;
-
-public class FileOpException extends IOException {
-
-	private static final long serialVersionUID = 7299056561734277644L;
-
-	public FileOpException() {
-	}
-
-	public FileOpException(String s) {
-		super(s);
-	}
-}
--- a/servlet/src/digilib/io/FileOps.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,395 +0,0 @@
-/*
- * FileOps -- Utility class for file operations
- * 
- * Digital Image Library servlet components
- * 
- * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *  
- */
-
-package digilib.io;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-public class FileOps {
-
-	/**
-	 * Array of file extensions and corresponding mime-types.
-	 */
-	private static final String[][] ft = { { "jpg", "image/jpeg" },
-			{ "jpeg", "image/jpeg" }, { "jp2", "image/jp2" },
-			{ "png", "image/png" }, { "gif", "image/gif" },
-			{ "tif", "image/tiff" }, { "tiff", "image/tiff" },
-                        { "fpx", "image/fpx" },
-			{ "txt", "text/plain" }, { "html", "text/html" },
-			{ "htm", "text/html" }, { "xml", "text/xml" },
-			{ "svg", "image/svg+xml" }, { "meta", "text/xml" } };
-
-	public static Map<String, String> fileTypes;
-
-	public static List<String> imageExtensions;
-
-	public static List<String> textExtensions;
-
-	public static List<String> svgExtensions;
-
-	public static enum FileClass {NONE, IMAGE, TEXT, SVG}
-
-	public static final Integer HINT_BASEDIRS = new Integer(1);
-
-	public static final Integer HINT_FILEEXT = new Integer(2);
-
-	public static final Integer HINT_DIRS = new Integer(3);
-
-	/**
-	 * static initializer for FileOps
-	 */
-	static {
-		fileTypes = new HashMap<String, String>();
-		imageExtensions = new ArrayList<String>();
-		textExtensions = new ArrayList<String>();
-		svgExtensions = new ArrayList<String>();
-		// iterate through file types in ft and fill the Map and Lists
-		for (int i = 0; i < ft.length; i++) {
-			String ext = ft[i][0];
-			String mt = ft[i][1];
-			fileTypes.put(ext, mt);
-			if (classForMimetype(mt) == FileClass.IMAGE) {
-				imageExtensions.add(ext);
-			} else if (classForMimetype(mt) == FileClass.TEXT) {
-				textExtensions.add(ext);
-			} else if (classForMimetype(mt) == FileClass.SVG) {
-				svgExtensions.add(ext);
-			}
-		}
-	}
-
-	/**
-	 * returns the file class for a mime-type
-	 * 
-	 * @param mt
-	 * @return
-	 */
-	public static FileClass classForMimetype(String mt) {
-		if (mt == null) {
-			return FileClass.NONE;
-		}
-		if (mt.startsWith("image/svg")) {
-			return FileClass.SVG;
-		} else if (mt.startsWith("image")) {
-			return FileClass.IMAGE;
-		} else if (mt.startsWith("text")) {
-			return FileClass.TEXT;
-		}
-		return FileClass.NONE;
-	}
-
-	/**
-	 * get the mime type for a file format (by extension)
-	 */
-	public static String mimeForFile(File f) {
-		return (String) fileTypes.get(extname(f.getName().toLowerCase()));
-	}
-
-	/**
-	 * get the file class for the filename (by extension)
-	 * 
-	 * @param fn
-	 * @return
-	 */
-	public static FileClass classForFilename(String fn) {
-		String mt = (String) fileTypes.get(extname(fn).toLowerCase());
-		return classForMimetype(mt);
-	}
-
-	public static Iterator<String> getImageExtensionIterator() {
-		return imageExtensions.iterator();
-	}
-
-    public static List<String> getImageExtensions() {
-        return imageExtensions;
-    }
-
-    public static Iterator<String> getTextExtensionIterator() {
-		return textExtensions.iterator();
-	}
-
-	public static List<String> getTextExtensions() {
-        return textExtensions;
-    }
-
-    public static Iterator<String> getSVGExtensionIterator() {
-		return svgExtensions.iterator();
-	}
-
-    public static List<String> getSvgExtensions() {
-        return svgExtensions;
-    }
-
-
-	/**
-	 * convert a string with a list of pathnames into an array of strings using
-	 * the system's path separator string
-	 */
-	public static String[] pathToArray(String paths) {
-		// split list into directories
-		StringTokenizer dirs = new StringTokenizer(paths, File.pathSeparator);
-		int n = dirs.countTokens();
-		if (n < 1) {
-			return null;
-		}
-		// add directories into array
-		String[] pathArray = new String[n];
-		for (int i = 0; i < n; i++) {
-			String s = dirs.nextToken();
-			// make shure the dir name ends with a directory separator
-			if (s.endsWith(File.separator)) {
-				pathArray[i] = s;
-			} else {
-				pathArray[i] = s + File.separator;
-			}
-		}
-		return pathArray;
-	}
-
-	/**
-	 * Extract the base of a file name (sans extension).
-	 * 
-	 * Returns the filename without the extension. The extension is the part
-	 * behind the last dot in the filename. If the filename has no dot the full
-	 * file name is returned.
-	 * 
-	 * @param fn
-	 * @return
-	 */
-	public static String basename(String fn) {
-		if (fn == null) {
-			return null;
-		}
-		int i = fn.lastIndexOf('.');
-		if (i > 0) {
-			return fn.substring(0, i);
-		}
-		return fn;
-	}
-
-	/**
-	 * Extract the extension of a file name.
-	 * 
-	 * Returns the extension of a file name. The extension is the part behind
-	 * the last dot in the filename. If the filename has no dot the empty string
-	 * is returned.
-	 * 
-	 * @param fn
-	 * @return
-	 */
-	public static String extname(String fn) {
-		if (fn == null) {
-			return null;
-		}
-		int i = fn.lastIndexOf('.');
-		if (i > 0) {
-			return fn.substring(i + 1);
-		}
-		return "";
-	}
-
-	/**
-	 * Extract the parent directory of a (digilib) path name.
-	 * 
-	 * Returns the parent directory of a path name. The parent is the part
-	 * before the last slash in the path name. If the path name has no slash the
-	 * empty string is returned.
-	 * 
-	 * @param fn
-	 * @return
-	 */
-	public static String parent(String fn) {
-		if (fn == null) {
-			return null;
-		}
-		int i = fn.lastIndexOf('/');
-		if (i > 0) {
-			return fn.substring(0, i);
-		}
-		return "";
-	}
-
-	/**
-	 * Normalize a path name.
-	 * 
-	 * Removes leading and trailing slashes. Returns null if there is other
-	 * unwanted stuff in the path name.
-	 * 
-	 * @param pathname
-	 * @return
-	 */
-	public static String normalName(String pathname) {
-		if (pathname == null) {
-			return null;
-		}
-		// upper-dir references are unwanted
-		if (pathname.indexOf("../") >= 0) {
-			return null;
-		}
-		int a = 0;
-		int e = pathname.length() - 1;
-		if (e < 0) {
-			return pathname;
-		}
-		// leading and trailing "/" are removed
-		while ((a <= e) && (pathname.charAt(a) == '/')) {
-			a++;
-		}
-		while ((a < e) && (pathname.charAt(e) == '/')) {
-			e--;
-		}
-		return pathname.substring(a, e + 1);
-	}
-
-	/**
-	 * FileFilter for general files
-	 */
-	static class ReadableFileFilter implements FileFilter {
-
-		public boolean accept(File f) {
-			return f.canRead();
-		}
-	}
-
-	/**
-	 * FileFilter for image types (helper class for getFile)
-	 */
-	static class ImageFileFilter implements FileFilter {
-
-		public boolean accept(File f) {
-			return (classForFilename(f.getName()) == FileClass.IMAGE);
-		}
-	}
-
-	/**
-	 * FileFilter for text types (helper class for getFile)
-	 */
-	static class TextFileFilter implements FileFilter {
-
-		public boolean accept(File f) {
-			return (classForFilename(f.getName()) == FileClass.TEXT);
-		}
-	}
-
-	/**
-	 * FileFilter for svg types (helper class for getFile).
-	 *  
-	 */
-	static class SVGFileFilter implements FileFilter {
-
-		public boolean accept(File f) {
-			return (classForFilename(f.getName()) == FileClass.SVG);
-		}
-	}
-
-	/**
-	 * Factory for FileFilters (image or text).
-	 * 
-	 * @param fileClass
-	 * @return
-	 */
-	public static FileFilter filterForClass(FileClass fileClass) {
-		if (fileClass == FileClass.IMAGE) {
-			return new ImageFileFilter();
-		}
-		if (fileClass == FileClass.TEXT) {
-			return new TextFileFilter();
-		}
-		if (fileClass == FileClass.SVG) {
-			return new SVGFileFilter();
-		}
-		return null;
-	}
-
-	/**
-	 * Factory for DocuDirents based on file class.
-	 * 
-	 * Returns an ImageFileset, TextFile or SVGFile. baseDirs and scalext are
-	 * only for ImageFilesets.
-	 * 
-	 * @param fileClass
-	 * @param file
-	 * @param hints
-	 *            optional additional parameters
-	 * @return
-	 */
-	public static DocuDirent fileForClass(FileClass fileClass, File file, Map<Integer,Object> hints) {
-		// what class of file do we have?
-		if (fileClass == FileClass.IMAGE) {
-			// image file
-			return new ImageFileset(file, hints);
-		} else if (fileClass == FileClass.TEXT) {
-			// text file
-			return new TextFile(file);
-		} else if (fileClass == FileClass.SVG) {
-			// text file
-			return new SVGFile(file);
-		}
-		return null;
-	}
-
-	/**
-	 * Filters a list of Files through a FileFilter.
-	 * 
-	 * @param files
-	 * @param filter
-	 * @return
-	 */
-	public static File[] listFiles(File[] files, FileFilter filter) {
-		if (files == null) {
-			return null;
-		}
-		File[] ff = new File[files.length];
-		int ffi = 0;
-		for (int i = 0; i < files.length; i++) {
-			if (filter.accept(files[i])) {
-				ff[ffi] = files[i];
-				ffi++;
-			}
-		}
-		File[] fff = new File[ffi];
-		System.arraycopy(ff, 0, fff, 0, ffi);
-		return fff;
-	}
-
-	/**
-	 * Creates a new hints Map with the given first element.
-	 * 
-	 * @param type
-	 * @param value
-	 * @return
-	 */
-	public static Map<Integer, Object> newHints(Integer type, Object value) {
-		Map<Integer, Object> m = new HashMap<Integer, Object>();
-		if (type != null) {
-			m.put(type, value);
-		}
-		return m;
-	}
-
-}
--- a/servlet/src/digilib/io/ImageFile.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/* ImageFile.java -- digilib image file class.
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- * Created on 25.02.2003
- */
- 
-package digilib.io;
-
-import java.io.File;
-
-import digilib.image.ImageSize;
-
-/**
- * @author casties
- */
-public class ImageFile {
-	
-	// file name
-	private String filename = null;
-	// parent ImageFileset
-	private ImageFileset parent = null;
-	// parent directory
-	private Directory dir = null;
-	// mime file type
-	private String mimetype = null;
-	// image size in pixels
-	private ImageSize pixelSize = null;
-
-	public ImageFile(String fn, ImageFileset parent, Directory dir) {
-		this.filename = fn;
-		this.parent = parent;
-		this.dir = dir;
-	}
-	
-	public ImageFile(String fn) {
-		File f = new File(fn);
-		this.dir = new Directory(f.getParentFile());
-		this.filename = f.getName();
-	}
-	
-	/** Returns the file name (without path).
-	 * 
-	 * @return
-	 */
-	public String getName() {
-		return filename;
-	}
-
-
-	/**
-	 * @return File
-	 */
-	public File getFile() {
-		if (dir == null) {
-			return null;
-		}
-		File f = new File(dir.getDir(), filename);
-		return f;
-	}
-
-	/**
-	 * @return ImageSize
-	 */
-	public ImageSize getSize() {
-		return pixelSize;
-	}
-
-	/**
-	 * @return String
-	 */
-	public String getMimetype() {
-		return mimetype;
-	}
-
-	/**
-	 * Sets the imageSize.
-	 * @param imageSize The imageSize to set
-	 */
-	public void setSize(ImageSize imageSize) {
-		this.pixelSize = imageSize;
-		// pass on to parent
-		if (this.parent != null) {
-			this.parent.setAspect(imageSize);
-		}
-	}
-
-	/**
-	 * Sets the mimetype.
-	 * @param mimetype The mimetype to set
-	 */
-	public void setMimetype(String filetype) {
-		this.mimetype = filetype;
-	}
-
-	/**
-	 * @return ImageFileset
-	 */
-	public ImageFileset getParent() {
-		return parent;
-	}
-
-	/**
-	 * Sets the parent.
-	 * @param parent The parent to set
-	 */
-	public void setParent(ImageFileset parent) {
-		this.parent = parent;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isChecked() {
-		return (pixelSize != null);
-	}
-	
-	/** Returns the aspect ratio of the image (width/height).
-	 * 
-	 * @return
-	 */
-	public float getAspect() {
-		return (pixelSize != null) ? pixelSize.getAspect() : 0;
-	}
-
-}
--- a/servlet/src/digilib/io/ImageFileset.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,414 +0,0 @@
-/* ImageFileset -- digilib image file info class.  
- * Digital Image Library servlet components  
- * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)  
- * 
- * This program is free software; you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.  
- * 
- * Please read license.txt for the full details. A copy of the GPL may be 
- * found at http://www.gnu.org/copyleft/lgpl.html  
- * 
- * You should have received a copy of the GNU General Public License along 
- * with this program; if not, write to the Free Software Foundation, Inc., 
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA  
- */
-
-package digilib.io;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import digilib.image.ImageSize;
-import digilib.io.FileOps.FileClass;
-import digilib.servlet.DigilibConfiguration;
-
-/**
- * @author casties
- */
-public class ImageFileset extends DocuDirent {
-
-	/** this is an image file */
-	protected static FileClass fileClass = FileClass.IMAGE;
-	
-	/** list of files (ImageFile) */
-	private List<ImageFile> list = null;
-
-	/** aspect ratio (width/height) */
-	private float aspect = 0;
-
-	/** resolution of the biggest image (DPI) */
-	private float resX = 0;
-
-	/** resolution of the biggest image (DPI) */
-	private float resY = 0;
-
-	/**
-	 * Creator for empty fileset.
-	 * 
-	 * 
-	 * @param initialCapacity
-	 */
-	public ImageFileset() {
-		list = new ArrayList<ImageFile>();
-	}
-
-	/**
-	 * Constructor with a file and hints.
-	 * 
-	 * The hints are expected to contain 'basedirs' and 'scaledfilext' keys.
-	 * 
-	 * @param file
-	 * @param hints
-	 */
-	public ImageFileset(File file, Map<Integer,Object> hints) {
-		Directory[] dirs = (Directory[]) hints.get(FileOps.HINT_BASEDIRS);
-		int nb = dirs.length;
-		list = new ArrayList<ImageFile>(nb);
-		parent = dirs[0];
-		fill(dirs, file, hints);
-	}
-
-	/**
-	 * Adds an ImageFile to this Fileset.
-	 * 
-	 * The files should be added in the order of higher to lower resolutions.
-	 * The first file is considered the hires "original".
-	 * 
-	 * 
-	 * @param f
-	 *            file to add
-	 * @return true (always)
-	 */
-	public boolean add(ImageFile f) {
-		f.setParent(this);
-		return list.add(f);
-	}
-
-	/**
-	 * The number of image files in this Fileset.
-	 * 
-	 * 
-	 * @return number of image files
-	 */
-	public int size() {
-		return (list != null) ? list.size() : 0;
-	}
-
-	/**
-	 * Gets the default File.
-	 *  
-	 */
-	public File getFile() {
-		return (list != null) ? list.get(0).getFile() : null;
-	}
-
-	/**
-	 * Get the ImageFile at the index.
-	 * 
-	 * 
-	 * @param index
-	 * @return
-	 */
-	public ImageFile get(int index) {
-		return list.get(index);
-	}
-
-	/**
-	 * Get the next smaller ImageFile than the given size.
-	 * 
-	 * Returns the ImageFile from the set that has a width and height smaller or
-	 * equal the given size. Returns null if there isn't any smaller image.
-	 * Needs DocuInfo instance to checkFile().
-	 * 
-	 * 
-	 * @param size
-	 * @param info
-	 * @return
-	 */
-	public ImageFile getNextSmaller(ImageSize size) {
-		for (Iterator<ImageFile> i = getHiresIterator(); i.hasNext();) {
-			ImageFile f = i.next();
-			try {
-				if (!f.isChecked()) {
-					DigilibConfiguration.docuImageIdentify(f);
-				}
-				if (f.getSize().isTotallySmallerThan(size)) {
-					return f;
-				}
-			} catch (IOException e) {
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Get the next bigger ImageFile than the given size.
-	 * 
-	 * Returns the ImageFile from the set that has a width or height bigger or
-	 * equal the given size. Returns null if there isn't any bigger image. Needs
-	 * DocuInfo instance to checkFile().
-	 * 
-	 * 
-	 * @param size
-	 * @param info
-	 * @return
-	 */
-	public ImageFile getNextBigger(ImageSize size) {
-		for (ListIterator<ImageFile> i = getLoresIterator(); i.hasPrevious();) {
-			ImageFile f = i.previous();
-			try {
-				if (!f.isChecked()) {
-					DigilibConfiguration.docuImageIdentify(f);
-				}
-				if (f.getSize().isBiggerThan(size)) {
-					return f;
-				}
-			} catch (IOException e) {
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the biggest ImageFile in the set.
-	 * 
-	 * 
-	 * @return
-	 */
-	public ImageFile getBiggest() {
-		return this.get(0);
-	}
-
-	/**
-	 * Returns the biggest ImageFile in the set.
-	 * 
-	 * 
-	 * @return
-	 */
-	public ImageFile getSmallest() {
-		return this.get(this.size() - 1);
-	}
-
-	/**
-	 * Get an Iterator for this Fileset starting at the highest resolution
-	 * images.
-	 * 
-	 * 
-	 * @return
-	 */
-	public ListIterator<ImageFile> getHiresIterator() {
-		return list.listIterator();
-	}
-
-	/**
-	 * Get an Iterator for this Fileset starting at the lowest resolution
-	 * images.
-	 * 
-	 * The Iterator starts at the last element, so you have to use it backwards
-	 * with hasPrevious() and previous().
-	 * 
-	 * 
-	 * @return
-	 */
-	public ListIterator<ImageFile> getLoresIterator() {
-		return list.listIterator(list.size());
-	}
-
-	/**
-	 * Fill the ImageFileset with files from different base directories.
-	 * 
-	 * 
-	 * @param dirs
-	 *            list of base directories
-	 * @param fl
-	 *            file (from first base dir)
-	 * @param hints
-	 *  
-	 */
-	void fill(Directory[] dirs, File fl, Map<Integer,Object> hints) {
-		int nb = dirs.length;
-		String fn = fl.getName();
-		String baseFn = FileOps.basename(fn);
-		// add the first ImageFile to the ImageFileset
-		add(new ImageFile(fn, this, parent));
-		// iterate the remaining base directories
-		for (int dirIdx = 1; dirIdx < nb; dirIdx++) {
-			if (dirs[dirIdx] == null) {
-				continue;
-			}
-			// read the directory
-			if (dirs[dirIdx].getFilenames() == null) {
-				dirs[dirIdx].readDir();
-			}
-			String[] dirFiles = dirs[dirIdx].getFilenames();
-			// try the same filename as the original
-			int fileIdx = Arrays.binarySearch(dirFiles, fn);
-			if (fileIdx < 0) {
-				// try closest matches without extension
-				fileIdx = -fileIdx - 1;
-				// try idx
-				if ((fileIdx < dirFiles.length)
-						&& (FileOps.basename(dirFiles[fileIdx]).equals(baseFn))) {
-					// idx ok
-				} else if ((fileIdx > 0)
-						&& (FileOps.basename(dirFiles[fileIdx - 1])
-								.equals(baseFn))) {
-					// idx-1 ok
-					fileIdx = fileIdx - 1;
-				} else if ((fileIdx+1 < dirFiles.length)
-						&& (FileOps.basename(dirFiles[fileIdx + 1])
-								.equals(baseFn))) {
-					// idx+1 ok
-					fileIdx = fileIdx + 1;
-				} else {
-					// basename doesn't match
-					continue;
-				}
-			}
-			if (FileOps.classForFilename(dirFiles[fileIdx]) == fileClass) {
-				/* logger.debug("adding file " + dirFiles[fileIdx]
-						+ " to Fileset " + this.getName()); */
-				add(new ImageFile(dirFiles[fileIdx], this, dirs[dirIdx]));
-			}
-		}
-	}
-
-	/**
-	 * Checks metadata and sets resolution in resX and resY.
-	 *  
-	 */
-	public void checkMeta() {
-		if (metaChecked) {
-			return;
-		}
-		if (fileMeta == null) {
-			// try to read metadata file
-			readMeta();
-			if (fileMeta == null) {
-				// try directory metadata
-				((DocuDirectory) parent).checkMeta();
-				if (((DocuDirectory) parent).getDirMeta() != null) {
-					fileMeta = ((DocuDirectory) parent).getDirMeta();
-				} else {
-					// try parent directory metadata
-					DocuDirectory gp = (DocuDirectory) parent.getParent();
-					if (gp != null) {
-						gp.checkMeta();
-						if (gp.getDirMeta() != null) {
-							fileMeta = gp.getDirMeta();
-						}
-					}
-				}
-			}
-		}
-		if (fileMeta == null) {
-			// no metadata available
-			metaChecked = true;
-			return;
-		}
-		metaChecked = true;
-		float dpi = 0;
-		float dpix = 0;
-		float dpiy = 0;
-		float sizex = 0;
-		float sizey = 0;
-		float pixx = 0;
-		float pixy = 0;
-		// DPI is valid for X and Y
-		if (fileMeta.containsKey("original-dpi")) {
-			try {
-				dpi = Float.parseFloat((String) fileMeta.get("original-dpi"));
-			} catch (NumberFormatException e) {
-			}
-			if (dpi != 0) {
-				resX = dpi;
-				resY = dpi;
-				return;
-			}
-		}
-		// DPI-X and DPI-Y
-		if (fileMeta.containsKey("original-dpi-x")
-				&& fileMeta.containsKey("original-dpi-y")) {
-			try {
-				dpix = Float.parseFloat((String) fileMeta
-						.get("original-dpi-x"));
-				dpiy = Float.parseFloat((String) fileMeta
-						.get("original-dpi-y"));
-			} catch (NumberFormatException e) {
-			}
-			if ((dpix != 0) && (dpiy != 0)) {
-				resX = dpix;
-				resY = dpiy;
-				return;
-			}
-		}
-		// SIZE-X and SIZE-Y and PIXEL-X and PIXEL-Y
-		if (fileMeta.containsKey("original-size-x")
-				&& fileMeta.containsKey("original-size-y")
-				&& fileMeta.containsKey("original-pixel-x")
-				&& fileMeta.containsKey("original-pixel-y")) {
-			try {
-				sizex = Float.parseFloat((String) fileMeta
-						.get("original-size-x"));
-				sizey = Float.parseFloat((String) fileMeta
-						.get("original-size-y"));
-				pixx = Float.parseFloat((String) fileMeta
-						.get("original-pixel-x"));
-				pixy = Float.parseFloat((String) fileMeta
-						.get("original-pixel-y"));
-			} catch (NumberFormatException e) {
-			}
-			if ((sizex != 0) && (sizey != 0) && (pixx != 0) && (pixy != 0)) {
-				resX = pixx / (sizex * 100 / 2.54f);
-				resY = pixy / (sizey * 100 / 2.54f);
-				return;
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	public float getResX() {
-		return resX;
-	}
-
-	/**
-	 * @return
-	 */
-	public float getResY() {
-		return resY;
-	}
-
-	/**
-	 * Sets the aspect ratio from an ImageSize.
-	 * 
-	 * 
-	 * @param f
-	 */
-	public void setAspect(ImageSize s) {
-		aspect = s.getAspect();
-	}
-
-	/**
-	 * Returns the aspect ratio.
-	 * 
-	 * Aspect ratio is (width/height). So it's <1 for portrait and >1 for
-	 * landscape.
-	 * 
-	 * 
-	 * @return
-	 */
-	public float getAspect() {
-		return aspect;
-	}
-
-}
\ No newline at end of file
--- a/servlet/src/digilib/io/MetadataMap.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-/**
- * 
- */
-package digilib.io;
-
-import java.util.HashMap;
-
-/** Map for metadata related to files.
- * @author casties
- *
- */
-public class MetadataMap extends HashMap<String, String> {
-
-}
--- a/servlet/src/digilib/io/SVGFile.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* SVGFile -- Class for SVG files
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- * Created on 25.11.2003 by casties
- *
- */
-package digilib.io;
-
-import java.io.File;
-
-import digilib.io.FileOps.FileClass;
-
-/** Class for SVG files.
- * 
- * @author casties
- *
- */
-public class SVGFile extends DocuDirent {
-	/** this is a text file */
-	protected static FileClass fileClass = FileClass.SVG;
-	/** our File instance */
-	protected File file = null;
-	
-	/** Constructor taking a file.
-	 * 
-	 * @param f
-	 */
-	public SVGFile(File f) {
-		this.file = f;
-	}
-
-	/* (non-Javadoc)
-	 * @see digilib.io.DocuDirent#checkMeta()
-	 */
-	public void checkMeta() {
-		// Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see digilib.io.DocuDirent#getFile()
-	 */
-	public File getFile() {
-		return file;
-	}
-
-}
--- a/servlet/src/digilib/io/TextFile.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* TextFile.java -- Class for text files
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- * Created on 15.09.2003 by casties
- *
- */
-package digilib.io;
-
-import java.io.File;
-
-import digilib.io.FileOps.FileClass;
-
-/** Class for text files.
- * 
- * @author casties
- *
- */
-public class TextFile extends DocuDirent {
-	/** this is a text file */
-	protected static FileClass fileClass = FileClass.TEXT;
-	/** our File instance */
-	protected File file = null;
-	
-	/** Constructor taking a file.
-	 * 
-	 * @param f
-	 */
-	public TextFile(File f) {
-		this.file = f;
-	}
-
-	/* (non-Javadoc)
-	 * @see digilib.io.DocuDirent#checkMeta()
-	 */
-	public void checkMeta() {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see digilib.io.DocuDirent#getFile()
-	 */
-	public File getFile() {
-		return file;
-	}
-
-}
--- a/servlet/src/digilib/io/XMLListLoader.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-/* XMLListLoader -- Load an XML list into a Hashtable
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-package digilib.io;
-
-// JAXP packages
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.log4j.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/** Loads a simple XML list into a HashMap.
- * 
- * The XML file has an outer <code>list_tag</code>. Every entry is an 
- * <code>entry_tag</code> with two attributes: the <code>key_att</code>
- * key and the <code>value_att</code> value.
- * 
- * The file is read by the <code>loadURL</code> method, that returns a
- * HashMap with the key-value pairs.
- * 
- * @author casties
- */
-public class XMLListLoader {
-
-	private Logger logger = Logger.getLogger(this.getClass());
-	private String listTag = "list";
-	private String entryTag = "entry";
-	private String keyAtt = "key";
-	private String valueAtt = "value";
-
-	public XMLListLoader() {
-	}
-
-	public XMLListLoader(
-		String list_tag,
-		String entry_tag,
-		String key_att,
-		String value_att) {
-		logger.debug("xmlListLoader("+list_tag+","+entry_tag+","+key_att+","+value_att+")");
-		listTag = list_tag;
-		entryTag = entry_tag;
-		keyAtt = key_att;
-		valueAtt = value_att;
-	}
-
-	/**
-	 *  inner class XMLListParser to be called by the parser
-	 */
-	private class XMLListParser extends DefaultHandler {
-
-		private Map<String, String> listData;
-		private LinkedList<String> tagSpace;
-
-		public Map<String, String> getData() {
-			return listData;
-		}
-
-		// Parser calls this once at the beginning of a document
-		public void startDocument() throws SAXException {
-			listData = new HashMap<String, String>();
-			tagSpace = new LinkedList<String>();
-		}
-
-		// Parser calls this for each element in a document
-		public void startElement(
-			String namespaceURI,
-			String localName,
-			String qName,
-			Attributes atts)
-			throws SAXException {
-			//System.out.println("<"+qName);
-			// open a new namespace
-			tagSpace.addLast(qName);
-
-			// ist it an entry tag?
-			if (qName.equals(entryTag)) {
-				// is it inside a list tag?
-				if ((listTag.length() > 0) && (!tagSpace.contains(listTag))) {
-					logger.error("BOO: Entry "
-							+ entryTag
-							+ " not inside list "
-							+ listTag);
-					throw new SAXParseException(
-						"Entry " + entryTag + " not inside list " + listTag,
-						null);
-				}
-				// get the attributes
-				String key = atts.getValue(keyAtt);
-				String val = atts.getValue(valueAtt);
-				if ((key == null) || (val == null)) {
-					logger.error("BOO: Entry "
-							+ entryTag
-							+ " does not have Attributes "
-							+ keyAtt
-							+ ", "
-							+ valueAtt);
-					throw new SAXParseException(
-						"Entry "
-							+ entryTag
-							+ " does not have Attributes "
-							+ keyAtt
-							+ ", "
-							+ valueAtt,
-						null);
-				}
-				// add the values
-				//System.out.println("DATA: "+key+" = "+val);
-				listData.put(key, val);
-			}
-		}
-
-		public void endElement(
-			String namespaceURI,
-			String localName,
-			String qName)
-			throws SAXException {
-			// exit the namespace
-			tagSpace.removeLast();
-		}
-
-	}
-
-	/**
-	 *  load and parse a file (as URL)
-	 *    returns HashMap with list data
-	 */
-	public Map<String, String> loadURL(String path) throws SAXException, IOException {
-		//System.out.println("loadurl ("+path+")");
-		// Create a JAXP SAXParserFactory and configure it
-		SAXParserFactory spf = SAXParserFactory.newInstance();
-		spf.setNamespaceAware(true);
-
-		SAXParser parser = null;
-		try {
-			// Create a JAXP SAXParser
-			parser = spf.newSAXParser();
-
-		} catch (ParserConfigurationException e) {
-			throw new SAXException(e);
-		}
-
-		// create a list parser (keeps the data!)
-		XMLListParser listParser = new XMLListParser();
-
-		// Tell the SAXParser to parse the XML document
-		parser.parse(path, listParser);
-
-		return listParser.getData();
-	}
-
-}
--- a/servlet/src/digilib/io/XMLMetaLoader.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,287 +0,0 @@
-/* XMLMetaLoader -- Load an XML format metadata into a Hashtable
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-package digilib.io;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.log4j.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class XMLMetaLoader {
-
-	private Logger logger = Logger.getLogger(this.getClass());
-	private String metaTag = "meta";
-	private String fileTag = "file";
-	private String fileNameTag = "name";
-	private String filePathTag = "path";
-	private String imgTag = "img";
-	private String collectTag = "context";
-
-	public XMLMetaLoader() {
-	}
-
-	/**
-	 *  inner class XMLMetaParser to be called by the parser
-	 */
-	private class XMLMetaParser extends DefaultHandler {
-
-		private LinkedList<String> tags;
-		private Map<String, MetadataMap> files;
-		private MetadataMap meta;
-		private StringBuffer content;
-		private boolean collecting;
-		private StringBuffer collectedContent;
-		private String fileName;
-		private String filePath;
-
-		/**
-		 * extracts the elements name from either localName ln or qName qn.
-		 * 
-		 * @param ln localName
-		 * @param qn qName
-		 * @return element name
-		 */
-		private String getName(String ln, String qn) {
-			if (ln != null) {
-				if (ln.length() > 0) {
-					return ln;
-				}
-			}
-			// else it's qName (or nothing)
-			return qn;
-		}
-
-		/**
-		 * returns all attributes as a String
-		 * 
-		 * @param attrs
-		 * @return 
-		 */
-		private String getAttrString(Attributes attrs) {
-			StringBuffer s = new StringBuffer();
-			for (int i = 0; i < attrs.getLength(); i++) {
-				String key = getName(attrs.getLocalName(i), attrs.getQName(i));
-				s.append(" "+key+"=\""+attrs.getValue(i)+"\"");
-			}
-			return s.toString();
-		}
-
-			
-		// Parser calls this once at the beginning of a document
-		public void startDocument() throws SAXException {
-			tags = new LinkedList<String>();
-			files = new HashMap<String, MetadataMap>();
-			collecting = false;
-			collectedContent = null;
-		}
-
-		// Parser calls this for each element in a document
-		public void startElement(
-			String namespaceURI,
-			String localName,
-			String qName,
-			Attributes atts)
-			throws SAXException {
-
-			String name = getName(localName, qName);
-			// open a new tag
-			tags.addLast(name);
-			// start new content (no nesting of tags and content)
-			content = new StringBuffer();
-
-			if (name.equals(metaTag)) {
-				// new meta tag
-				meta = new MetadataMap();
-				collectedContent = new StringBuffer();
-			} else if (name.equals(fileTag)) {
-				// new file tag
-				fileName = null;
-				filePath = null;
-				meta = new MetadataMap();
-				collectedContent = new StringBuffer();
-			} else if (name.equals(collectTag)) {
-				// start collecting
-				collecting = true;
-				if (collectedContent == null) {
-					collectedContent = new StringBuffer();
-				}
-			}
-			
-			// record mode
-			if (collecting) {
-				collectedContent.append("<"+name);
-				collectedContent.append(getAttrString(atts));
-				collectedContent.append(">");
-			}
-		}
-
-		// parser calls this for all tag content (possibly more than once)
-		public void characters(char[] ch, int start, int length)
-			throws SAXException {
-			// append data to current string buffer
-			if (content == null) {
-				content = new StringBuffer();
-			}
-			content.append(ch, start, length);
-		}
-
-		// parser calls this at the end of each element
-		public void endElement(
-			String namespaceURI,
-			String localName,
-			String qName)
-			throws SAXException {
-
-			String name = getName(localName, qName);
-			// exit the tag
-			tags.removeLast();
-			String lastTag = (tags.isEmpty()) ? "" : tags.getLast();
-
-			// was it a file/name tag?
-			if (name.equals(fileNameTag) && lastTag.equals(fileTag)) {
-				// save name as filename
-				if ((content != null) && (content.length() > 0)) {
-					fileName = content.toString().trim();
-				}
-				content = null;
-				return;
-			}
-
-			// was it a file/path tag?
-			if (name.equals(filePathTag) && lastTag.equals(fileTag)) {
-				// save path as filepath 
-				if ((content != null) && (content.length() > 0)) {
-					filePath = content.toString().trim();
-				}
-				content = null;
-				return;
-			}
-
-			// was it a file tag?
-			if (name.equals(fileTag)) {
-				// is there meta to save?
-				if ((meta != null) && (meta.size() > 0)) {
-					// file name is (optional file/path) / file/name
-					String fn = null;
-
-					if (fileName != null) {
-						if (filePath != null) {
-							fn = filePath + "/" + fileName;
-						} else {
-							fn = fileName;
-						}
-					} else {
-						// no file name, no file
-						content = null;
-						return;
-					}
-					// save meta in file list 
-					files.put(fn, meta);
-				}
-				content = null;
-				return;
-			}
-
-			// was it a meta tag outside a file tag?
-			if (name.equals(metaTag) && !tags.contains(fileTag)) {
-				// save meta as dir meta
-				if ((meta != null) && (meta.size() > 0)) {
-					files.put("", meta);
-				}
-				content = null;
-				return;
-			}
-
-			// is this inside an digilib info (=img) tag?
-			if (lastTag.equals(imgTag)) {
-				// then add whatever this is
-				if ((content != null) && (content.length() > 0)) {
-					meta.put(name, content.toString().trim());
-				}
-				content = null;
-				return;
-			}
-
-			// is this the end of collectTag?
-			if (name.equals(collectTag)) {
-				collecting = false;
-				collectedContent.append("</"+collectTag+">\n");
-				// store collected stuff
-				meta.put(collectTag, collectedContent.toString());
-				//logger.debug("collected: '"+collectedContent+"'");
-				content = null;
-				return;
-			}
-
-			// write collected content
-			if (collecting) {
-				String s = "";
-				if ((content != null) && (content.length() > 0)) {
-					s = content.toString().trim();
-				}
-				//logger.debug("collect:"+name+" = "+s);
-				collectedContent.append(s);
-				collectedContent.append("</"+name+">\n");
-				content = null;
-				return;
-			}
-		}
-
-	}
-
-	/**
-	 *  load and parse a file (as URL)
-	 *    returns HashMap with list data
-	 */
-	public Map<String, MetadataMap> loadURL(String path) throws SAXException, IOException {
-		logger.debug("loading meta: "+path);
-		// Create a JAXP SAXParserFactory and configure it
-		SAXParserFactory spf = SAXParserFactory.newInstance();
-		spf.setNamespaceAware(true);
-
-		SAXParser parser = null;
-		try {
-			// Create a JAXP SAXParser
-			parser = spf.newSAXParser();
-
-		} catch (ParserConfigurationException e) {
-			throw new SAXException(e);
-		}
-
-		// create a list parser (keeps the data!)
-		XMLMetaParser listParser = new XMLMetaParser();
-
-		// Tell the SAXParser to parse the XML document
-		parser.parse(path, listParser);
-
-		return listParser.files;
-	}
-
-}
--- a/servlet/src/digilib/pdf/PDFFileWorker.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/**
- * 
- */
-package digilib.pdf;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.concurrent.Callable;
-
-import digilib.image.DocuImage;
-import digilib.servlet.DigilibConfiguration;
-import digilib.servlet.PDFRequest;
-import digilib.util.DigilibJobCenter;
-
-/**
- * @author casties
- *
- */
-public class PDFFileWorker implements Callable<File> {
-	/** the wrapped PDFStreamWorker */
-    protected PDFStreamWorker streamWorker;
-    
-    /** the temporary output file */
-    protected File tempFile;
-
-    /** the final output file */
-    protected File finalFile;
-
-    /** Create new PDFFileWorker.
-     * @param dlConfig
-     * @param tempFile
-     * @param job_info
-     * @param imageJobCenter
-     * @throws FileNotFoundException
-     */
-    public PDFFileWorker(DigilibConfiguration dlConfig, 
-    		File tempFile, File finalFile,
-			PDFRequest job_info,
-			DigilibJobCenter<DocuImage> imageJobCenter) throws FileNotFoundException {
-        this.tempFile = tempFile; 
-    	OutputStream outstream = new FileOutputStream(tempFile);
-    	this.finalFile = finalFile;
-    	this.streamWorker = new PDFStreamWorker(dlConfig, outstream, job_info, imageJobCenter);
-    }
-    
-    public File call() throws Exception {
-    	OutputStream outstream = streamWorker.call();
-    	outstream.flush();
-    	// move temporary to final file
-    	tempFile.renameTo(finalFile);
-        return finalFile;
-    }
-    
-    
-}
--- a/servlet/src/digilib/pdf/PDFStreamWorker.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-package digilib.pdf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.apache.log4j.Logger;
-
-import com.itextpdf.text.Document;
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.PageSize;
-import com.itextpdf.text.pdf.PdfWriter;
-
-import digilib.image.DocuImage;
-import digilib.image.ImageJobDescription;
-import digilib.image.ImageWorker;
-import digilib.servlet.DigilibConfiguration;
-import digilib.servlet.PDFRequest;
-import digilib.util.DigilibJobCenter;
-import digilib.util.NumRange;
-
-public class PDFStreamWorker implements Callable<OutputStream> {
-
-	protected static Logger logger = Logger.getLogger(PDFStreamWorker.class);
-
-	protected DigilibConfiguration dlConfig = null;
-
-	protected Document doc = null;
-
-	protected OutputStream outstream = null;
-
-	protected PDFRequest job_info = null;
-
-	protected DigilibJobCenter<DocuImage> imageJobCenter = null;
-
-	/**
-	 * @param dlConfig
-	 * @param outputfile
-	 * @param job_info
-	 */
-	public PDFStreamWorker(DigilibConfiguration dlConfig, OutputStream outputfile,
-			PDFRequest job_info,
-			DigilibJobCenter<DocuImage> imageJobCenter) {
-		super();
-		this.dlConfig = dlConfig;
-		this.outstream = outputfile;
-		this.job_info = job_info;
-		this.imageJobCenter = imageJobCenter;
-	}
-
-	public OutputStream call() throws Exception {
-		outstream = renderPDF();
-		return outstream;
-	}
-
-	/**
-	 * @throws DocumentException
-	 * @throws InterruptedException
-	 * @throws ExecutionException
-	 * @throws IOException
-	 */
-	protected OutputStream renderPDF() throws DocumentException, InterruptedException,
-			ExecutionException, IOException {
-		// create document object
-		doc = new Document(PageSize.A4, 0, 0, 0, 0);
-		PdfWriter docwriter = null;
-
-		long start_time = System.currentTimeMillis();
-
-		docwriter = PdfWriter.getInstance(doc, outstream);
-
-		setPDFProperties(doc);
-
-		doc.open();
-
-		addTitlePage(doc);
-
-		logger.debug("PDF: " + outstream + " doc.open()ed ("
-				+ (System.currentTimeMillis() - start_time) + "ms)");
-
-		NumRange pgs = job_info.getPages();
-
-		for (int p : pgs) {
-			logger.debug("PDF: adding Image " + p + " to " + outstream);
-			// create ImageJobInformation
-			ImageJobDescription iji = ImageJobDescription.getInstance(job_info, job_info.getDlConfig());
-			iji.setValue("pn", p);
-			addImage(doc, iji);
-			logger.debug("PDF: done adding Image " + p + " to " + outstream);
-		}
-
-		logger.debug("PDF: done adding all Images to " + outstream);
-
-		doc.close();
-		logger.debug("PDF: " + outstream + " doc.close() ("
-				+ (System.currentTimeMillis() - start_time) + "ms)");
-		docwriter.close();
-		return outstream;
-	}
-
-	/**
-	 * Set PDF-Meta-Attributes.
-	 */
-	public Document setPDFProperties(Document doc) {
-		// TODO get proper Information from dlConfig
-		doc.addAuthor(this.getClass().getName());
-		doc.addCreationDate();
-		doc.addKeywords("digilib");
-		doc.addTitle("digilib PDF");
-		doc.addCreator(this.getClass().getName());
-		return doc;
-	}
-
-	/**
-	 * Create a title page and append it to the document (should, of course, be
-	 * called first)
-	 * 
-	 * @throws DocumentException
-	 */
-	public Document addTitlePage(Document doc) throws DocumentException {
-		PDFTitlePage titlepage = new PDFTitlePage(job_info);
-		doc.add(titlepage.getPageContents());
-		doc.newPage();
-		return doc;
-	}
-
-	/**
-	 * adds an image to the document.
-	 * 
-	 * @param doc
-	 * @param iji
-	 * @return
-	 * @throws InterruptedException
-	 * @throws ExecutionException
-	 * @throws IOException
-	 * @throws DocumentException
-	 */
-	public Document addImage(Document doc, ImageJobDescription iji)
-			throws InterruptedException, ExecutionException, IOException,
-			DocumentException {
-		// create image worker
-		ImageWorker job = new ImageWorker(dlConfig, iji);
-		// submit
-		Future<DocuImage> jobTicket = imageJobCenter.submit(job);
-		// wait for result
-		DocuImage img = jobTicket.get();
-		// scale the image
-		Image pdfimg = Image.getInstance(img.getAwtImage(), null);
-		float docW = PageSize.A4.getWidth() - 2 * PageSize.A4.getBorder();
-		float docH = PageSize.A4.getHeight() - 2 * PageSize.A4.getBorder();
-		// TODO: do we really scale this again?
-		pdfimg.scaleToFit(docW, docH);
-		// add to PDF
-		doc.add(pdfimg);
-		return doc;
-	}
-
-}
--- a/servlet/src/digilib/pdf/PDFTitlePage.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-package digilib.pdf;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.log4j.Logger;
-
-import com.itextpdf.text.Anchor;
-import com.itextpdf.text.BadElementException;
-import com.itextpdf.text.Chunk;
-import com.itextpdf.text.Element;
-import com.itextpdf.text.FontFactory;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.Paragraph;
-
-import digilib.io.DigilibInfoReader;
-import digilib.io.FileOpException;
-import digilib.servlet.PDFCache;
-import digilib.servlet.PDFRequest;
-
-/** A class for the generation of title pages for the generated pdf documents.
- * 
- * 
- */
-public class PDFTitlePage {
-	
-	private PDFRequest job_info = null;
-	private DigilibInfoReader info_reader= null;
-	protected static Logger logger = Logger.getLogger("digilib.servlet");
-
-	
-	/**
-	 * Initialize a TitlePage
-	 * @param pdfji
-	 */
-	public PDFTitlePage(PDFRequest pdfji){
-		job_info = pdfji;
-
-		// use MPIWG-style info.xml
-        info_reader = getInfoXmlReader(pdfji);
-	}
-
-    /**
-     * @param pdfji
-     * @return 
-     */
-    protected DigilibInfoReader getInfoXmlReader(PDFRequest pdfji) {
-        try {
-            // try to load ../presentation/info.xml
-            File imgDir = pdfji.getImageJobInformation().getFileDirectory().getDir();
-            File docDir = imgDir.getParentFile();
-            File infoFn = new File(new File(docDir, "presentation"), "info.xml");
-            return new DigilibInfoReader(infoFn.getAbsolutePath());
-        } catch (FileOpException e) {
-            logger.warn("info.xml not found");
-        }
-        return null;
-    }
-	
-	/**
-	 * generate iText-PDF-Contents for the title page
-	 * 
-	 * @return
-	 */
-	public Element getPageContents(){
-		Paragraph content = new Paragraph();
-		content.setAlignment(Element.ALIGN_CENTER);
-
-		// add vertical whitespace
-		for(int i=0; i<8; i++){
-			content.add(Chunk.NEWLINE);
-		}
-		
-		// add logo
-		content.add(getLogo());
-		content.add(Chunk.NEWLINE);
-		content.add(Chunk.NEWLINE);
-
-		// add title
-		Anchor title = new Anchor(new Paragraph(getTitle(),FontFactory.getFont(FontFactory.HELVETICA,16)));
-		String burl = job_info.getImageJobInformation().getAsString("base.url");
-		
-		title.setReference(burl+"digilib.jsp?fn="+job_info.getImageJobInformation().getAsString("fn"));
-		content.add(title);		
-		content.add(Chunk.NEWLINE);
-
-		// add author
-		if(getDate()!=" ")
-			content.add(new Paragraph(getAuthor()+" ("+getDate()+")",FontFactory.getFont(FontFactory.HELVETICA,14)));
-		else
-			content.add(new Paragraph(getAuthor(),FontFactory.getFont(FontFactory.HELVETICA,14)));
-		
-		content.add(Chunk.NEWLINE);
-		
-		// add page numbers
-		content.add(new Paragraph(getPages(), FontFactory.getFont(FontFactory.HELVETICA, 12)));
-
-
-		content.add(Chunk.NEWLINE);
-		content.add(Chunk.NEWLINE);
-		content.add(Chunk.NEWLINE);
-
-		// add digilib version
-		content.add(new Paragraph(getDigilibVersion(),FontFactory.getFont(FontFactory.HELVETICA,10)));
-
-		for(int i=0; i<8; i++){
-			content.add(Chunk.NEWLINE);
-		}
-		Anchor address = new Anchor(
-				new Paragraph(burl+"digilib.jsp?fn="+job_info.getImageJobInformation().getAsString("fn"), FontFactory.getFont(FontFactory.COURIER, 9))
-									);
-		address.setReference(burl+"digilib.jsp?fn="+job_info.getImageJobInformation().getAsString("fn"));
-		
-		content.add(address);
-
-		
-		return content;
-	}
-	
-	/*
-	 * Methods for the different attributes.
-	 * 
-	 */
-	
-	private Image getLogo(){
-		try {
-			URL url = new URL(job_info.getDlConfig().getAsString("pdf-logo"));
-			if(url!=null && !url.equals("")){
-				Image logo = Image.getInstance(url);
-				logo.setAlignment(Element.ALIGN_CENTER);
-				return logo;
-			}
-		} catch (BadElementException e) {
-			logger.error(e.getMessage());
-		} catch (MalformedURLException e) {
-			logger.error(e.getMessage());
-		} catch (IOException e) {
-			logger.error(e.getMessage());
-		}
-		return null;
-	}
-	
-	private String getTitle(){
-		if(info_reader.hasInfo())
-			return info_reader.getAsString("title");
-		else
-			return job_info.getImageJobInformation().getAsString("fn");
-	}
-	
-	private String getAuthor(){
-		if(info_reader.hasInfo())
-			return info_reader.getAsString("author");
-		else
-			return " ";
-	}
-	
-	private String getDate(){
-		if(info_reader.hasInfo())
-			return info_reader.getAsString("date");
-		else
-			return " ";
-	}
-	
-	private String getPages(){
-		return "Pages "+job_info.getAsString("pgs") + " (scan page numbers)";
-	}
-
-	private String getDigilibVersion(){
-		return "Digilib PDFMaker v."+PDFCache.version;
-	}
-	
-}
--- a/servlet/src/digilib/servlet/DigilibConfiguration.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-/*
- * DigilibConfiguration -- Holding all parameters for digilib servlet.
- * 
- * Digital Image Library servlet components
- * 
- * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *  
- */
-
-package digilib.servlet;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-
-import digilib.image.DocuImage;
-import digilib.image.DocuImageImpl;
-import digilib.io.FileOps;
-import digilib.io.ImageFile;
-import digilib.io.XMLListLoader;
-import digilib.util.Parameter;
-import digilib.util.ParameterMap;
-
-/**
- * Class to hold the digilib servlet configuration parameters. The parameters
- * can be read from the digilib-config file and be passed to other servlets or
- * beans. <br>errorImgFileName: image file to send in case of error. <br>
- * denyImgFileName: image file to send if access is denied. <br>baseDirs:
- * array of base directories in order of preference (prescaled versions first).
- * <br>useAuth: use authentication information. <br>authConfPath:
- * authentication configuration file. <br>... <br>
- * 
- * @author casties
- *  
- */
-public class DigilibConfiguration extends ParameterMap {
-
-	/** DocuImage class instance */
-	private static Class<DocuImageImpl> docuImageClass = null;
-
-	/** Log4J logger */
-	private Logger logger = Logger.getLogger("digilib.config");
-
-	/**
-	 * Default constructor defines all parameters and their default values.
-	 *  
-	 */
-	public DigilibConfiguration() {
-		super(20);
-		// we start with a default logger config
-		BasicConfigurator.configure();
-		initParams();
-	}
-
-	/**
-	 * 
-	 */
-	protected void initParams() {
-		/*
-		 * Definition of parameters and default values. System parameters that
-		 * are not read from config file have a type 's'.
-		 */
-
-		// digilib servlet version
-		newParameter(
-			"servlet.version",
-			digilib.servlet.Scaler.getVersion(),
-			null,
-			's');
-		// configuration file location
-		newParameter("servlet.config.file", null, null, 's');
-		// DocuDirCache instance
-		newParameter("servlet.dir.cache", null, null, 's');
-		// DocuImage class instance
-		newParameter(
-			"servlet.docuimage.class",
-			digilib.image.JAIDocuImage.class,
-			null,
-			's');
-		// AuthOps instance for authentication
-		newParameter("servlet.auth.op", null, null, 's');
-        // Executor for image operations
-        newParameter("servlet.worker.imageexecutor", null, null, 's');
-        // Executor for PDF operations
-        newParameter("servlet.worker.pdfexecutor", null, null, 's');
-        // Executor for PDF-image operations
-        newParameter("servlet.worker.pdfimageexecutor", null, null, 's');
-
-		/*
-		 * parameters that can be read from config file have a type 'f'
-		 */
-
-		// image file to send in case of error
-		newParameter(
-			"error-image",
-			new File("img/digilib-error.png"),
-			null,
-			'f');
-		// image file to send if access is denied
-		newParameter(
-			"denied-image",
-			new File("img/digilib-denied.png"),
-			null,
-			'f');
-		// image file to send if image file not found
-		newParameter(
-			"notfound-image",
-			new File("img/digilib-notfound.png"),
-			null,
-			'f');
-		// base directories in order of preference (prescaled versions last)
-		String[] bd = { "/docuserver/images", "/docuserver/scaled/small" };
-		newParameter("basedir-list", bd, null, 'f');
-		// use authentication information
-		newParameter("use-authorization", Boolean.FALSE, null, 'f');
-		// authentication configuration file
-		newParameter("auth-file", new File("digilib-auth.xml"), null, 'f');
-		// sending image files as-is allowed
-		newParameter("sendfile-allowed", Boolean.TRUE, null, 'f');
-		// Type of DocuImage instance
-		newParameter(
-			"docuimage-class",
-			"digilib.image.JAIDocuImage",
-			null,
-			'f');
-		// part of URL used to indicate authorized access
-		newParameter("auth-url-path", "authenticated/", null, 'f');
-		// degree of subsampling on image load
-		newParameter("subsample-minimum", new Float(2f), null, 'f');
-		// default scaling quality
-		newParameter("default-quality", new Integer(1), null, 'f');
-		// use mapping file to translate paths
-		newParameter("use-mapping", Boolean.FALSE, null, 'f');
-		// mapping file location
-		newParameter("mapping-file", new File("digilib-map.xml"), null, 'f');
-		// log4j config file location
-		newParameter("log-config-file", new File("log4j-config.xml"), null, 'f');
-		// maximum destination image size (0 means no limit)
-		newParameter("max-image-size", new Integer(0), null, 'f');
-		// number of working threads
-		newParameter("worker-threads", new Integer(1), null, 'f');
-		// max number of waiting threads
-		newParameter("max-waiting-threads", new Integer(20), null, 'f');
-		// number of pdf-generation threads
-		newParameter("pdf-worker-threads", new Integer(1), null, 'f');
-		// max number of waiting pdf-generation threads
-		newParameter("pdf-max-waiting-threads", new Integer(20), null, 'f');
-		// number of pdf-image generation threads
-		newParameter("pdf-image-worker-threads", new Integer(1), null, 'f');
-		// max number of waiting pdf-image generation threads
-		newParameter("pdf-image-max-waiting-threads", new Integer(10), null, 'f');
-        // PDF generation temp directory
-        newParameter("pdf-temp-dir", "pdf_temp", null, 'f');
-        // PDF generation cache directory
-        newParameter("pdf-cache-dir", "pdf_cache", null, 'f');
-	}
-
-	/**
-	 * Constructor taking a ServletConfig. Reads the config file location from
-	 * an init parameter and loads the config file. Calls <code>readConfig()</code>.
-	 * 
-	 * @see readConfig()
-	 */
-	public DigilibConfiguration(ServletConfig c) throws Exception {
-		this();
-		readConfig(c);
-	}
-
-	/**
-	 * read parameter list from the XML file in init parameter "config-file"
-	 * or file digilib-config.xml
-	 */
-	@SuppressWarnings("unchecked")
-    public void readConfig(ServletConfig c) throws Exception {
-
-		/*
-		 * Get config file name. The file name is first looked for as an init
-		 * parameter, then in a fixed location in the webapp.
-		 */
-		if (c == null) {
-			// no config no file...
-			return;
-		}
-		String fn = c.getInitParameter("config-file");
-		if (fn == null) {
-			fn = ServletOps.getConfigFile("digilib-config.xml", c);
-			if (fn == null) {
-				logger.fatal("readConfig: no param config-file");
-				throw new ServletException("ERROR: no digilib config file!");
-			}
-		}
-		File f = new File(fn);
-		// setup config file list reader
-		XMLListLoader lilo =
-			new XMLListLoader("digilib-config", "parameter", "name", "value");
-		// read config file into HashMap
-		Map<String,String> confTable = lilo.loadURL(f.toURL().toString());
-
-		// set config file path parameter
-		setValue("servlet.config.file", f.getCanonicalPath());
-
-		/*
-		 * read parameters
-		 */
-
-		for (Entry<String, String> confEntry: confTable.entrySet()) {
-			Parameter p = get(confEntry.getKey());
-			if (p != null) {
-				if (p.getType() == 's') {
-					// type 's' Parameters are not overwritten.
-					continue;
-				}
-				if (!p.setValueFromString(confEntry.getValue())) {
-					/*
-					 * automatic conversion failed -- try special cases
-					 */
-
-					// basedir-list
-					if (confEntry.getKey().equals("basedir-list")) {
-						// split list into directories
-						String[] sa = FileOps.pathToArray(confEntry.getValue());
-						if (sa != null) {
-							p.setValue(sa);
-						}
-					}
-				}
-			} else {
-				// parameter unknown -- just add
-				newParameter(confEntry.getKey(), null, confEntry.getValue(), 'f');
-			}
-		}
-		// initialise static DocuImage class instance
-		DigilibConfiguration.docuImageClass = (Class<DocuImageImpl>) Class.forName(getAsString("docuimage-class"));
-	}
-
-	/**
-	 * Creates a new DocuImage instance.
-	 * 
-	 * The type of DocuImage is specified by docuimage-class.
-	 * 
-	 * @return DocuImage
-	 */
-    public static DocuImage getDocuImageInstance() {
-		DocuImageImpl di = null;
-		try {
-			di = docuImageClass.newInstance();
-		} catch (Exception e) {
-		}
-		return di;
-	}
-
-	/**
-     * Check image size and type and store in ImageFile imgf
-     * 
-	 * @param imgf
-	 * @return
-	 * @throws IOException
-	 */
-	public static ImageFile docuImageIdentify(ImageFile imgf) throws IOException {
-	    // use fresh DocuImage instance
-	    DocuImage di = getDocuImageInstance();
-		return di.identify(imgf);
-	}
-	
-	/**
-	 * @return Returns the docuImageClass.
-	 */
-	public static Class<DocuImageImpl> getDocuImageClass() {
-		return docuImageClass;
-	}
-
-	/**
-	 * @param docuImageClass The docuImageClass to set.
-	 */
-	public static void setDocuImageClass(Class<DocuImageImpl> dic) {
-		docuImageClass = dic;
-	}
-}
--- a/servlet/src/digilib/servlet/DigilibRequest.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,542 +0,0 @@
-/*
- * DigilibRequest.java
- *
- * lightweight class carrying all parameters for a request to digilib
- *
-
- Digital Image Library servlet components
-
- Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de),
- Christian Luginbuehl
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- * Created on 27. August 2002, 19:43
- */
-
-package digilib.servlet;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
-import digilib.image.DocuImage;
-import digilib.io.FileOps;
-import digilib.util.OptionsSet;
-import digilib.util.Parameter;
-import digilib.util.ParameterMap;
-
-/**
- * Class holding the parameters of a digilib user request. The parameters are
- * mostly named like the servlet parameters: <br>
- * request_path: url of the page/document. <br>
- * fn: url of the page/document. <br>
- * pn: page number. <br>
- * dw: width of result window in pixels. <br>
- * dh: height of result window in pixels. <br>
- * wx: left edge of image area (float from 0 to 1). <br>
- * wy: top edge of image area (float from 0 to 1). <br>
- * ww: width of image area(float from 0 to 1). <br>
- * wh: height of image area(float from 0 to 1). <br>
- * ws: scale factor. <br>
- * mo: special options like 'fit' for gifs. <br>
- * mk: list of marks. <br>
- * pt: total number of pages (generated by sevlet). <br>
- * baseURL: base URL (from http:// to below /servlet). <br>
- * ...et alii
- * 
- * @author casties
- * 
- */
-public class DigilibRequest extends ParameterMap {
-
-	protected DocuImage image; // internal DocuImage instance for this request
-
-	protected ServletRequest servletRequest; // internal ServletRequest
-
-	public DigilibRequest() {
-		super(30);
-	}
-
-    /**
-     * Creates a new instance of DigilibRequest with parameters from a
-     * ServletRequest. All undefined parameters are set to default values.
-     * 
-     * @param request
-     */
-    public DigilibRequest(ServletRequest request) {
-        super(30);
-        setWithRequest(request);
-        initOptions();
-    }
-
-	/** set up parameters.
-	 * 
-	 */
-	protected void initParams() {
-		/*
-		 * Definition of parameters and default values. Parameter of type 's'
-		 * are for the servlet.
-		 */
-
-		// url of the page/document (second part)
-		newParameter("fn", "", null, 's');
-		// page number
-		newParameter("pn", new Integer(1), null, 's');
-		// width of client in pixels
-		newParameter("dw", new Integer(0), null, 's');
-		// height of client in pixels
-		newParameter("dh", new Integer(0), null, 's');
-		// left edge of image (float from 0 to 1)
-		newParameter("wx", new Float(0), null, 's');
-		// top edge in image (float from 0 to 1)
-		newParameter("wy", new Float(0), null, 's');
-		// width of image (float from 0 to 1)
-		newParameter("ww", new Float(1), null, 's');
-		// height of image (float from 0 to 1)
-		newParameter("wh", new Float(1), null, 's');
-		// scale factor
-		newParameter("ws", new Float(1), null, 's');
-		// special options like 'fit' for gifs
-		newParameter("mo", this.options, null, 's');
-		// rotation angle (degree)
-		newParameter("rot", new Float(0), null, 's');
-		// contrast enhancement factor
-		newParameter("cont", new Float(0), null, 's');
-		// brightness enhancement factor
-		newParameter("brgt", new Float(0), null, 's');
-		// color multiplicative factors
-		newParameter("rgbm", "0/0/0", null, 's');
-		// color additive factors
-		newParameter("rgba", "0/0/0", null, 's');
-		// display dpi resolution (total)
-		newParameter("ddpi", new Float(0), null, 's');
-		// display dpi X resolution
-		newParameter("ddpix", new Float(0), null, 's');
-		// display dpi Y resolution
-		newParameter("ddpiy", new Float(0), null, 's');
-		// scale factor for mo=ascale
-		newParameter("scale", new Float(1), null, 's');
-
-		/*
-		 * Parameters of type 'i' are not exchanged between client and server,
-		 * but are for the servlets or JSPs internal use.
-		 */
-
-		// url of the page/document (first part, may be empty)
-		newParameter("request.path", "", null, 'i');
-		// base URL (from http:// to below /servlet)
-		newParameter("base.url", null, null, 'i');
-		// DocuImage instance for this request
-		newParameter("docu.image", image, null, 'i');
-		image = null;
-		// HttpServletRequest for this request
-		newParameter("servlet.request", servletRequest, null, 'i');
-		servletRequest = null;
-
-		/*
-		 * Parameters of type 'c' are for the clients use
-		 */
-
-		// "real" filename
-		newParameter("img.fn", "", null, 'c');
-		// image dpi x
-		newParameter("img.dpix", new Integer(0), null, 'c');
-		// image dpi y
-		newParameter("img.dpiy", new Integer(0), null, 'c');
-		// hires image size x
-		newParameter("img.pix_x", new Integer(0), null, 'c');
-		// hires image size y
-		newParameter("img.pix_y", new Integer(0), null, 'c');
-		// total number of pages
-		newParameter("pt", new Integer(0), null, 'c');
-		// display level of digilib (0 = just image, 1 = one HTML page
-		// 2 = in frameset, 3 = XUL-'frameset'
-		// 4 = XUL-Sidebar )
-		newParameter("lv", new Integer(2), null, 'c');
-		// marks
-		newParameter("mk", "", null, 'c');
-	}
-
-    /* (non-Javadoc)
-     * @see digilib.servlet.ParameterMap#initOptions()
-     */
-    @Override
-    protected void initOptions() {
-        options = (OptionsSet) getValue("mo");
-    }
-
-	/**
-	 * Populate the request object with data from a ServletRequest.
-	 * 
-	 * 
-	 * @param request
-	 */
-	public void setWithRequest(ServletRequest request) {
-		servletRequest = request;
-		// decide if it's old-style or new-style
-		String qs = ((HttpServletRequest) request).getQueryString();
-		if (qs != null) {
-			if (qs.indexOf("&amp;") > -1) {
-				// &amp; separator
-				setWithParamString(qs, "&amp;");
-			} else if (qs.indexOf(";") > -1) {
-				// ; separator
-				setWithParamString(qs, ";");
-			} else if (request.getParameter("fn") != null) {
-				// standard '&' parameters
-				setWithParamRequest(request);
-			} else {
-				setWithOldString(qs);
-			}
-		}
-		setValue("servlet.request", request);
-		// add path from request
-		setValue("request.path", ((HttpServletRequest) request).getPathInfo());
-		// set the baseURL
-		setBaseURL((HttpServletRequest) request);
-	}
-
-	/**
-	 * Populate a request from a string in the old "++++" parameter form.
-	 * 
-	 * @param queryString
-	 *            String with paramters in the old "+++" form.
-	 */
-	public void setWithOldString(String queryString) {
-		if (queryString == null) {
-			return;
-		}
-		// enable the passing of delimiter to get empty parameters
-		StringTokenizer query = new StringTokenizer(queryString, "+", true);
-		String token;
-		// first parameter FN
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("fn", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// second parameter PN
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("pn", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// third parameter WS
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("ws", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// fourth parameter MO
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("mo", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// fifth parameter MK
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("mk", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// sixth parameter WX
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("wx", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// seventh parameter WY
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("wy", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// eigth parameter WW
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("ww", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-		// ninth parameter WH
-		if (query.hasMoreTokens()) {
-			token = query.nextToken();
-			if (!token.equals("+")) {
-				setValueFromString("wh", token);
-				if (query.hasMoreTokens()) {
-					query.nextToken();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Return the request parameters as a String in the parameter form
-	 * 'fn=/icons&amp;pn=1'. Empty (undefined) fields are not included.
-	 * 
-	 * @return String of request parameters in parameter form.
-	 */
-	public String getAsString() {
-		return getAsString(0);
-	}
-
-	/**
-	 * Return the request parameters of a given type type as a String in the
-	 * parameter form 'fn=/icons&amp;pn=1'. Empty (undefined) fields are not
-	 * included.
-	 * 
-	 * @return String of request parameters in parameter form.
-	 */
-	public String getAsString(int type) {
-		StringBuffer s = new StringBuffer(50);
-		// go through all values
-		for (Parameter p: params.values()) {
-			if ((type > 0) && (p.getType() != type)) {
-				// skip the wrong types
-				continue;
-			}
-			String name = p.getName();
-			/*
-			 * handling special cases
-			 */
-			// request_path adds to fn
-			if (name.equals("fn")) {
-				s.append("&fn=" + getAsString("request.path")
-						+ getAsString("fn"));
-				continue;
-			}
-			/*
-			 * the rest is sent with its name
-			 */
-			// parameters that are not set or internal are not sent
-			if ((!p.hasValue()) || (p.getType() == 'i')) {
-				continue;
-			}
-			s.append("&" + name + "=" + p.getAsString());
-		}
-		// kill first "&"
-		s.deleteCharAt(0);
-		return s.toString();
-	}
-
-	/**
-	 * Returns request parameters in old '++++' form.
-	 * 
-	 * @return String with parameters in old '++++' form.
-	 */
-	public String getAsOldString() {
-		StringBuffer s = new StringBuffer(50);
-		s.append(getAsString("request.path"));
-		s.append(getAsString("fn"));
-		s.append("+" + getAsString("pn"));
-		s.append("+" + getAsString("ws"));
-		s.append("+" + getAsString("mo"));
-		s.append("+" + getAsString("mk"));
-		s.append("+" + getAsString("wx"));
-		s.append("+" + getAsString("wy"));
-		s.append("+" + getAsString("ww"));
-		s.append("+" + getAsString("wh"));
-		return s.toString();
-	}
-
-	/**
-	 * Set request parameters from javax.servlet.ServletRequest. Uses the
-	 * Requests getParameter methods for 'fn=foo' style parameters.
-	 * 
-	 * @param request
-	 *            ServletRequest to get parameters from.
-	 */
-	//@SuppressWarnings("unchecked") // ServletRequest.getParameterNames() returns naked Enumeration
-    public void setWithParamRequest(ServletRequest request) {
-		setValue("servlet.request", request);
-		// go through all request parameters
-		for (Enumeration<String> i = request.getParameterNames(); i.hasMoreElements();) {
-			String name = (String) i.nextElement();
-			// is this a known parameter?
-			if (params.containsKey(name)) {
-				Parameter p = (Parameter) this.get(name);
-				// internal parameters are not set
-				if (p.getType() == 'i') {
-					continue;
-				}
-				p.setValueFromString(request.getParameter(name));
-				continue;
-			}
-			// unknown parameters are just added with type 'r'
-			newParameter(name, null, request.getParameter(name), 'r');
-		}
-		// add path from request
-		setValue("request.path", ((HttpServletRequest) request).getPathInfo());
-	}
-
-	/**
-	 * Set request parameters from query string. Uses the separator string qs to
-	 * get 'fn=foo' style parameters.
-	 * 
-	 * @param qs
-	 *            query string
-	 * @param sep
-	 *            parameter-separator string
-	 */
-	public void setWithParamString(String qs, String sep) {
-		// go through all request parameters
-		String[] qa = qs.split(sep);
-		for (int i = 0; i < qa.length; i++) {
-			// split names and values on "="
-			String[] nv = qa[i].split("=");
-			try {
-				String name = URLDecoder.decode(nv[0], "UTF-8");
-				String val = URLDecoder.decode(nv[1], "UTF-8");
-				// is this a known parameter?
-				if (params.containsKey(name)) {
-					Parameter p = (Parameter) this.get(name);
-					// internal parameters are not set
-					if (p.getType() == 'i') {
-						continue;
-					}
-					p.setValueFromString(val);
-					continue;
-				}
-				// unknown parameters are just added with type 'r'
-				newParameter(name, null, val, 'r');
-			} catch (UnsupportedEncodingException e) {
-				// this shouldn't happen anyway
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Test if option string <code>opt</code> is set. Checks if the substring
-	 * <code>opt</code> is contained in the options string <code>param</code>.
-	 * Deprecated! use hasOption(String opt) for "mo"-options.
-	 * 
-	 * @param opt
-	 *            Option string to be tested.
-	 * @return boolean
-	 */
-	public boolean hasOption(String param, String opt) {
-		String s = getAsString(param);
-		if (s != null) {
-			StringTokenizer i = new StringTokenizer(s, ",");
-			while (i.hasMoreTokens()) {
-				if (i.nextToken().equals(opt)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * The image file path to be accessed.
-	 * 
-	 * The mage file path is assembled from the servlets RequestPath and
-	 * Parameter fn and normalized.
-	 * 
-	 * @return String the effective filepath.
-	 */
-	public String getFilePath() {
-		String s = getAsString("request.path");
-		s += getAsString("fn");
-		return FileOps.normalName(s);
-	}
-
-	/* Property getter and setter */
-
-	/**
-	 * Set the requests base URL parameter from a
-	 * javax.sevlet.http.HttpServletRequest.
-	 * 
-	 * @param request
-	 *            HttpServletRequest to set the base URL.
-	 */
-	public void setBaseURL(javax.servlet.http.HttpServletRequest request) {
-		String baseURL = null;
-		// calculate base URL string from request (minus last part)
-		String s = request.getRequestURL().toString();
-		int eop = s.lastIndexOf("/");
-		if (eop > 0) {
-			baseURL = s.substring(0, eop);
-		} else {
-			// fall back
-			baseURL = "http://" + request.getServerName()
-					+ "/docuserver/digitallibrary";
-		}
-		setValue("base.url", baseURL);
-	}
-
-	/**
-	 * Returns the image.
-	 * 
-	 * @return DocuImage
-	 */
-	public DocuImage getImage() {
-		return image;
-	}
-
-	/**
-	 * Sets the image.
-	 * 
-	 * @param image
-	 *            The image to set
-	 */
-	public void setImage(DocuImage image) {
-		this.image = image;
-		setValue("docu.image", image);
-	}
-
-	/**
-	 * @return
-	 */
-	public ServletRequest getServletRequest() {
-		return servletRequest;
-	}
-
-}
--- a/servlet/src/digilib/servlet/DocumentBean.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,320 +0,0 @@
-/*
- * DocumentBean -- Access control bean for JSP
- *
- * Digital Image Library servlet components
- *
- * Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-package digilib.servlet;
-
-import java.util.List;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-
-import digilib.auth.AuthOpException;
-import digilib.auth.AuthOps;
-import digilib.image.ImageSize;
-import digilib.io.DocuDirCache;
-import digilib.io.DocuDirectory;
-import digilib.io.FileOps.FileClass;
-import digilib.io.ImageFile;
-import digilib.io.ImageFileset;
-
-public class DocumentBean {
-
-	// general logger
-	private static Logger logger = Logger.getLogger("digilib.docubean");
-
-	// AuthOps object to check authorization
-	private AuthOps authOp;
-
-	// use authorization database
-	private boolean useAuthentication = true;
-
-	// path to add for authenticated access
-	private String authURLPath = "";
-
-	// DocuDirCache
-	private DocuDirCache dirCache = null;
-
-	// DigilibConfiguration object
-	private DigilibConfiguration dlConfig;
-
-	// DigilibRequest object
-	private DigilibRequest dlRequest = null;
-
-	/**
-	 * Constructor for DocumentBean.
-	 */
-	public DocumentBean() {
-        logger.debug("new DocumentBean");
-	}
-
-	public DocumentBean(ServletConfig conf) {
-        logger.debug("new DocumentBean");
-		try {
-			setConfig(conf);
-		} catch (Exception e) {
-			logger.fatal("ERROR: Unable to read config: ", e);
-		}
-	}
-
-	public void setConfig(ServletConfig conf) throws ServletException {
-		logger.debug("setConfig");
-		// get our ServletContext
-		ServletContext context = conf.getServletContext();
-		// see if there is a Configuration instance
-		dlConfig = (DigilibConfiguration) context
-				.getAttribute("digilib.servlet.configuration");
-		if (dlConfig == null) {
-			// create new Configuration
-			throw new ServletException("ERROR: No configuration!");
-		}
-
-		// get cache
-		dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-
-		/*
-		 * authentication
-		 */
-		useAuthentication = dlConfig.getAsBoolean("use-authorization");
-		authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
-		authURLPath = dlConfig.getAsString("auth-url-path");
-		if (useAuthentication && (authOp == null)) {
-			throw new ServletException(
-					"ERROR: use-authorization configured but no AuthOp!");
-		}
-	}
-
-	/**
-	 * check if the request must be authorized to access filepath
-	 */
-	public boolean isAuthRequired(DigilibRequest request)
-			throws AuthOpException {
-		logger.debug("isAuthRequired");
-		return useAuthentication ? authOp.isAuthRequired(request) : false;
-	}
-
-	/**
-	 * check if the request is allowed to access filepath
-	 */
-	public boolean isAuthorized(DigilibRequest request) throws AuthOpException {
-		logger.debug("isAuthorized");
-		return useAuthentication ? authOp.isAuthorized(request) : true;
-	}
-
-	/**
-	 * return a list of authorization roles needed for request to access the
-	 * specified path
-	 */
-	public List<String> rolesForPath(DigilibRequest request) throws AuthOpException {
-		logger.debug("rolesForPath");
-		return useAuthentication ? authOp.rolesForPath(request) : null;
-	}
-
-	/**
-	 * check request authorization against a list of roles
-	 */
-	public boolean isRoleAuthorized(List<String> roles, DigilibRequest request) {
-		logger.debug("isRoleAuthorized");
-		return useAuthentication ? authOp.isRoleAuthorized(roles, request)
-				: true;
-	}
-
-	/**
-	 * check for authenticated access and redirect if necessary
-	 */
-	public boolean doAuthentication(HttpServletResponse response)
-			throws Exception {
-        logger.debug("doAuthenication-Method");
-		return doAuthentication(dlRequest, response);
-	}
-
-	/**
-	 * check for authenticated access and redirect if necessary
-	 */
-	public boolean doAuthentication(DigilibRequest request,
-			HttpServletResponse response) throws Exception {
-		logger.debug("doAuthentication");
-		if (!useAuthentication) {
-			// shortcut if no authentication
-			return true;
-		}
-		// check if we are already authenticated
-		if (((HttpServletRequest) request.getServletRequest()).getRemoteUser() == null) {
-			logger.debug("unauthenticated so far");
-			// if not maybe we must?
-			if (isAuthRequired(request)) {
-				logger.debug("auth required, redirect");
-				// we are not yet authenticated -> redirect
-				response.sendRedirect(authURLPath
-						+ ((HttpServletRequest) request.getServletRequest())
-								.getServletPath()
-						+ "?"
-						+ ((HttpServletRequest) request.getServletRequest())
-								.getQueryString());
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Sets the current DigilibRequest. Also completes information in the request.
-	 * 
-	 * @param dlRequest
-	 *            The dlRequest to set.
-	 */
-	public void setRequest(DigilibRequest dlRequest) throws Exception {
-		this.dlRequest = dlRequest;
-		if (dirCache == null) {
-			return;
-		}
-		String fn = dlRequest.getFilePath();
-		// get information about the file
-		ImageFileset fileset = (ImageFileset) dirCache.getFile(fn, dlRequest
-				.getAsInt("pn"), FileClass.IMAGE);
-		if (fileset == null) {
-			return;
-		}
-		// add file name
-		dlRequest.setValue("img.fn", fileset.getName());
-		// add dpi
-		dlRequest.setValue("img.dpix", new Double(fileset.getResX()));
-		dlRequest.setValue("img.dpiy", new Double(fileset.getResY()));
-		// get number of pages in directory
-		DocuDirectory dd = dirCache.getDirectory(fn);
-		if (dd != null) {
-			// add pt
-			dlRequest.setValue("pt", dd.size());
-		}
-		// get original pixel size
-		ImageFile origfile = fileset.getBiggest();
-		// check image for size if mo=hires
-		if ((! origfile.isChecked())&&dlRequest.hasOption("hires")) {
-			logger.debug("pre-checking image!");
-			DigilibConfiguration.docuImageIdentify(origfile);
-		}
-		ImageSize pixsize = origfile.getSize();
-		if (pixsize != null) {
-			// add pixel size
-			dlRequest.setValue("img.pix_x", new Integer(pixsize.getWidth()));
-			dlRequest.setValue("img.pix_y", new Integer(pixsize.getHeight()));
-		}
-	}
-
-	/**
-	 * get the first page number in the directory (not yet functional)
-	 */
-	public int getFirstPage(DigilibRequest request) {
-		logger.debug("getFirstPage");
-		return 1;
-	}
-
-	/**
-	 * get the number of pages/files in the directory
-	 */
-	public int getNumPages() throws Exception {
-		return getNumPages(dlRequest);
-	}
-
-    /**
-     * get the number of image pages/files in the directory
-     */
-    public int getNumPages(DigilibRequest request) throws Exception {
-        return getNumPages(request, FileClass.IMAGE);
-    }
-
-	/**
-	 * get the number of pages/files of type fc in the directory
-	 */
-	public int getNumPages(DigilibRequest request, FileClass fc) throws Exception {
-		logger.debug("getNumPages");
-		DocuDirectory dd = (dirCache != null) ? dirCache.getDirectory(request
-				.getFilePath()) : null;
-		if (dd != null) {
-			return dd.size(fc);
-		}
-		return 0;
-	}
-
-	/**
-	 * Returns the dlConfig.
-	 * 
-	 * @return DigilibConfiguration
-	 */
-	public DigilibConfiguration getDlConfig() {
-		return dlConfig;
-	}
-
-	/**
-	 * returns if the zoom area in the request can be moved
-	 * 
-	 * @return
-	 */
-	public boolean canMoveRight() {
-		float ww = dlRequest.getAsFloat("ww");
-		float wx = dlRequest.getAsFloat("wx");
-		return (ww + wx < 1.0);
-	}
-
-	/**
-	 * returns if the zoom area in the request can be moved
-	 * 
-	 * @return
-	 */
-	public boolean canMoveLeft() {
-		float ww = dlRequest.getAsFloat("ww");
-		float wx = dlRequest.getAsFloat("wx");
-		return ((ww < 1.0) && (wx > 0));
-	}
-
-	/**
-	 * returns if the zoom area in the request can be moved
-	 * 
-	 * @return
-	 */
-	public boolean canMoveUp() {
-		float wh = dlRequest.getAsFloat("wh");
-		float wy = dlRequest.getAsFloat("wy");
-		return ((wh < 1.0) && (wy > 0));
-	}
-
-	/**
-	 * returns if the zoom area in the request can be moved
-	 * 
-	 * @return
-	 */
-	public boolean canMoveDown() {
-		float wh = dlRequest.getAsFloat("wh");
-		float wy = dlRequest.getAsFloat("wy");
-		return (wh + wy < 1.0);
-	}
-
-	/**
-	 * @return Returns the dlRequest.
-	 */
-	public DigilibRequest getRequest() {
-		return dlRequest;
-	}
-
-}
--- a/servlet/src/digilib/servlet/Initialiser.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-/* Initialiser.java -- initalisation servlet for setup tasks
- * 
- * Digital Image Library servlet components
- * 
- * Copyright (C) 2004 Robert Casties (robcast@mail.berlios.de)
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- * 
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *  
- * Created on 18.10.2004
- */
-package digilib.servlet;
-
-import java.io.File;
-import java.io.OutputStream;
-import java.util.List;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-
-import digilib.auth.AuthOps;
-import digilib.auth.XMLAuthOps;
-import digilib.image.DocuImage;
-import digilib.io.AliasingDocuDirCache;
-import digilib.io.DocuDirCache;
-import digilib.io.FileOps.FileClass;
-import digilib.util.DigilibJobCenter;
-
-/**
- * Singleton initalisation servlet for setup tasks and resources.
- * 
- * @author casties
- *  
- */
-@SuppressWarnings("serial")
-public class Initialiser extends HttpServlet {
-
-	/** servlet version */
-	public static final String version = "0.2";
-
-	/** gengeral logger for this class */
-	private static Logger logger = Logger.getLogger("digilib.init");
-
-	/** DocuDirCache instance */
-	DocuDirCache dirCache;
-
-	/** DigilibConfiguration instance */
-	DigilibConfiguration dlConfig;
-
-	/** Executor for digilib image jobs */
-	DigilibJobCenter<DocuImage> imageEx;
-	
-	/** Executor for PDF jobs */
-	DigilibJobCenter<OutputStream> pdfEx;
-	
-	/** Executor for PDF image jobs */
-	DigilibJobCenter<DocuImage> pdfImageEx;
-	
-	/**
-	 * Initialisation on first run.
-	 * 
-	 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-	 */
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config);
-
-		System.out
-				.println("***** Digital Image Library Initialisation Servlet (version "
-						+ version + ") *****");
-
-		// get our ServletContext
-		ServletContext context = config.getServletContext();
-		// see if there is a Configuration instance
-		dlConfig = (DigilibConfiguration) context.getAttribute("digilib.servlet.configuration");
-		if (dlConfig == null) {
-			// create new Configuration
-			try {
-				dlConfig = new DigilibConfiguration(config);
-
-				/*
-				 * further initialization
-				 */
-
-				// set up the logger
-				File logConf = ServletOps.getConfigFile((File) dlConfig
-						.getValue("log-config-file"), config);
-				DOMConfigurator.configure(logConf.getAbsolutePath());
-				dlConfig.setValue("log-config-file", logConf);
-				// say hello in the log file
-				logger
-						.info("***** Digital Image Library Initialisation Servlet (version "
-								+ version + ") *****");
-				// directory cache
-				String[] bd = (String[]) dlConfig.getValue("basedir-list");
-				FileClass[] fcs = { FileClass.IMAGE, FileClass.TEXT };
-				if (dlConfig.getAsBoolean("use-mapping")) {
-					// with mapping file
-					File mapConf = ServletOps.getConfigFile((File) dlConfig
-							.getValue("mapping-file"), config);
-					dirCache = new AliasingDocuDirCache(bd, fcs, mapConf,
-							dlConfig);
-					dlConfig.setValue("mapping-file", mapConf);
-				} else {
-					// without mapping
-					dirCache = new DocuDirCache(bd, fcs, dlConfig);
-				}
-				dlConfig.setValue("servlet.dir.cache", dirCache);
-				// useAuthentication
-				if (dlConfig.getAsBoolean("use-authorization")) {
-					// DB version
-					//authOp = new DBAuthOpsImpl(util);
-					// XML version
-					File authConf = ServletOps.getConfigFile((File) dlConfig
-							.getValue("auth-file"), config);
-					AuthOps authOp = new XMLAuthOps(authConf);
-					dlConfig.setValue("servlet.auth.op", authOp);
-					dlConfig.setValue("auth-file", authConf);
-				}
-				// DocuImage class
-				DocuImage di = DigilibConfiguration.getDocuImageInstance();
-				dlConfig.setValue("servlet.docuimage.class", di.getClass().getName());
-				// digilib worker threads
-				int nt = dlConfig.getAsInt("worker-threads");
-                int mt = dlConfig.getAsInt("max-waiting-threads");
-				imageEx = new DigilibJobCenter<DocuImage>(nt, mt, true, "servlet.worker.imageexecutor");
-                dlConfig.setValue("servlet.worker.imageexecutor", imageEx);				
-				// PDF worker threads
-				int pnt = dlConfig.getAsInt("pdf-worker-threads");
-                int pmt = dlConfig.getAsInt("pdf-max-waiting-threads");
-				pdfEx = new DigilibJobCenter<OutputStream>(pnt, pmt, true, "servlet.worker.pdfexecutor");
-                dlConfig.setValue("servlet.worker.pdfexecutor", pdfEx);				
-				// PDF image worker threads
-				int pint = dlConfig.getAsInt("pdf-image-worker-threads");
-                int pimt = dlConfig.getAsInt("pdf-image-max-waiting-threads");
-				pdfImageEx = new DigilibJobCenter<DocuImage>(pint, pimt, true, "servlet.worker.pdfimageexecutor");
-                dlConfig.setValue("servlet.worker.pdfimageexecutor", pdfImageEx);				
-				// set as the servlets main config
-				context.setAttribute("digilib.servlet.configuration", dlConfig);
-
-			} catch (Exception e) {
-				throw new ServletException(e);
-			}
-		} else {
-			// say hello in the log file
-			logger
-					.info("***** Digital Image Library Initialisation Servlet (version "
-							+ version + ") *****");
-			logger.warn("Already initialised!");
-		}
-	}
-
-    /** clean up local resources
-     * @see javax.servlet.GenericServlet#destroy()
-     */
-    @Override
-    public void destroy() {
-        if (dirCache != null) {
-            // shut down dirCache?
-            dirCache = null;
-        }
-        if (imageEx != null) {
-            // shut down image thread pool
-            List<Runnable> rj = imageEx.shutdownNow();
-            int nrj = rj.size();
-            if (nrj > 0) {
-                logger.error("Still running threads when shutting down image job queue: "+nrj);
-            }
-        }
-        if (pdfEx != null) {
-            // shut down pdf thread pool
-            List<Runnable> rj = pdfEx.shutdownNow();
-            int nrj = rj.size();
-            if (nrj > 0) {
-                logger.error("Still running threads when shutting down PDF job queue: "+nrj);
-            }
-        }
-        if (pdfImageEx != null) {
-            // shut down pdf image thread pool
-            List<Runnable> rj = pdfImageEx.shutdownNow();
-            int nrj = rj.size();
-            if (nrj > 0) {
-                logger.error("Still running threads when shutting down PDF-image job queue: "+nrj);
-            }
-        }
-        super.destroy();
-    }
-
-}
--- a/servlet/src/digilib/servlet/PDFCache.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,327 +0,0 @@
-package digilib.servlet;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.concurrent.Future;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-
-import digilib.image.DocuImage;
-import digilib.pdf.PDFFileWorker;
-import digilib.util.DigilibJobCenter;
-
-/**
- * A class for handling user requests for pdf documents made from digilib images.  
- * 
- * If a document does not already exist, it will be enqueued for generation; if it does exist, it is sent
- * to the user.
- * 
- * @author cmielack
- *
- */
-
-@SuppressWarnings("serial")
-public class PDFCache extends HttpServlet {
-
-    public static String version = "0.3a";
-
-    /** logger for accounting requests */
-    protected static Logger accountlog = Logger.getLogger("account.pdf.request");
-
-    /** gengeral logger for this class */
-    protected static Logger logger = Logger.getLogger("digilib.pdfcache");
-
-    /** logger for authentication related */
-    protected static Logger authlog = Logger.getLogger("digilib.pdf.auth");
-
-	private DigilibConfiguration dlConfig = null;
-	
-	public static String instanceKey = "digilib.servlet.PDFCache";
-	
-	private DigilibJobCenter<File> pdfJobCenter = null;
-	
-	private DigilibJobCenter<DocuImage> pdfImageJobCenter = null;
-	
-	private File cache_directory = new File("cache");  
-	
-	private File temp_directory = new File("pdf_temp");
-	
-	private static String JSP_WIP = "/pdf/wip.jsp";
-	
-	private static String JSP_ERROR = "/pdf/error.jsp";
-	
-	/** document status.
-	 *  DONE: document exists in cache
-	 *  WIP: document is "work in progress"
-	 *  NONEXISTENT: document does not exist in cache and is not in progress
-	 *  ERROR: an error occurred while processing the request
-	 */
-	public static enum PDFStatus {DONE, WIP, NONEXISTENT, ERROR};
-
-	
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config);
-		
-        System.out.println("***** Digital Image Library Image PDF-Cache Servlet (version "
-                + version + ") *****");
-        // say hello in the log file
-        logger.info("***** Digital Image Library Image PDF-Cache Servlet (version "
-                + version + ") *****");
-
-		ServletContext context = getServletContext();
-		dlConfig = (DigilibConfiguration) context.getAttribute("digilib.servlet.configuration");
-		if (dlConfig == null) {
-			// no Configuration
-			throw new ServletException("No Configuration!");
-		}
-	
-		String temp_fn = dlConfig.getAsString("pdf-temp-dir");
-		temp_directory = new File(temp_fn);
-		if (!temp_directory.exists()) {
-			// try to create
-			temp_directory.mkdirs();
-		} else {
-	        // rid the temporary directory of possible incomplete document files
-	        emptyDirectory(temp_directory);
-		}
-		if (!temp_directory.isDirectory()) {
-		    throw new ServletException("Configuration error: problem with pdf-temp-dir="+temp_fn);
-		}
-        
-		String cache_fn = dlConfig.getAsString("pdf-cache-dir");
-       	cache_directory = new File(cache_fn);
-		if (!cache_directory.exists()) {
-			// try to create
-			cache_directory.mkdirs();
-		}
-        if (!cache_directory.isDirectory()) {
-            throw new ServletException("Configuration error: problem with pdf-cache-dir="+cache_fn);
-        }
-
-        pdfJobCenter = (DigilibJobCenter<File>) dlConfig.getValue("servlet.worker.pdfexecutor");
-        pdfImageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig.getValue("servlet.worker.pdfimageexecutor");
-        
-		// register this instance globally
-		context.setAttribute(instanceKey, this);
-		
-	}
-	
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-        accountlog.info("GET from " + request.getRemoteAddr());
-        this.processRequest(request, response);
-    }
-
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-        accountlog.info("POST from " + request.getRemoteAddr());
-        this.processRequest(request, response);
-    }
-    
-	/** 
-	 * clean up any broken and unfinished files from the temporary directory.
-	 */
-	public void emptyDirectory(File dir){
-		File[] temp_files = dir.listFiles();
-		for (File f: temp_files){
-			f.delete();
-		}
-	}
-	
-	
-	public void processRequest(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException {
-
-        if (dlConfig == null) {
-            logger.error("ERROR: No Configuration!");
-            throw new ServletException("NO VALID digilib CONFIGURATION!");
-        }
-
-        String docid = "";
-	    try {
-		// evaluate request ( make a PDFJobDeclaration , get the DocumentId)
-		PDFRequest pdfji = new PDFRequest(request, dlConfig); 
-		
-		docid = pdfji.getDocumentId();
-		
-		// if some invalid data has been entered ...
-		if(!pdfji.checkValidity()) {
-			notifyUser(PDFStatus.ERROR, docid, request, response);
-			return;
-		}
-		
-		PDFStatus status = getStatus(docid);
-		
-        if (status == PDFStatus.NONEXISTENT) {
-        	// not there -- start creation
-            try {
-				createNewPdfDocument(pdfji, docid);
-	            notifyUser(status, docid, request, response);
-	            return;
-			} catch (FileNotFoundException e) {
-				// error in pdf creation
-                logger.error(e.getMessage());
-				notifyUser(PDFStatus.ERROR, docid, request, response);
-				return;
-			}
-        } else if (status == PDFStatus.DONE) {
-        	// pdf created -- send it
-            try {
-                ServletOps.sendFile(getCacheFile(docid), "application/pdf", getDownloadFilename(pdfji), response, logger);
-                return;
-            } catch (Exception e) {
-            	// sending didn't work
-                logger.error(e.getMessage());
-                return;
-            }
-        } else {
-        	// should be work in progress
-            notifyUser(status, docid, request, response);
-            return;
-        }
-	    } catch (Exception e) {
-            // error in pdf creation
-            logger.error(e.getMessage());
-            notifyUser(PDFStatus.ERROR, docid, request, response);
-            return;
-	    }
-	}
-
-    /**
-     * depending on the documents status, redirect the user to the appropriate
-     * waiting or download page.
-     * 
-     * @param status
-     * @param documentid
-     * @param request
-     * @param response
-     */
-    public void notifyUser(PDFStatus status, String documentid,
-            HttpServletRequest request, HttpServletResponse response) {
-
-        String jsp = null;
-
-        if (status == PDFStatus.NONEXISTENT) {
-            // tell the user that the document has to be created before he/she
-            // can download it
-            logger.debug("PDFCache: " + documentid + " has STATUS_NONEXISTENT.");
-            jsp = JSP_WIP;
-        } else if (status == PDFStatus.WIP) {
-            logger.debug("PDFCache: " + documentid + " has STATUS_WIP.");
-            jsp = JSP_WIP;
-
-            // TODO: estimate remaining work time
-            // TODO: tell the user he/she has to wait
-        } else if (status == PDFStatus.DONE) {
-            logger.debug("PDFCache: " + documentid + " has STATUS_DONE.");
-        } else {
-            logger.debug("PDFCache: " + documentid + " has STATUS_ERROR.");
-            jsp = JSP_ERROR;
-        }
-
-        try {
-            // forward to the relevant jsp
-            ServletContext context = getServletContext();
-            RequestDispatcher dispatch = context.getRequestDispatcher(jsp);
-            dispatch.forward(request, response);
-        } catch (ServletException e) {
-            logger.debug(e.getMessage());
-            e.printStackTrace();
-        } catch (IOException e) {
-            logger.debug(e.getMessage());
-            e.printStackTrace();
-        }
-
-    }
-
-	
-	/** check the status of the document corresponding to the documentid */
-	public PDFStatus getStatus(String documentid){
-		// looks into the cache and temp directory in order to find out the status of the document
-		File cached = getCacheFile(documentid);
-		File wip = getTempFile(documentid);
-		if(cached.exists()){
-			return PDFStatus.DONE;
-		} else if (wip.exists()){
-			return PDFStatus.WIP;
-		} else {
-			return PDFStatus.NONEXISTENT;
-		}
-	}
-
-	/** 
-	 * create new thread for pdf generation.
-	 * 
-	 * @param pdfji
-	 * @param filename
-	 * @return 
-	 * @throws FileNotFoundException 
-	 */
-	public Future<File> createNewPdfDocument(PDFRequest pdfji, String filename) throws FileNotFoundException{
-		// start new worker
-		File tempf = this.getTempFile(filename);
-		File finalf = this.getCacheFile(filename);
-		PDFFileWorker job = new PDFFileWorker(dlConfig, tempf, finalf, pdfji, pdfImageJobCenter);
-		// start job
-		Future<File> jobTicket = pdfJobCenter.submit(job);
-		return jobTicket;
-	}
-	
-	
-	/**
-	 * generate the filename the user is going to receive the pdf as
-	 * 
-	 * @param pdfji
-	 * @return
-	 */
-	public String getDownloadFilename(PDFRequest pdfji){
-		// filename example: digilib_example_pgs1-3.pdf
-		String filename;
-		filename =  "digilib_";
-		filename += pdfji.getAsString("fn");
-		filename += "_pgs" + pdfji.getAsString("pgs");
-		filename += ".pdf";
-		
-		return filename;
-	}
-		
-	public File getCacheDirectory(){
-		return cache_directory;
-	}
-	
-	public File getTempDirectory(){
-		return temp_directory;
-	}
-	
-	/** 
-	 * returns a File object based on filename in the temp directory.
-	 * @param filename
-	 * @return
-	 */
-	public File getTempFile(String filename) {
-	    return new File(temp_directory, filename);
-	}
-
-	/** 
-     * returns a File object based on filename in the cache directory.
-     * @param filename
-     * @return
-     */
-    public File getCacheFile(String filename) {
-        return new File(cache_directory, filename);
-    }
-}
--- a/servlet/src/digilib/servlet/PDFRequest.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-package digilib.servlet;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.log4j.Logger;
-
-import digilib.image.ImageJobDescription;
-import digilib.io.DocuDirectory;
-import digilib.io.FileOpException;
-import digilib.io.FileOps.FileClass;
-import digilib.util.NumRange;
-import digilib.util.OptionsSet;
-import digilib.util.ParameterMap;
-
-
-/** 
- * A container class for storing a set of instruction parameters 
- * used for content generator classes like MakePDF.  
- * 
- * 
- * @author cmielack, casties
- *
- */
-public class PDFRequest extends ParameterMap {
-
-	DigilibConfiguration dlConfig = null;
-	NumRange pages = null;
-	/** general logger for this class */
-	protected static Logger logger = Logger.getLogger("digilib.servlet");
-
-	
-	/**
-	 * Initialize the PDFJobInformation
-	 * 
-	 * @param dlcfg			
-	 * 						The DigilibConfiguration. 
-	 */
-	public PDFRequest(DigilibConfiguration dlcfg) {
-		super(30);
-		dlConfig = dlcfg;
-	}
-
-	/**
-	 * Initialize the PDFJobInformation with a request.
-	 * 
-	 * @param dlcfg		The DigilibConfiguration. 		
-	 * @param request
-	 * @throws FileOpException 
-	 */
-	public PDFRequest(HttpServletRequest request, DigilibConfiguration dlcfg) throws FileOpException {
-		super(30);
-		dlConfig = dlcfg;
-		this.setWithRequest(request);
-	}
-
-	
-	protected void initParams() {
-		// page numbers
-		newParameter("pgs", "", null, 's');
-		// url of the page/document (second part)
-		newParameter("fn", "", null, 's');
-		// width of client in pixels
-		newParameter("dw", new Integer(0), null, 's');
-		// height of client in pixels
-		newParameter("dh", new Integer(500), null, 's');
-	}
-	
-	/* (non-Javadoc)
-     * @see digilib.servlet.ParameterMap#initOptions()
-     */
-    @Override
-    protected void initOptions() {
-        options = (OptionsSet) getValue("mo");
-    }
-
-    /**
-	 * Read the request object.
-	 * 
-	 * @param request
-	 * @throws FileOpException 
-	 */
-	public void setWithRequest(HttpServletRequest request) throws FileOpException {
-	    // read matching request parameters for the parameters in this map 
-		for (String k : params.keySet()) {
-			if (request.getParameterMap().containsKey(k)) {
-				setValueFromString(k, request.getParameter(k));
-			}
-		}
-		// process parameters
-		pages = new NumRange(getAsString("pgs"));
-        ImageJobDescription ij = ImageJobDescription.getInstance(this, dlConfig);
-        DocuDirectory dir = ij.getFileDirectory();
-        int dirsize = dir.size(FileClass.IMAGE);
-        pages.setMaxnum(dirsize);
-	}
-	
-	
-	/**
-	 * Generate a filename for the pdf to be created.
-	 * 
-	 * @return
-	 */
-	public String getDocumentId(){
-		String fn = getAsString("fn");
-		String dh = getAsString("dh");
-		String dw = getAsString("dw");
-		String pgs = getAsString("pgs");
-			
-		String id = "fn=" + fn + "&dw=" + dw + "&dh=" + dh + "&pgs=" + pgs + ".pdf";
-		// make safe to use as filename by urlencoding
-		try {
-			id = URLEncoder.encode(id, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			// this shouldn't happen
-		}
-		return id;
-	}
-
-	
-	public ImageJobDescription getImageJobInformation(){
-		return ImageJobDescription.getInstance(this, dlConfig);
-	}
-	
-	
-	public NumRange getPages() {
-	    return pages;
-	}
-	
-	
-	/**
-	 * Check parameters for validity.
-	 * Returns true if no errors are found.
-	 * 
-	 * @return
-	 */
-	public boolean checkValidity(){
-	    if (pages != null) {
-	        return true;
-	    }
-	    return false;
-	} 
-	
-	public DigilibConfiguration getDlConfig(){
-		return dlConfig;
-	}
-	
-}
\ No newline at end of file
--- a/servlet/src/digilib/servlet/Scaler.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,323 +0,0 @@
-package digilib.servlet;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-
-import digilib.auth.AuthOpException;
-import digilib.auth.AuthOps;
-import digilib.image.DocuImage;
-import digilib.image.ImageJobDescription;
-import digilib.image.ImageOpException;
-import digilib.image.ImageWorker;
-import digilib.io.DocuDirCache;
-import digilib.io.DocuDirectory;
-import digilib.io.DocuDirent;
-import digilib.io.FileOps.FileClass;
-import digilib.io.ImageFile;
-import digilib.util.DigilibJobCenter;
-
-@SuppressWarnings("serial")
-public class Scaler extends HttpServlet {
-
-    /** digilib servlet version (for all components) */
-    public static final String version = "1.8.3b";
-
-    /** servlet error codes */
-    public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
-    
-    /** type of error message */
-    public static enum ErrMsg {IMAGE, TEXT, CODE};
-    
-    /** logger for accounting requests */
-    protected static Logger accountlog = Logger.getLogger("account.request");
-
-    /** gengeral logger for this class */
-    protected static Logger logger = Logger.getLogger("digilib.scaler");
-
-    /** logger for authentication related */
-    protected static Logger authlog = Logger.getLogger("digilib.auth");
-
-    /** DocuDirCache instance */
-    DocuDirCache dirCache;
-
-    /** Image executor */
-    DigilibJobCenter<DocuImage> imageJobCenter;
-
-    /** authentication error image file */
-    File denyImgFile;
-
-    /** image error image file */
-    File errorImgFile;
-
-    /** not found error image file */
-    File notfoundImgFile;
-
-    /** send files as is? */
-    boolean sendFileAllowed = true;
-
-    /** DigilibConfiguration instance */
-    DigilibConfiguration dlConfig;
-
-    /** use authorization database */
-    boolean useAuthorization = true;
-
-    /** AuthOps instance */
-    AuthOps authOp;
-
-    /**
-     * Initialisation on first run.
-     * 
-     * @throws ServletException
-     * 
-     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-     */
-    public void init(ServletConfig config) throws ServletException {
-        super.init(config);
-
-        System.out
-                .println("***** Digital Image Library Image Scaler Servlet (version "
-                        + version + ") *****");
-        // say hello in the log file
-        logger.info("***** Digital Image Library Image Scaler Servlet (version "
-                + version + ") *****");
-
-        // get our ServletContext
-        ServletContext context = config.getServletContext();
-        // see if there is a Configuration instance
-        dlConfig = (DigilibConfiguration) context
-                .getAttribute("digilib.servlet.configuration");
-        if (dlConfig == null) {
-            // no Configuration
-            throw new ServletException("No Configuration!");
-        }
-        // set our AuthOps
-        useAuthorization = dlConfig.getAsBoolean("use-authorization");
-        authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
-
-        // DocuDirCache instance
-        dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-
-        // Executor
-        imageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig
-                .getValue("servlet.worker.imageexecutor");
-
-        denyImgFile = ServletOps.getFile(
-                (File) dlConfig.getValue("denied-image"), config);
-        errorImgFile = ServletOps.getFile(
-                (File) dlConfig.getValue("error-image"), config);
-        notfoundImgFile = ServletOps.getFile(
-                (File) dlConfig.getValue("notfound-image"), config);
-        sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
-    }
-
-    /** Returns modification time relevant to the request for caching.
-     * 
-     * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest)
-     */
-    protected long getLastModified(HttpServletRequest request) {
-        accountlog.debug("GetLastModified from " + request.getRemoteAddr()
-                + " for " + request.getQueryString());
-        long mtime = -1;
-        // create new request
-        DigilibRequest dlReq = new DigilibRequest(request);
-		// find the file(set)
-		DocuDirent f = dirCache.getFile(dlReq.getFilePath(),
-		        dlReq.getAsInt("pn"), FileClass.IMAGE);
-        // find the requested file
-        if (f != null) {
-            DocuDirectory dd = (DocuDirectory) f.getParent();
-            mtime = dd.getDirMTime() / 1000 * 1000;
-        }
-        return mtime;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-        accountlog.info("GET from " + request.getRemoteAddr());
-        this.processRequest(request, response);
-    }
-
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-        accountlog.info("POST from " + request.getRemoteAddr());
-        this.processRequest(request, response);
-    }
-    
-
-    /** Service this request using the response.
-     * @param request
-     * @param response
-     * @throws ServletException 
-     */
-    public void processRequest(HttpServletRequest request,
-            HttpServletResponse response) throws ServletException {
-
-        if (dlConfig == null) {
-            logger.error("ERROR: No Configuration!");
-            throw new ServletException("NO VALID digilib CONFIGURATION!");
-        }
-
-        accountlog.debug("request: " + request.getQueryString());
-        logger.debug("request: " + request.getQueryString());
-        long startTime = System.currentTimeMillis();
-
-        // parse request
-        DigilibRequest dlRequest = new DigilibRequest(request);
-        // extract the job information
-        ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
-
-        // type of error reporting
-        ErrMsg errMsgType = ErrMsg.IMAGE;
-        if (dlRequest.hasOption("errtxt")) {
-        	errMsgType = ErrMsg.TEXT;
-        } else if (dlRequest.hasOption("errcode")) {
-        	errMsgType = ErrMsg.CODE;
-        }
-        
-        try {
-        	/*
-        	 *  check if we can fast-track without scaling
-        	 */
-            ImageFile fileToLoad = jobTicket.getFileToLoad();
-
-            // check permissions
-            if (useAuthorization) {
-                // get a list of required roles (empty if no restrictions)
-                List<String> rolesRequired = authOp.rolesForPath(
-                        jobTicket.getFilePath(), request);
-                if (rolesRequired != null) {
-                    authlog.debug("Role required: " + rolesRequired);
-                    authlog.debug("User: " + request.getRemoteUser());
-                    // is the current request/user authorized?
-                    if (!authOp.isRoleAuthorized(rolesRequired, request)) {
-                        // send deny answer and abort
-                        throw new AuthOpException();
-                    }
-                }
-            }
-
-            // if requested, send image as a file
-            if (sendFileAllowed && jobTicket.getSendAsFile()) {
-                String mt = null;
-                if (jobTicket.hasOption("rawfile")) {
-                    mt = "application/octet-stream";
-                }
-                logger.debug("Sending RAW File as is.");
-                ServletOps.sendFile(fileToLoad.getFile(), mt, null, response, logger);
-                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
-                return;
-            }
-
-            // if possible, send the image without actually having to transform it
-            if (! jobTicket.isTransformRequired()) {
-                logger.debug("Sending File as is.");
-                ServletOps.sendFile(fileToLoad.getFile(), null, null, response, logger);
-                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
-                return;
-            }
-
-            // check load of workers
-            if (imageJobCenter.isBusy()) {
-                logger.error("Servlet overloaded!");
-                response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
-                return;
-            }
-            // create job
-            ImageWorker job = new ImageWorker(dlConfig, jobTicket);
-            // submit job
-            Future<DocuImage> jobResult = imageJobCenter.submit(job);
-            // wait for result
-            DocuImage img = jobResult.get();
-            // send image
-            ServletOps.sendImage(img, null, response, logger);
-            logger.debug("Job Processing Time: "
-                    + (System.currentTimeMillis() - startTime) + "ms");
-
-        } catch (ImageOpException e) {
-            logger.error(e.getClass() + ": " + e.getMessage());
-            digilibError(errMsgType, Error.IMAGE, null, response);
-        } catch (IOException e) {
-            logger.error(e.getClass() + ": " + e.getMessage());
-            digilibError(errMsgType, Error.FILE, null, response);
-        } catch (AuthOpException e) {
-            logger.error(e.getClass() + ": " + e.getMessage());
-            digilibError(errMsgType, Error.AUTH, null, response);
-        } catch (InterruptedException e) {
-            logger.error(e.getClass() + ": " + e.getMessage());
-        } catch (ExecutionException e) {
-            logger.error(e.getClass() + ": " + e.getMessage());
-            String causeMsg = e.getCause().getMessage();
-            logger.error("caused by: " + causeMsg);
-            digilibError(errMsgType, Error.IMAGE, causeMsg, response);
-        }
-
-    }
-
-    /**
-     * Sends an error to the client as text or image.
-     * 
-     * @param type
-     * @param error
-     * @param msg
-     * @param response
-     */
-    public void digilibError(ErrMsg type, Error error, String msg,
-            HttpServletResponse response) {
-        try {
-            File img = null;
-            int status = 0;
-            if (error == Error.AUTH) {
-                if (msg == null) {
-                    msg = "ERROR: Unauthorized access!";
-                }
-                img = denyImgFile;
-                status = HttpServletResponse.SC_FORBIDDEN;
-            } else if (error == Error.FILE) {
-                if (msg == null) {
-                    msg = "ERROR: Image file not found!";
-                }
-                img = notfoundImgFile;
-                status = HttpServletResponse.SC_NOT_FOUND;
-            } else {
-                if (msg == null) {
-                    msg = "ERROR: Other image error!";
-                }
-                img = this.errorImgFile;
-                status = HttpServletResponse.SC_BAD_REQUEST;
-            }
-            if (type == ErrMsg.TEXT) {
-                ServletOps.htmlMessage(msg, response);
-            } else if (type == ErrMsg.CODE) {
-                response.sendError(status, msg);
-            } else if (img != null) {
-                // default: image
-                ServletOps.sendFile(img, null, null, response, logger);
-            }
-        } catch (Exception e) {
-            logger.error("Error sending error!", e);
-        }
-
-    }
-
-    public static String getVersion() {
-        return version;
-    }
-
-}
--- a/servlet/src/digilib/servlet/ServletOps.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-/*
- * ServletOps -- Servlet utility class
- * 
- * Digital Image Library servlet components
- * 
- * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Please read license.txt for the full details. A copy of the GPL may be found
- * at http://www.gnu.org/copyleft/lgpl.html
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- *  
- */
-
-package digilib.servlet;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.StringTokenizer;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-
-import digilib.image.DocuImage;
-import digilib.image.ImageOpException;
-import digilib.io.FileOps;
-
-public class ServletOps {
-
-    private static Logger logger = Logger.getLogger("servlet.op");
-
-    /**
-     * convert a string with a list of pathnames into an array of strings using
-     * the system's path seperator string
-     */
-    public static String[] getPathArray(String paths) {
-        // split list into directories
-        StringTokenizer dirs = new StringTokenizer(paths,
-                java.io.File.pathSeparator);
-        int n = dirs.countTokens();
-        if (n < 1) {
-            return null;
-        }
-        // add directories into array
-        String[] pathArray = new String[n];
-        for (int i = 0; i < n; i++) {
-            pathArray[i] = dirs.nextToken();
-        }
-        return pathArray;
-    }
-
-    /**
-     * get a real File for a web app File.
-     * 
-     * If the File is not absolute the path is appended to the base directory of
-     * the web-app.
-     * 
-     * @param file
-     * @param sc
-     * @return
-     */
-    public static File getFile(File f, ServletConfig sc) {
-        // is the filename absolute?
-        if (!f.isAbsolute()) {
-            // relative path -> use getRealPath to resolve in WEB-INF
-            String fn = sc.getServletContext().getRealPath(f.getPath());
-            f = new File(fn);
-        }
-        return f;
-    }
-
-    /**
-     * get a real file name for a web app file pathname.
-     * 
-     * If filename starts with "/" its treated as absolute else the path is
-     * appended to the base directory of the web-app.
-     * 
-     * @param filename
-     * @param sc
-     * @return
-     */
-    public static String getFile(String filename, ServletConfig sc) {
-        File f = new File(filename);
-        // is the filename absolute?
-        if (!f.isAbsolute()) {
-            // relative path -> use getRealPath to resolve in WEB-INF
-            filename = sc.getServletContext().getRealPath(filename);
-        }
-        return filename;
-    }
-
-    /**
-     * get a real File for a config File.
-     * 
-     * If the File is not absolute the path is appended to the WEB-INF directory
-     * of the web-app.
-     * 
-     * @param file
-     * @param sc
-     * @return
-     */
-    public static File getConfigFile(File f, ServletConfig sc) {
-        String fn = f.getPath();
-        // is the filename absolute?
-        if (f.isAbsolute()) {
-            // does it exist?
-            if (f.canRead()) {
-                // fine
-                return f;
-            } else {
-                // try just the filename as relative
-                fn = f.getName();
-            }
-        }
-        // relative path -> use getRealPath to resolve in WEB-INF
-        String newfn = sc.getServletContext().getRealPath("WEB-INF/" + fn);
-        f = new File(newfn);
-        return f;
-    }
-
-    /**
-     * get a real file name for a config file pathname.
-     * 
-     * If filename starts with "/" its treated as absolute else the path is
-     * appended to the WEB-INF directory of the web-app.
-     * 
-     * @param filename
-     * @param sc
-     * @return
-     */
-    public static String getConfigFile(String filename, ServletConfig sc) {
-        File f = new File(filename);
-        // is the filename absolute?
-        if (!f.isAbsolute()) {
-            // relative path -> use getRealPath to resolve in WEB-INF
-            filename = sc.getServletContext()
-                    .getRealPath("WEB-INF/" + filename);
-        }
-        return filename;
-    }
-
-    /**
-     * print a servlet response and exit
-     */
-    public static void htmlMessage(String msg, HttpServletResponse response)
-            throws IOException {
-        htmlMessage("Scaler", msg, response);
-    }
-
-    /**
-     * print a servlet response and exit
-     */
-    public static void htmlMessage(String title, String msg,
-            HttpServletResponse response) throws IOException {
-        response.setContentType("text/html; charset=iso-8859-1");
-        PrintWriter out = response.getWriter();
-        out.println("<html>");
-        out.println("<head><title>" + title + "</title></head>");
-        out.println("<body>");
-        out.println("<p>" + msg + "</p>");
-        out.println("</body></html>");
-    }
-
-    /**
-     * Transfers an image file as-is with the mime type mt.
-     * 
-     * The local file is copied to the <code>OutputStream</code> of the
-     * <code>ServletResponse</code>. If mt is null then the mime-type is
-     * auto-detected with mimeForFile.
-     * 
-     * @param f
-     *            Image file to be sent.
-     * @param mt
-     *            mime-type of the file.
-     * @param name
-     *            name of the download file (for application/x)
-     * @param res
-     *            ServletResponse where the image file will be sent.
-     * @throws ImageOpException
-     * @throws ServletException
-     *             Exception on sending data.
-     */
-    public static void sendFile(File f, String mt, String name,
-            HttpServletResponse response) throws ImageOpException,
-            ServletException {
-        // use default logger
-        ServletOps.sendFile(f, mt, name, response, ServletOps.logger);
-    }
-
-    /**
-     * Transfers an image file as-is with the mime type mt.
-     * 
-     * The local file is copied to the <code>OutputStream</code> of the
-     * <code>ServletResponse</code>. If mt is null then the mime-type is
-     * auto-detected with mimeForFile.
-     * @param f
-     *            Image file to be sent.
-     * @param mt
-     *            mime-type of the file.
-     * @param name 
-     *            name of the download file (for application/x)
-     * @param res
-     *            ServletResponse where the image file will be sent.
-     * @param logger
-     *            Logger to use
-     * @throws ImageOpException
-     * @throws ServletException Exception on sending data.
-     */
-    public static void sendFile(File f, String mt, String name, HttpServletResponse response, Logger logger)
-            throws ImageOpException, ServletException {
-        logger.debug("sendRawFile(" + mt + ", " + f + ")");
-        if (mt == null) {
-            // auto-detect mime-type
-            mt = FileOps.mimeForFile(f);
-            if (mt == null) {
-                throw new ImageOpException("Unknown file type.");
-            }
-        }
-        response.setContentType(mt);
-        // open file
-        if (mt.startsWith("application")) {
-            if (name == null) {
-                // no download name -- use filename
-                name = f.getName();
-            }
-            response.addHeader("Content-Disposition", "attachment; filename=\""+name+"\"");
-        }
-        try {
-            FileInputStream inFile = new FileInputStream(f);
-            OutputStream outStream = response.getOutputStream();
-            response.setContentLength( (int) f.length());
-            byte dataBuffer[] = new byte[4096];
-            int len;
-            while ((len = inFile.read(dataBuffer)) != -1) {
-                // copy out file
-                outStream.write(dataBuffer, 0, len);
-                outStream.flush();
-            }
-            response.flushBuffer();
-            inFile.close();
-        } catch (IOException e) {
-            logger.error("Error sending file:", e);
-            throw new ServletException("Error sending file:", e);
-        }
-    }
-
-    /**
-     * Write image img to ServletResponse response.
-     * 
-     * @param img
-     * @param mimeType
-     * @param response
-     * @throws ImageOpException
-     * @throws ServletException Exception on sending data.
-     */
-    public static void sendImage(DocuImage img, String mimeType,
-            HttpServletResponse response) throws ImageOpException,
-            ServletException {
-        ServletOps.sendImage(img, mimeType, response, ServletOps.logger);
-    }
-
-    /**
-     * Write image img to ServletResponse response.
-     * 
-     * @param img
-     * @param mimeType
-     * @param response
-     * @param logger
-     * @throws ImageOpException
-     * @throws ServletException Exception on sending data.
-     */
-    public static void sendImage(DocuImage img, String mimeType,
-            HttpServletResponse response, Logger logger) throws ImageOpException,
-            ServletException {
-        try {
-            OutputStream outstream = response.getOutputStream();
-            // setup output -- if mime type is set use that otherwise
-            // if source is JPG then dest will be JPG else it's PNG
-            if (mimeType == null) {
-                mimeType = img.getMimetype();
-            }
-            if ((mimeType.equals("image/jpeg") || mimeType.equals("image/jp2") || mimeType
-                    .equals("image/fpx"))) {
-                mimeType = "image/jpeg";
-            } else {
-                mimeType = "image/png";
-            }
-            // write the image
-            response.setContentType(mimeType);
-            img.writeImage(mimeType, outstream);
-            outstream.flush();
-        } catch (IOException e) {
-            logger.error("Error sending image:", e);
-            throw new ServletException("Error sending image:", e);
-        } finally {
-            img.dispose();
-        }
-    }
-
-}
\ No newline at end of file
--- a/servlet/src/digilib/servlet/Texter.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-/* Texter.java -- Servlet for displaying text  
- * Digital Image Library servlet components  
- * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
- *  
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.  Please read license.txt for the full details. A copy of
- * the GPL may be found at http://www.gnu.org/copyleft/lgpl.html  
- * You should have received a copy of the GNU General Public License along with this
- * program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA  
- * 
- * Created on 15.09.2003 by casties  
- */
-
-package digilib.servlet;
-
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-
-import digilib.auth.AuthOps;
-import digilib.image.ImageOpException;
-import digilib.io.DocuDirCache;
-import digilib.io.FileOpException;
-import digilib.io.FileOps;
-import digilib.io.FileOps.FileClass;
-import digilib.io.TextFile;
-
-/**
- * Servlet for displaying text
- * 
- * 
- * @author casties
- *  
- */
-public class Texter extends HttpServlet {
-
-	/** Servlet version */
-	public static String tlVersion = "0.1b2";
-
-	/** DigilibConfiguration instance */
-	DigilibConfiguration dlConfig = null;
-
-	/** general logger */
-	Logger logger = Logger.getLogger("digilib.texter");
-
-    /** logger for accounting requests */
-    protected static Logger accountlog = Logger.getLogger("account.texter.request");
-
-	/** FileOps instance */
-	FileOps fileOp;
-
-	/** AuthOps instance */
-	AuthOps authOp;
-
-	/** ServletOps instance */
-	ServletOps servletOp;
-
-	/** DocuDirCache instance */
-	DocuDirCache dirCache;
-
-	/** use authentication */
-	boolean useAuthentication = false;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-	 */
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config);
-
-		System.out.println("***** Digital Image Library Text Servlet (version "
-				+ tlVersion + ") *****");
-
-		// get our ServletContext
-		ServletContext context = config.getServletContext();
-		// see if there is a Configuration instance
-		dlConfig = (DigilibConfiguration) context
-				.getAttribute("digilib.servlet.configuration");
-		if (dlConfig == null) {
-			// no Configuration
-			throw new ServletException("No Configuration!");
-		}
-		// say hello in the log file
-		logger.info("***** Digital Image Library Text Servlet (version "
-				+ tlVersion + ") *****");
-
-		// set our AuthOps
-		useAuthentication = dlConfig.getAsBoolean("use-authorization");
-		authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
-		// DocuDirCache instance
-		dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest,
-	 *      javax.servlet.http.HttpServletResponse)
-	 */
-	protected void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-        accountlog.info("GET from " + request.getRemoteAddr());
-		// do the processing
-		processRequest(request, response);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest,
-	 *      javax.servlet.http.HttpServletResponse)
-	 */
-	protected void doPost(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-        accountlog.info("POST from " + request.getRemoteAddr());
-		// do the processing
-		processRequest(request, response);
-	}
-
-    protected void processRequest(HttpServletRequest request,
-            HttpServletResponse response) throws ServletException, IOException {
-
-        /*
-         * request parameters
-         */
-        // create new request with defaults
-        DigilibRequest dlRequest = new DigilibRequest(request);
-        try {
-            /*
-             * find the file to load/send
-             */
-            TextFile f = getTextFile(dlRequest, "/txt");
-            if (f != null) {
-                ServletOps.sendFile(f.getFile(), null, null, response, logger);
-            } else {
-                f = getTextFile(dlRequest, "");
-                if (f != null) {
-                    ServletOps.sendFile(f.getFile(), null, null, response, logger);
-                } else {
-                    response.sendError(HttpServletResponse.SC_NOT_FOUND,
-                            "Text-File not found!");
-                    // ServletOps.htmlMessage("No Text-File!", response);
-                }
-            }
-
-        } catch (ImageOpException e) {
-            // most likely wrong file format...
-            logger.error("ERROR sending text file: ", e);
-            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
-        }
-    }
-	
-
-	/**
-	 * Looks for a file in the given subDirectory.
-	 * 
-	 * @param dlRequest
-	 *            The received request which has the file path.
-	 * @param subDirectory
-	 *            The subDirectory of the file path where the file should
-	 *            be found.
-	 * @return The wanted Textfile or null if there wasn't a file.
-	 */
-
-	private TextFile getTextFile(DigilibRequest dlRequest, String subDirectory) {
-		String loadPathName = dlRequest.getFilePath() + subDirectory;
-		// find the file(set)
-		return (TextFile) dirCache.getFile(loadPathName, dlRequest
-				.getAsInt("pn"), FileClass.TEXT);
-	}
-}
\ No newline at end of file
--- a/servlet/src/digilib/util/DigilibJobCenter.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/** Wrapper around ExecutionService.
- * 
- */
-package digilib.util;
-
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadPoolExecutor;
-
-import org.apache.log4j.Logger;
-
-/** Wrapper around ExecutionService.
- * 
- * @author casties
- *
- */
-public class DigilibJobCenter<V> {
-    /** general logger for this class */
-    private static Logger logger = Logger.getLogger("digilib.jobcenter");
-    /** ExecutorService */
-    private ExecutorService executor;
-    /** max number of running threads */
-    private int maxThreads = 1;
-    /** max number of waiting threads */
-    private int maxQueueLen = 50;
-    /** label for this job center */
-    private String label = "";
-    
-    /** Create a DigilibJobcenter with the given number of threads and queue length.
-     * If prestart=true it starts the threads in the thread pool.
-     * 
-     * @param maxThreads
-     * @param maxQueueLen
-     * @param prestart
-     * @param label
-     */
-    public DigilibJobCenter(int maxThreads, int maxQueueLen, boolean prestart, String label) {
-        super();
-        this.label = (label != null) ? label : "";
-        this.maxThreads = maxThreads;
-        this.maxQueueLen = maxQueueLen;
-        executor = Executors.newFixedThreadPool(maxThreads);
-        if (prestart) {
-            // prestart threads so Tomcat's leak protection doesn't complain
-            int st = ((ThreadPoolExecutor)executor).prestartAllCoreThreads();
-            logger.debug(label+" prestarting threads: "+st);
-        }
-    }
-    
-    /** Submit job to execute
-     * 
-     * @param job
-     * @return Future to control the job
-     */
-    public Future<V> submit(Callable<V> job) {
-        return executor.submit(job);
-    }
-
-    /** Returns if the service is overloaded.
-     *  
-     * @return
-     */
-    public boolean isBusy() {
-        int jql = getWaitingJobs();
-        int jrl = getRunningJobs();
-        logger.debug(label+" isBusy: waiting jobs="+jql+" running jobs="+jrl);
-        return (jql > maxQueueLen);
-    }
-    
-    /** Returns the number of currently running jobs.
-     * @return
-     */
-    public int getRunningJobs() {
-        return ((ThreadPoolExecutor)executor).getActiveCount();
-    }
-    
-    /** Returns the number of currently waiting jobs.
-     * @return
-     */
-    public int getWaitingJobs() {
-        BlockingQueue<Runnable> jq = ((ThreadPoolExecutor)executor).getQueue();
-        int jql = jq.size();
-        return jql;
-    }
-
-    public void setMaxThreads(int maxThreads) {
-        this.maxThreads = maxThreads;
-    }
-
-    public int getMaxThreads() {
-        return maxThreads;
-    }
-
-    public void setMaxQueueLen(int maxQueueLen) {
-        this.maxQueueLen = maxQueueLen;
-    }
-
-    public int getMaxQueueLen() {
-        return maxQueueLen;
-    }
-
-    /** Shuts down the Executor. 
-     * Tries to stop running threads and returns a list of waiting threads.
-     * 
-     * @return
-     */
-    public List<Runnable> shutdownNow() {
-        return executor.shutdownNow();
-    }
-
-}
--- a/servlet/src/digilib/util/NumRange.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/**
- * 
- */
-package digilib.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author casties
- * 
- */
-public class NumRange implements Iterable<Integer> {
-
-    private Integer start = 1;
-    private Integer end = Integer.MAX_VALUE;
-    private List<Integer> list = null;
-    private Integer maxnum = null;
-
-    /**
-     * @param start
-     * @param end
-     */
-    public NumRange(Integer start, Integer end) {
-        this.start = start;
-        this.end = end;
-    }
-
-    /**
-     * @param range
-     */
-    public NumRange(String range) {
-        parseString(range);
-    }
-
-    /**
-     * @param range
-     */
-    public NumRange(String range, Integer max) {
-        this.maxnum = max;
-        parseString(range);
-    }
-
-
-    public void parseString(String pages) {
-
-        ArrayList<Integer> pgs = new ArrayList<Integer>();
-
-        String intervals[] = pages.split(",");
-
-        // convert the page-interval-strings into a list containing every single
-        // page
-        for (String interval : intervals) {
-            if (interval.contains("-")) {
-                String nums[] = interval.split("-");
-                int start = Integer.valueOf(nums[0]);
-                if (nums.length > 1) {
-                    // second number is end of range
-                    int end = Integer.valueOf(nums[1]);
-                    if (intervals.length == 1) {
-                        // optimized case of just one interval
-                        this.start = start;
-                        this.end = end;
-                        this.list = null;
-                        return;
-                    }
-                    for (int i = start; i <= end; i++) {
-                        // add all numbers to list
-                        pgs.add(i);
-                    }
-                } else {
-                    // second number missing: range to infinity
-                    pgs.add(start);
-                    pgs.add(Integer.MAX_VALUE);
-                }
-            } else {
-                // single number
-                pgs.add(Integer.valueOf(interval));
-            }
-        }
-        if (intervals.length > 1) {
-            Collections.sort(pgs);
-        }
-        list = pgs;
-    }
-
-    public int getStart() {
-        if (list == null) {
-            return start;
-        } else {
-            return list.get(0);
-        }
-    }
-
-    public int getEnd() {
-        Integer last;
-        if (list == null) {
-            last = end;
-        } else {
-            last = list.get(list.size() - 1);
-        }
-        if (maxnum == null) {
-            return last;
-        } else {
-            return Math.min(last, maxnum);
-        }
-    }
-
-    public Iterator<Integer> iterator() {
-        if (list == null) {
-            // return count-based iterator
-            return new Iterator<Integer>() {
-                // anonymous inner Iterator class
-                private int num = getStart();
-                private int end = getEnd();
-
-                public boolean hasNext() {
-                    return (num <= end);
-                }
-
-                public Integer next() {
-                    return num++;
-                }
-
-                public void remove() {
-                    // don't do this
-                }
-            };
-        } else {
-            // return list-based iterator
-            return new Iterator<Integer>() {
-                // anonymous inner Iterator class
-                private int listidx = 0;
-                private int listend = list.size();
-                private int num = getStart();
-                private int end = getEnd();
-
-                public boolean hasNext() {
-                    return (num <= end);
-                }
-
-                public Integer next() {
-                    if (listidx < listend - 1) {
-                        num = list.get(listidx++);
-                        return num;
-                    } else if (listidx == listend - 1) {
-                        // last element in list
-                        int n = list.get(listidx++);
-                        if (n == Integer.MAX_VALUE) {
-                            // open end -- continue
-                            num++;
-                            return num++;
-                        } else {
-                            num = n;
-                            return num++;
-                        }
-                    } else {
-                        return num++;
-                    }
-                }
-
-                public void remove() {
-                    // don't do this
-                }
-            };
-        }
-    }
-
-    public void setMaxnum(Integer maxnum) {
-        this.maxnum = maxnum;
-    }
-
-}
--- a/servlet/src/digilib/util/OptionsSet.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/**
- * 
- */
-package digilib.util;
-
-import java.util.HashSet;
-import java.util.StringTokenizer;
-
-/**
- * @author casties
- *
- */
-@SuppressWarnings("serial")
-public class OptionsSet extends HashSet<String> {
-
-	protected String optionSep = ",";
-	
-	public OptionsSet() {
-		super();
-	}
-
-	/** Constructor with String of options.
-	 * @param s
-	 */
-	public OptionsSet(String s) {
-		super();
-		parseString(s);
-	}
-
-	/** Adds all options from String to Set.
-	 * @param s
-	 */
-	public void parseString(String s) {
-		if (s != null) {
-			StringTokenizer i = new StringTokenizer(s, optionSep);
-			while (i.hasMoreTokens()) {
-				String opt = i.nextToken();
-				this.add(opt);
-			}
-		}
-	}
-	
-	public boolean hasOption(String opt) {
-		return this.contains(opt);
-	}
-
-	public String toString() {
-		StringBuffer b = new StringBuffer();
-		for (String s: this) {
-			if (b.length() > 0) {
-				b.append(optionSep);
-			}
-			b.append(s);			
-		}
-		return b.toString();
-	}
-	
-	
-	public String getOptionSep() {
-		return optionSep;
-	}
-
-	public void setOptionSep(String optionSep) {
-		this.optionSep = optionSep;
-	}
-
-}
--- a/servlet/src/digilib/util/Parameter.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/* Parameter -- General digilib parameter class.
-
- Digital Image Library servlet components
-
- Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
- This program is free software; you can redistribute  it and/or modify it
- under  the terms of  the GNU General  Public License as published by the
- Free Software Foundation;  either version 2 of the  License, or (at your
- option) any later version.
- 
- Please read license.txt for the full details. A copy of the GPL
- may be found at http://www.gnu.org/copyleft/lgpl.html
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- *
- * Created on 02.09.2003 by casties
- * 
- */
-package digilib.util;
-
-import java.io.File;
-import java.io.IOException;
-
-
-/**
- * General digilib parameter class.
- * 
- * @author casties
- *  
- */
-public class Parameter {
-	/** real value */
-	protected Object value = null;
-
-	/** default value */
-	protected Object defval = null;
-
-	/** parameter name (e.g. in config file) */
-	protected String name = null;
-
-	/** parameter type */
-	protected int type = 0;
-
-	/**
-	 * Default constructor.
-	 *  
-	 */
-	public Parameter() {
-		super();
-	}
-
-	/**
-	 * Constructor with name, default, and value.
-	 * 
-	 * @param value
-	 * @param defval
-	 */
-	public Parameter(String name, Object defval, Object value) {
-		this.name = name;
-		this.value = value;
-		this.defval = defval;
-	}
-
-	/**
-	 * Constructor with name, default, value, and type.
-	 * 
-	 * @param value
-	 * @param defval
-	 */
-	public Parameter(String name, Object defval, Object value, int type) {
-		this.name = name;
-		this.value = value;
-		this.defval = defval;
-		this.type = type;
-	}
-
-	/**
-	 * Is the value valid.
-	 * 
-	 * @return
-	 */
-	public boolean hasValue() {
-		return (value != null);
-	}
-
-	/**
-	 * Try to set the value from a String.
-	 * 
-	 * Tries to convert the String to the same type as the default value. Sets
-	 * the value anyway if the default is null. Returns if the value could be
-	 * set.
-	 * 
-	 * @param val
-	 * @return
-	 */
-	public boolean setValueFromString(String val) {
-		if (val == null) {
-			val = "";
-		}
-		// no default matches all
-		if (defval == null) {
-			this.value = val;
-			return true;
-		}
-		Class<? extends Object> c = defval.getClass();
-		// take String as is
-		if (c == String.class) {
-			this.value = val;
-			return true;
-		}
-		// set File
-		if (c == File.class) {
-			this.value = new File(val);
-			return true;
-		}
-		// set Options
-		if (c == OptionsSet.class) {
-			this.value = new OptionsSet(val);
-			return true;
-		}
-		// set Boolean if string == "true"
-		if (c == Boolean.class) {
-			this.value = new Boolean(val.compareToIgnoreCase("true") == 0);
-			return true;
-		}
-		try {
-			// set Integer
-			if (c == Integer.class) {
-				this.value = new Integer(Integer.parseInt(val));
-				return true;
-			}
-			// set Float
-			if (c == Float.class) {
-				this.value = new Float(Float.parseFloat(val));
-				return true;
-			}
-		} catch (NumberFormatException e) {
-		}
-		// then it's unknown
-		return false;
-	}
-
-	/**
-	 * Get the default as Object.
-	 * 
-	 * @return
-	 */
-	public Object getDefault() {
-		return defval;
-	}
-
-	/**
-	 * Set the default.
-	 * 
-	 * @param defval
-	 */
-	public void setDefault(Object defval) {
-		this.defval = defval;
-	}
-
-	/**
-	 * Get the value as Object.
-	 * 
-	 * Returns the default if the value is not set.
-	 * 
-	 * @return
-	 */
-	public Object getValue() {
-		return (value != null) ? value : defval;
-	}
-
-	public int getAsInt() {
-		Integer i = (Integer) getValue();
-		return (i != null) ? i.intValue() : 0;
-	}
-
-	public float getAsFloat() {
-		Float f = (Float) getValue();
-		return (f != null) ? f.floatValue() : 0f;
-	}
-
-	public String getAsString() {
-		Object s = getValue();
-		if (s == null) {
-			return "";
-		}
-		if (s.getClass() == File.class) {
-			try {
-				return ((File) s).getCanonicalPath();
-			} catch (IOException e) {
-				return "ERR: " + s.toString();
-			}
-		}
-		return s.toString();
-	}
-
-	public boolean getAsBoolean() {
-		Boolean b = (Boolean) getValue();
-		return (b != null) ? b.booleanValue() : false;
-	}
-
-	public String[] parseAsArray(String separator) {
-		String s = getAsString();
-		String[] sa = s.split(separator);
-		return sa;
-	}
-
-	public float[] parseAsFloatArray(String separator) {
-		String s = getAsString();
-		String[] sa = s.split(separator);
-		float[] fa = null;
-		try {
-			int n = sa.length;
-			fa = new float[n];
-			for (int i = 0; i < n; i++) {
-				float f = Float.parseFloat(sa[i]);
-				fa[i] = f;
-			}
-		} catch (Exception e) {
-		}
-
-		return fa;
-	}
-
-	/**
-	 * Set the value.
-	 * 
-	 * @param value
-	 */
-	public void setValue(Object value) {
-		this.value = value;
-	}
-
-	/**
-	 * Set the value.
-	 * 
-	 * @param value
-	 */
-	public void setValue(int value) {
-		this.value = new Integer(value);
-	}
-
-	/**
-	 * Set the value.
-	 * 
-	 * @param value
-	 */
-	public void setValue(float value) {
-		this.value = new Float(value);
-	}
-
-	/**
-	 * @return
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return
-	 */
-	public int getType() {
-		return type;
-	}
-
-	/**
-	 * @param type
-	 */
-	public void setType(int type) {
-		this.type = type;
-	}
-
-}
--- a/servlet/src/digilib/util/ParameterMap.java	Tue Jan 18 12:58:09 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,322 +0,0 @@
-/* ParameterMap.java -- HashMap of Parameters.
-
-  Digital Image Library servlet components
-
-  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
-
-  This program is free software; you can redistribute  it and/or modify it
-  under  the terms of  the GNU General  Public License as published by the
-  Free Software Foundation;  either version 2 of the  License, or (at your
-  option) any later version.
-   
-  Please read license.txt for the full details. A copy of the GPL
-  may be found at http://www.gnu.org/copyleft/lgpl.html
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- * Created on 02.09.2003 by casties
- *
- */
-package digilib.util;
-
-import java.util.HashMap;
-
-
-/** HashMap of digilib.servlet.Parameter's.
- * 
- * Keys are Strings. Values are Parameters.
- * 
- * @author casties
- *
- */
-public class ParameterMap {
-
-	protected HashMap<String, Parameter> params;
-	
-	protected OptionsSet options;
-	
-	/** Default constructor.
-	 * 
-	 */
-	public ParameterMap() {
-		params = new HashMap<String, Parameter>();
-		options = new OptionsSet();
-		initParams();
-	}
-
-	/** Constructor with initial size.
-	 * @param size
-	 */
-	public ParameterMap(int size) {
-		params = new HashMap<String, Parameter>(size);
-		options = new OptionsSet();
-		initParams();
-	}
-
-	/** Shallow copy constructor.
-	 * Be warned that the maps are only cloned i.e. keys and values are shared!
-	 * @param pm
-	 */
-	@SuppressWarnings("unchecked")
-	public static ParameterMap cloneInstance(ParameterMap pm) {
-		ParameterMap newPm = new ParameterMap();
-		// clone params to this map
-		newPm.params = (HashMap<String, Parameter>) pm.params.clone();
-		newPm.options = (OptionsSet) pm.options.clone();
-		return newPm;
-	}
-
-	
-	/** Creates new ParameterMap by merging Parameters from another ParameterMap.
-	 * @param pm
-	 * @return
-	 */
-	public static ParameterMap getInstance(ParameterMap pm) {
-		ParameterMap newPm = new ParameterMap();
-		// add all params to this map
-		newPm.params.putAll(pm.params);
-		newPm.initOptions();
-		return newPm;
-	}
-	
-	/** set up parameters
-	 * 
-	 */
-	protected void initParams() {
-		// no default parameters
-	}
-	
-	/** set up options
-	 * 
-	 */
-	protected void initOptions() {
-		// no default options
-	}
-	
-	/** Get the Parameter with the corresponding key.
-	 * 
-	 * Returns null if no element is associated with key.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Parameter get(String key) {
-		return params.get(key);
-	}
-
-	/** Get the Parameter with the corresponding key.
-	 * 
-	 * Returns null if no element is associated with key.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public Object getValue(String key) {
-		Parameter p = params.get(key);
-		return (p != null) ? p.getValue() : null;
-	}
-	
-	/** Get the Parameter with the corresponding key.
-	 * 
-	 * Returns null if no element is associated with key.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public String getAsString(String key) {
-		Parameter p = params.get(key);
-		return (p != null) ? p.getAsString() : "";
-	}
-
-	/** Get the Parameter with the corresponding key.
-	 * 
-	 * Returns null if no element is associated with key.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public int getAsInt(String key) {
-		Parameter p = params.get(key);
-		return (p != null) ? p.getAsInt() : 0;
-	}
-
-	/** Get the Parameter with the corresponding key.
-	 * 
-	 * Returns null if no element is associated with key.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public float getAsFloat(String key) {
-		Parameter p = params.get(key);
-		return (p != null) ? p.getAsFloat() : 0f;
-	}
-
-	/** Get the Parameter with the corresponding key.
-	 * 
-	 * Returns null if no element is associated with key.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public boolean getAsBoolean(String key) {
-		Parameter p = params.get(key);
-		return (p != null) ? p.getAsBoolean() : false;
-	}
-
-	/** Returns if the Parameter's value has been set.
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public boolean hasValue(String key) {
-		Parameter p = params.get(key);
-		return (p != null) ? p.hasValue() : false;
-	}
-	
-	/** Add the Parameter to the map with a certain key.
-	 * 
-	 * Returns the value that was previously associated with key. 
-	 * 
-	 * @param key
-	 * @param val
-	 * @return
-	 */
-	public Parameter put(String key, Parameter val) {
-		return params.put(key, val);
-	}
-
-	/** Add the Parameter val to the map, using val's name.
-	 * 
-	 * Returns the value that was previously associated with val's name. 
-	 * 
-	 * @param val
-	 * @return
-	 */
-	public Parameter put(Parameter val) {
-		return params.put(val.getName(), val);
-	}
-	
-	/** Add a new Parameter with name, default and value.
-	 * 
-	 * Returns the key that was previously associated with name. 
-	 * 
-	 * @param name
-	 * @param def
-	 * @param val
-	 * @return
-	 */
-	public Parameter newParameter(String name, Object def, Object val) {
-		Parameter p = new Parameter(name, def, val);
-		return params.put(name, p);
-	}
-
-	/** Add a new Parameter with name, default, value and type.
-	 * 
-	 * Returns the key that was previously associated with name. 
-	 * 
-	 * @param name
-	 * @param def
-	 * @param val
-	 * @param type
-	 * @return
-	 */
-	public Parameter newParameter(String name, Object def, Object val, int type) {
-		Parameter p = new Parameter(name, def, val, type);
-		return params.put(name, p);
-	}
-
-	/** Set the value of an existing parameter.
-	 * 
-	 * Sets the value and returns true if the parameter exists.
-	 * 
-	 * @param key
-	 * @param val
-	 * @return
-	 */
-	public boolean setValue(String key, Object val) {
-		Parameter p = params.get(key);
-		if (p != null) {
-			p.setValue(val);
-			return true;
-		}
-		return false;
-	}
-
-	/** Set the value of an existing parameter.
-	 * 
-	 * Sets the value and returns true if the parameter exists.
-	 * 
-	 * @param key
-	 * @param val
-	 * @return
-	 */
-	public boolean setValue(String key, int val) {
-		Parameter p = params.get(key);
-		if (p != null) {
-			p.setValue(val);
-			return true;
-		}
-		return false;
-	}
-
-	/** Set the value of an existing parameter.
-	 * 
-	 * Sets the value and returns true if the parameter exists.
-	 * 
-	 * @param key
-	 * @param val
-	 * @return
-	 */
-	public boolean setValue(String key, float val) {
-		Parameter p = params.get(key);
-		if (p != null) {
-			p.setValue(val);
-			return true;
-		}
-		return false;
-	}
-
-	/** Set the value of an existing parameter.
-	 * 
-	 * Sets the value and returns true if the parameter exists.
-	 * 
-	 * @param key
-	 * @param val
-	 * @return
-	 */
-	public boolean setValueFromString(String key, String val) {
-		Parameter p = params.get(key);
-		if (p != null) {
-			p.setValueFromString(val);
-			return true;
-		}
-		return false;
-	}
-	
-	/** Returns of the option has been set.
-	 * @param opt
-	 * @return
-	 */
-	public boolean hasOption(String opt) {
-		return options.hasOption(opt);
-	}
-
-	public HashMap<String, Parameter> getParams() {
-		return params;
-	}
-
-	public void setParams(HashMap<String, Parameter> params) {
-		this.params = params;
-	}
-
-	public OptionsSet getOptions() {
-		return options;
-	}
-
-	public void setOptions(OptionsSet options) {
-		this.options = options;
-	}
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/auth/AuthOpException.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,33 @@
+/*  AuthOpException -- Authentication exception class
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ */
+
+package digilib.auth;
+
+public class AuthOpException extends Exception {
+
+	private static final long serialVersionUID = 4908131122710826645L;
+
+	public AuthOpException() {
+	}
+
+	public AuthOpException(String s) {
+		super(s);
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/auth/AuthOps.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,115 @@
+/*  AuthOps -- Authentication interface class
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+package digilib.auth;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import digilib.servlet.DigilibRequest;
+
+/** Class of operations requiring authentication. */
+public interface AuthOps {
+
+	/** Test if the request must be authorized to access the filepath.
+	 *
+	 * Information about the user is taken from the ServletRequest.
+	 * @param filepath filepath to be accessed.
+	 * @param request ServletRequest with user information.
+	 * @throws AuthOpException Exception thrown on error.
+	 * @return true if the user request must be authorized.
+	 */
+	public boolean isAuthRequired(String filepath, HttpServletRequest request)
+		throws AuthOpException;
+
+	/** Test if the request must be authorized to access the filepath.
+	 *
+	 * Information about the user is taken from the DigilibRequest.
+	 * @param request DigilibRequest with user information.
+	 * @throws AuthOpException Exception thrown on error.
+	 * @return true if the user request must be authorized.
+	 */
+	public boolean isAuthRequired(DigilibRequest request)
+		throws AuthOpException;
+
+	/** Test if the request is allowed to access filepath.
+	 * 
+	 * @param filepath filepath to be acessed.
+	 * @param request Request with user information.
+	 * @throws AuthOpException Exception thrown on error.
+	 * @return true if the request is allowed.
+	 */
+	public boolean isAuthorized(String filepath, HttpServletRequest request)
+		throws AuthOpException;
+
+	/** Test if the request is allowed to access filepath.
+	 * 
+	 * @param request Request with user information.
+	 * @throws AuthOpException Exception thrown on error.
+	 * @return true if the request is allowed.
+	 */
+	public boolean isAuthorized(DigilibRequest request)
+		throws AuthOpException;
+
+	/** Authorization roles needed for request.
+	 *
+	 * Returns the list of authorization roles that are needed to access the
+	 * specified path. No list means the path is free.
+	 *
+	 * The location information of the request is also considered.
+	 *
+	 * @param filepath filepath to be accessed.
+	 * @param request ServletRequest with address information.
+	 * @throws AuthOpException Exception thrown on error.
+	 * @return List of Strings with role names.
+	 */
+	public List<String> rolesForPath(String filepath, HttpServletRequest request)
+		throws AuthOpException;
+
+	/** Authorization roles needed for request.
+	 *
+	 * Returns the list of authorization roles that are needed to access the
+	 * specified path. No list means the path is free.
+	 *
+	 * The location information of the request is also considered.
+	 *
+	 * @param request DigilibRequest with address information.
+	 * @throws AuthOpException Exception thrown on error.
+	 * @return List of Strings with role names.
+	 */
+	public List<String> rolesForPath(DigilibRequest request)
+		throws AuthOpException;
+
+	/** Test request authorization against a list of roles.
+	 * @param roles List of Strings with role names.
+	 * @param request ServletRequest with address information.
+	 * @return true if the user information in the request authorizes one of the roles.
+	 */
+	public boolean isRoleAuthorized(List<String> roles, HttpServletRequest request);
+
+	/** Test request authorization against a list of roles.
+	 * @param roles List of Strings with role names.
+	 * @param request ServletRequest with address information.
+	 * @return true if the user information in the request authorizes one of the roles.
+	 */
+	public boolean isRoleAuthorized(List<String> roles, DigilibRequest request);
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/auth/AuthOpsImpl.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,131 @@
+/*  AuthOps -- Authentication class implementation
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+package digilib.auth;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+
+import digilib.servlet.DigilibRequest;
+
+/** Basic implementation of AuthOps interface.
+ *
+ * Provides basic implementations. Only rolesForPath needs to be implemented
+ * by specific implementations.
+ */
+public abstract class AuthOpsImpl implements AuthOps {
+
+	/** general logger for this class */
+	protected Logger logger = Logger.getLogger(this.getClass());
+	
+  /** Default constructor. */  
+  public AuthOpsImpl() {
+    try {
+      init();
+    } catch (AuthOpException e) {
+    }
+  }
+
+
+  /** Test if the request is allowed to access filepath.
+   * @param filepath filepath to be acessed.
+   * @param request Request with user information.
+   * @throws AuthOpException Exception thrown on error.
+   * @return true if the request is allowed.
+   */
+  public boolean isAuthRequired(String filepath, HttpServletRequest request) throws AuthOpException {
+    // check permissions
+    List<String> rolesRequired = rolesForPath(filepath, request);
+    return (rolesRequired != null);
+  }
+
+  /**
+   * @see digilib.auth.AuthOps#isAuthRequired(digilib.servlet.DigilibRequest)
+   */
+  public boolean isAuthRequired(DigilibRequest request)
+	  throws AuthOpException {
+		// check permissions
+		List<String> rolesRequired = rolesForPath(request);
+		return (rolesRequired != null);
+  }
+
+  /** Return authorization roles needed for request.
+   *
+   * Returns a list of authorization roles that would be allowed to access the
+   * specified path. The location information of the request is considered also.
+   * @param filepath filepath to be accessed.
+   * @param request ServletRequest with address information.
+   * @throws AuthOpException Exception thrown on error.
+   * @return List of Strings with role names.
+   */
+  public boolean isAuthorized(String filepath, HttpServletRequest request) throws AuthOpException {
+    List<String> rolesAllowed = rolesForPath(filepath, request);
+    return isRoleAuthorized(rolesAllowed, request);
+  }
+
+  /**
+   * @see digilib.auth.AuthOps#isAuthorized(digilib.servlet.DigilibRequest)
+   */
+  public boolean isAuthorized(DigilibRequest request)
+	  throws AuthOpException {
+		List<String> rolesAllowed = rolesForPath(request);
+		return isRoleAuthorized(rolesAllowed, request);
+  }
+
+  /** Test request authorization against a list of roles.
+   * @param roles List of Strings with role names.
+   * @param request ServletRequest with address information.
+   * @return true if the user information in the request authorizes one of the roles.
+   */
+  public boolean isRoleAuthorized(List<String> roles, HttpServletRequest request) {
+    for (String s: roles) {
+      logger.debug("Testing role: "+s);
+      if (request.isUserInRole(s)) {
+      	logger.debug("Role Authorized");
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * @see digilib.auth.AuthOps#isRoleAuthorized(java.util.List, digilib.servlet.DigilibRequest)
+   */
+  public boolean isRoleAuthorized(List<String> roles, DigilibRequest request) {
+	for (String s: roles) {
+	  logger.debug("Testing role: "+s);
+	  if (((HttpServletRequest)request.getServletRequest()).isUserInRole(s)) {
+	  	logger.debug("Role Authorized");
+		return true;
+	  }
+	}
+	return false;
+  }
+
+  public abstract void init() throws AuthOpException;
+
+  public abstract List<String> rolesForPath(String filepath, HttpServletRequest request) throws AuthOpException;
+
+  public abstract List<String> rolesForPath(DigilibRequest request) throws AuthOpException;
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/auth/XMLAuthOps.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,168 @@
+/* XMLAuthOps -- Authentication class implementation using XML files
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+package digilib.auth;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import digilib.servlet.DigilibRequest;
+import digilib.util.HashTree;
+import digilib.util.XMLListLoader;
+
+/** Implementation of AuthOps using XML files.
+ *
+ * The configuration file is read by an XMLListLoader into HashTree objects for 
+ * authentication paths and IP numbers.
+ */
+public class XMLAuthOps extends AuthOpsImpl {
+
+	private File configFile;
+	private HashTree authPaths;
+	private HashTree authIPs;
+
+	/** Constructor taking an XML config file.
+	 *
+	 * @param u utils object
+	 * @param confFile Configuration file.
+	 * @throws AuthOpException Exception thrown on error.
+	 */
+	public XMLAuthOps(File confFile) throws AuthOpException {
+		configFile = confFile;
+		init();
+	}
+
+	/** Set configuration file.
+	 *
+	 * @param confFile XML config file.
+	 * @throws AuthOpException Exception thrown on error.
+	 */
+	public void setConfig(File confFile) throws AuthOpException {
+		configFile = confFile;
+		init();
+	}
+
+	/** Initialize.
+	 *
+	 * Read configuration files and setup authentication arrays.
+	 *
+	 * @throws AuthOpException Exception thrown on error.
+	 */
+	public void init() throws AuthOpException {
+		logger.debug("xmlauthops.init (" + configFile + ")");
+		Map<String, String> pathList = null;
+		Map<String, String> ipList = null;
+		try {
+			// load authPaths
+			XMLListLoader pathLoader =
+				new XMLListLoader("digilib-paths", "path", "name", "role");
+			pathList = pathLoader.loadURL(configFile.toURL().toString());
+			// load authIPs
+			XMLListLoader ipLoader =
+				new XMLListLoader("digilib-addresses", "address", "ip", "role");
+			ipList = ipLoader.loadURL(configFile.toURL().toString());
+		} catch (Exception e) {
+			throw new AuthOpException(
+				"ERROR loading authorization config file: " + e);
+		}
+		if ((pathList == null) || (ipList == null)) {
+			throw new AuthOpException("ERROR unable to load authorization config file!");
+		}
+		// setup path tree
+		authPaths = new HashTree(pathList, "/", ",");
+		// setup ip tree
+		authIPs = new HashTree(ipList, ".", ",");
+	}
+
+	/** Return authorization roles needed for request.
+	 *
+	 * Returns the list of authorization roles that are needed to access the
+	 * specified path. No list means the path is free.
+	 *
+	 * The location information of the request is also considered.
+	 *
+	 * @param filepath filepath to be accessed.
+	 * @param request ServletRequest with address information.
+	 * @throws AuthOpException Exception thrown on error.
+	 * @return List of Strings with role names.
+	 */
+	public List<String> rolesForPath(String filepath, HttpServletRequest request)
+		throws digilib.auth.AuthOpException {
+		logger.debug("rolesForPath ("
+				+ filepath
+				+ ") by ["
+				+ request.getRemoteAddr()
+				+ "]");
+
+		// check if the requests address provides a role
+		List<String> provided = authIPs.match(request.getRemoteAddr());
+		if ((provided != null) && (provided.contains("ALL"))) {
+			// ALL switches off checking;
+			return null;
+		}
+		// which roles are required?
+		List<String> required = authPaths.match(filepath);
+		// do any provided roles match?
+		if ((provided != null) && (required != null)) {
+			for (int i = 0; i < provided.size(); i++) {
+				if (required.contains(provided.get(i))) {
+					// satisfied
+					return null;
+				}
+			}
+		}
+		return required;
+	}
+
+	/**
+	 * @see digilib.auth.AuthOps#rolesForPath(digilib.servlet.DigilibRequest)
+	 */
+	public List<String> rolesForPath(DigilibRequest request) throws AuthOpException {
+		logger.debug("rolesForPath ("
+				+ request.getFilePath()
+				+ ") by ["
+				+ request.getServletRequest().getRemoteAddr()
+				+ "]");
+
+		// check if the requests address provides a role
+		List<String> provided =
+			authIPs.match(request.getServletRequest().getRemoteAddr());
+		if ((provided != null) && (provided.contains("ALL"))) {
+			// ALL switches off checking;
+			return null;
+		}
+		// which roles are required?
+		List<String> required = authPaths.match(request.getFilePath());
+		// do any provided roles match?
+		if ((provided != null) && (required != null)) {
+			for (int i = 0; i < provided.size(); i++) {
+				if (required.contains(provided.get(i))) {
+					// satisfied
+					return null;
+				}
+			}
+		}
+		return required;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/DocuImage.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,264 @@
+/* DocuImage -- General image interface class
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+
+package digilib.image;
+
+import java.awt.Rectangle;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+
+import javax.servlet.ServletException;
+
+import digilib.io.FileOpException;
+import digilib.io.ImageInput;
+import digilib.util.ImageSize;
+
+/** The basic class for the representation of a digilib image.
+ *
+ * The actual image object is hidden in the class, only methods for loading,
+ * manipulation, and saving are exported. This strategy enables implementations
+ * using different toolkits that rely on different image base classes (like
+ * JIMI, Java2D and JAI).
+ */
+public interface DocuImage {
+
+	/** Loads an image file into the Object.
+	 * 
+	 * @param ii Image File.
+	 * @throws FileOpException Exception thrown if any error occurs.
+	 */
+	public void loadImage(ImageInput ii) throws FileOpException;
+
+	/** This DocuImage supports the loadSubImage operation.
+	 * 
+	 * @return boolean
+	 */
+	public boolean isSubimageSupported();
+
+	/** Load only a subsampled region of the image file.
+	 * 
+	 * @param ii
+	 * @param region
+	 * @param subsample
+	 * @throws FileOpException
+	 */
+	public void loadSubimage(ImageInput ii, Rectangle region, int subsample)
+		throws FileOpException;
+
+	/** Writes the current image to an OutputStream.
+	 *
+	 * The image is encoded to the mime-type <code>mt</code> and sent to the output
+	 * stream <code>ostream</code>.
+	 *
+	 * Currently only mime-types "image/jpeg" and "image/png" are supported.
+	 * 
+	 * @param mt mime-type of the image to be sent.
+	 * @param ostream OutputStream where the image is sent.
+	 * @throws ServletException Exception thrown on sending data.
+	 * @throws ImageOpException Exception in other cases.
+	 */
+	public void writeImage(String mt, OutputStream ostream)
+		throws ServletException, ImageOpException;
+
+	/** The width of the current image in pixel.
+	 * 
+	 * @return Image width in pixels.
+	 */
+	public int getWidth();
+
+	/** The height of the current image in pixel.
+	 * 
+	 * @return Image height in pixels.
+	 */
+	public int getHeight();
+	
+	/** The size of the current image in pixel.
+	 * 
+	 * @return
+	 */
+	public ImageSize getSize();
+
+	/** The mime-type of the image, i.e. the mime-type of the input that was read.
+	 * 
+	 * @return String the mime-type of this image.
+	 */
+	public String getMimetype();
+
+	/** Crops the current image.
+	 * 
+	 * Cuts out a region of the size <code>width</code> x <code>height</code> at
+	 * the offset <code>xoff</code>, <code>yoff</code> from the current image
+	 * and replaces the current image with the result.
+	 * 
+	 * @param xoff X offset of crop region
+	 * @param yoff Y offset of crop region
+	 * @param width width of crop region
+	 * @param height height of crop region
+	 * @throws ImageOpException
+	 */
+	public void crop(int xoff, int yoff, int width, int height)
+		throws ImageOpException;
+
+	/** Scales the current image.
+	 * 
+	 * Replaces the current image with an image scaled by the factor
+	 * <code>scale</code>.
+	 * 
+	 * @param scale scaling factor
+	 * @throws ImageOpException
+	 */
+	public void scale(double scaleX, double scaleY) throws ImageOpException;
+
+	/** Crops and scales the current image.
+	 *
+	 * The current image is cropped to a rectangle of <code>width</code>,
+	 * <code>height</code> at position <code>x_off</code>, <code>y_off</code>. The
+	 * resulting image is scaled by the factor <code>scale</code> using the
+	 * interpolation quality <code>qual</code> (0=worst).
+	 * 
+	 * @param x_off x offset of the crop rectangle in pixel.
+	 * @param y_off y offset of the crop rectangle in pixel.
+	 * @param width width of the crop rectangle in pixel.
+	 * @param height height of the crop rectangle in pixel.
+	 * @param scale scaling factor.
+	 * @param qual interpolation quality (0=worst).
+	 * @throws ImageOpException exception thrown on any error.
+	 */
+	public void cropAndScale(
+		int x_off,
+		int y_off,
+		int width,
+		int height,
+		double scale,
+		int qual)
+		throws ImageOpException;
+
+	/** Rotates the current image.
+	 * 
+	 * Replaces the current image with a rotated image. The image is rotated
+	 * around the center by the <code>angle</code> 
+	 * given in degrees [0, 360] clockwise.
+	 * Image size and aspect ratio are likely to change.
+	 * 
+	 * @param angle rotation angle in degree
+	 */
+	public void rotate(double angle) throws ImageOpException;
+
+	/** Mirrors the current image.
+	 * 
+	 * Replaces  the current image with a mirrored image. The mirror axis goes
+	 * through the center of the image and is rotated by <code>angle</code>
+	 * degrees. Currently only horizontal and vertical mirroring (0 and 90
+	 * degree) are supported. 
+	 * 
+	 * @param angle angle of mirror axis
+	 * @throws ImageOpException
+	 */
+	public void mirror(double angle) throws ImageOpException;
+
+	/** Enhances brightness and contrast of the current image.
+	 * 
+	 * Replaces the current image with a brightness and contrast enhanced image.
+	 * Contrast is enhanced by multiplying the pixel value with the constant
+	 * <code>mult</code>. Brightness is enhanced by adding the constant
+	 * <code>add</code> to the pixel value. Operation: p1 = (p0*mult)+add.
+	 * 
+	 * @param mult multiplicative constant for contrast enhancement
+	 * @param add additive constant for brightness enhancement
+	 * @throws ImageOpException
+	 */
+	public void enhance(float mult, float add) throws ImageOpException;
+
+	/** Manipulates the colors of the current image.
+	 * 
+	 * Replaces the current image with a color modified image.
+	 * For the red, green and blue color channels all pixel values are multiplied
+	 * by the constant
+	 * <code>m</code> and added to the constant
+	 * <code>a</code>. Operation: p1 = (p0*m)+a.
+	 * 
+	 * @param rgbm multiplicative constants for red, green, blue
+	 * @param rgba additive constant for red, green, blue
+	 * @throws ImageOpException
+	 */
+	public void enhanceRGB(float[] rgbm, float[] rgba)
+		throws ImageOpException;
+
+
+	/** Operations for colorOps.
+	 * 
+     * GRAYSCALE: cast color image to grayscale
+     * NTSC_GRAY: convert color image to grayscale using NTSC formula
+     * INVERT: invert colors (every channel separately)
+     * MAP_GRAY_BGR: false color image from grayscale (0: blue, 128: green, 255: red)
+	 *
+	 */
+	public enum ColorOp {GRAYSCALE, NTSC_GRAY, INVERT, MAP_GRAY_BGR};
+
+	/** Changes the colors of the current image.
+	 * 
+	 * Changes the colors of the current image. Operations are instances of ColorOp:
+	 * 
+	 * GRAYSCALE: cast color image to grayscale
+     * NTSC_GRAY: convert color image to grayscale using NTSC formula
+	 * INVERT: invert colors (every channel separately)
+	 * MAP_GRAY_BGR: false color image from grayscale (0: blue, 128: green, 255: red)
+	 * 
+	 * @throws ImageOpException
+	 */
+	public void colorOp(ColorOp op) throws ImageOpException;
+
+	/**
+	 * Returns the interpolation quality.
+	 * @return int
+	 */
+	public int getQuality();
+
+	/**
+	 * Sets the interpolation quality.
+	 * @param quality The quality to set
+	 */
+	public void setQuality(int quality);
+	
+	/** Frees all resources bound to the DocuImage.
+	 * 
+	 * Things that should be freed are image objects and open files.
+	 * 
+	 */
+	public void dispose();
+
+    /**
+     * Check image size and type and store in ImageInput ii
+     */
+    public ImageInput identify(ImageInput ii) throws IOException;
+
+    /**
+     * Returns a list of supported image formats
+     */
+	public Iterator<String> getSupportedFormats();
+	
+	/**
+	 * returns the underlying image as java.awt.Image (if possible, or null)
+	 * @return
+	 */
+	public java.awt.Image getAwtImage();
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/DocuImageImpl.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,199 @@
+/* DocuImage -- General image interface class implementation
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+
+package digilib.image;
+
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.ServletException;
+
+import org.apache.log4j.Logger;
+
+import digilib.io.FileOpException;
+import digilib.io.ImageInput;
+import digilib.util.ImageSize;
+
+/** Simple abstract implementation of the <code>DocuImage</code> interface.
+ *
+ * This implementation provides basic functionality for the utility methods like
+ * <code>getKnownFileTypes</code>. Image methods like
+ * <code>loadImage</code>, <code>writeImage</code>, <code>getWidth</code>,
+ * <code>getHeight</code>, <code>crop</code> and <code>scale</code> must be
+ * implemented by derived classes.
+ */
+public abstract class DocuImageImpl implements DocuImage {
+
+	/** logger */
+	protected static final Logger logger = Logger.getLogger(DocuImage.class);
+	
+	/** Interpolation quality. */
+	protected int quality = 0;
+	
+	/** epsilon for float comparisons. */
+	public static final double epsilon = 1e-5;
+
+	/** image size */
+    protected ImageSize imgSize = null;
+
+    /** ImageInput that was read */
+    protected ImageInput input;
+
+	/**
+	 * Returns the quality.
+	 * @return int
+	 */
+	public int getQuality() {
+		return quality;
+	}
+
+	/**
+	 * Sets the quality.
+	 * @param quality The quality to set
+	 */
+	public void setQuality(int quality) {
+		this.quality = quality;
+	}
+
+	/** Crop and scale the current image.
+	 *
+	 * The current image is cropped to a rectangle of width, height at position
+	 * x_off, y_off. The resulting image is scaled by the factor scale using the
+	 * interpolation quality qual (0=worst).
+	 * 
+	 * @param x_off X offset of the crop rectangle in pixel.
+	 * @param y_off Y offset of the crop rectangle in pixel.
+	 * @param width Width of the crop rectangle in pixel.
+	 * @param height Height of the crop rectangle in pixel.
+	 * @param scale Scaling factor.
+	 * @param qual Interpolation quality (0=worst).
+	 * @throws ImageOpException Exception thrown on any error.
+	 */
+	public void cropAndScale(
+		int x_off, int y_off, int width, int height, double scale, int qual) 
+		throws ImageOpException {
+		// default implementation: first crop, then scale
+		setQuality(qual);
+		crop(x_off, y_off, width, height);
+		scale(scale, scale);
+	}
+	
+	/* (non-Javadoc)
+	 * @see digilib.image.DocuImage#getMimetype()
+	 */
+	public String getMimetype() {
+	    if (input != null) {
+	        return input.getMimetype();
+	    }
+	    return null;
+	}
+
+    /* (non-Javadoc)
+     * @see digilib.image.DocuImage#identify(digilib.io.ImageFile)
+     */
+    public ImageInput identify(ImageInput ii) throws IOException {
+        // just a do-nothing implementation
+        return null;
+    }
+
+	public void rotate(double angle) throws ImageOpException {
+		// just a do-nothing implementation
+	}
+
+	public void mirror(double angle) throws ImageOpException {
+		// just a do-nothing implementation
+	}
+
+	public void enhance(float mult, float add) throws ImageOpException {
+		// just a do-nothing implementation
+	}
+
+	public boolean isSubimageSupported() {
+		// partial loading not supported per default
+		return false;
+	}
+
+	public void loadSubimage(ImageInput ii, Rectangle region, int subsample)
+		throws FileOpException {
+		// empty implementation
+	}
+
+	public void enhanceRGB(float[] rgbm, float[] rgba)
+		throws ImageOpException {
+		// emtpy implementation
+	}
+
+	public void colorOp(ColorOp op) throws ImageOpException {
+		// emtpy implementation
+	}
+
+	public void dispose() {
+		// emtpy implementation
+	}
+
+	public Iterator<String> getSupportedFormats() {
+		List<String> empty = new LinkedList<String>();
+		return empty.iterator();
+	}
+
+    public void crop(int xoff, int yoff, int width, int height)
+            throws ImageOpException {
+        // emtpy implementation
+    }
+
+    public Image getAwtImage() {
+        // emtpy implementation
+        return null;
+    }
+
+    public int getHeight() {
+        ImageSize is = getSize();
+        if (is != null) {
+            return is.getHeight();
+        }
+        return 0;
+    }
+
+    public int getWidth() {
+        ImageSize is = getSize();
+        if (is != null) {
+            return is.getWidth();
+        }
+        return 0;
+    }
+
+    public ImageSize getSize() {
+        return imgSize;
+    }
+
+    public abstract void loadImage(ImageInput ii) throws FileOpException;
+
+    public abstract void scale(double scaleX, double scaleY) throws ImageOpException;
+
+    public abstract void writeImage(String mt, OutputStream ostream)
+            throws ServletException, ImageOpException;
+
+	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/ImageInfoDocuImage.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,58 @@
+/**
+ * 
+ */
+package digilib.image;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+import org.devlib.schmidt.imageinfo.ImageInfo;
+
+import digilib.io.ImageInput;
+import digilib.util.ImageSize;
+
+/** Simple abstract implementation of the <code>DocuImage</code> interface.
+ * Implements only the identify method using the ImageInfo class.
+ * @author casties
+ *
+ */
+public abstract class ImageInfoDocuImage extends DocuImageImpl {
+
+    /* Check image size and type and store in ImageFile f */
+    public ImageInput identify(ImageInput ii) throws IOException {
+        logger.debug("identifying (ImageInfo) " + ii);
+        RandomAccessFile raf = null;
+        try {
+            // set up ImageInfo object
+            ImageInfo iif = new ImageInfo();
+            if (ii.hasImageInputStream()) {
+                iif.setInput(ii.getImageInputStream());
+            } else if (ii.hasFile()) {
+                raf = new RandomAccessFile(ii.getFile(), "r");
+                iif.setInput(raf);
+            } else {
+                return null;
+            }
+            iif.setCollectComments(false);
+            iif.setDetermineImageNumber(false);
+            // try with ImageInfo first
+            if (iif.check()) {
+                ImageSize d = new ImageSize(iif.getWidth(), iif.getHeight());
+                ii.setSize(d);
+                ii.setMimetype(iif.getMimeType());
+                logger.debug("image size: " + ii.getSize());
+                return ii;
+            }
+        } catch (Exception e) {
+            logger.debug("ImageInfoDocuimage unable to identify.", e);
+        } finally {
+            // close file, don't close stream(?)
+            if (raf != null) {
+                raf.close();
+            }
+        }
+        return null;
+    }
+        
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/ImageJobDescription.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,563 @@
+package digilib.image;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+
+import org.apache.log4j.Logger;
+
+import digilib.image.DocuImage.ColorOp;
+import digilib.io.DocuDirCache;
+import digilib.io.DocuDirectory;
+import digilib.io.FileOpException;
+import digilib.io.FileOps;
+import digilib.io.FileOps.FileClass;
+import digilib.io.ImageInput;
+import digilib.io.ImageSet;
+import digilib.servlet.DigilibConfiguration;
+import digilib.util.ImageSize;
+import digilib.util.OptionsSet;
+import digilib.util.Parameter;
+import digilib.util.ParameterMap;
+
+/**
+ * A class for storing the set of parameters necessary for scaling images 
+ * with an ImageWorker.
+ * 
+ * This contains the functionality formerly found in Scaler.processRequest(),
+ * only factorized.
+ * 
+ * @author cmielack, casties
+ * 
+ */
+
+public class ImageJobDescription extends ParameterMap {
+	
+	DigilibConfiguration dlConfig = null;
+	protected static Logger logger = Logger.getLogger("digilib.servlet");
+
+	ImageInput input = null;
+	ImageSet imageSet = null;
+	DocuDirectory fileDir = null;
+	String filePath = null;
+	ImageSize expectedSourceSize = null;
+	Float scaleXY = null;
+	Rectangle2D userImgArea = null;
+	Rectangle2D outerUserImgArea = null;
+	Boolean imageSendable = null;
+	String mimeType = null;
+	Integer paramDW = null;
+	Integer paramDH = null;
+
+	/** create empty ImageJobDescription.
+	 * @param dlcfg
+	 */
+	public ImageJobDescription(DigilibConfiguration dlcfg) {
+		super(30);
+		dlConfig = dlcfg;
+	}
+
+
+	/** set up Parameters
+	 * @see digilib.util.ParameterMap#initParams()
+	 */
+	@Override
+	protected void initParams() {
+		// url of the page/document (second part)
+		newParameter("fn", "", null, 's');
+		// page number
+		newParameter("pn", new Integer(1), null, 's');
+		// width of client in pixels
+		newParameter("dw", new Integer(0), null, 's');
+		// height of client in pixels
+		newParameter("dh", new Integer(0), null, 's');
+		// left edge of image (float from 0 to 1)
+		newParameter("wx", new Float(0), null, 's');
+		// top edge in image (float from 0 to 1)
+		newParameter("wy", new Float(0), null, 's');
+		// width of image (float from 0 to 1)
+		newParameter("ww", new Float(1), null, 's');
+		// height of image (float from 0 to 1)
+		newParameter("wh", new Float(1), null, 's');
+		// scale factor
+		newParameter("ws", new Float(1), null, 's');
+		// special options like 'fit' for gifs
+		newParameter("mo", this.options, null, 's');
+		// rotation angle (degree)
+		newParameter("rot", new Float(0), null, 's');
+		// contrast enhancement factor
+		newParameter("cont", new Float(0), null, 's');
+		// brightness enhancement factor
+		newParameter("brgt", new Float(0), null, 's');
+		// color multiplicative factors
+		newParameter("rgbm", "0/0/0", null, 's');
+		// color additive factors
+		newParameter("rgba", "0/0/0", null, 's');
+		// display dpi resolution (total)
+		newParameter("ddpi", new Float(0), null, 's');
+		// display dpi X resolution
+		newParameter("ddpix", new Float(0), null, 's');
+		// display dpi Y resolution
+		newParameter("ddpiy", new Float(0), null, 's');
+		// scale factor for mo=ascale
+		newParameter("scale", new Float(1), null, 's');
+		// color conversion operation
+		newParameter("colop", "", null, 's');
+	}
+
+
+	/* (non-Javadoc)
+	 * @see digilib.servlet.ParameterMap#initOptions()
+	 */
+	@Override
+	protected void initOptions() {
+		String s = this.getAsString("mo");
+		options = new OptionsSet(s);
+	}
+
+
+	/** Creates new ImageJobDescription by merging Parameters from another ParameterMap.
+	 * @param pm
+	 * @param dlcfg
+	 * @return
+	 */
+	public static ImageJobDescription getInstance(ParameterMap pm, DigilibConfiguration dlcfg) {
+		ImageJobDescription newMap = new ImageJobDescription(dlcfg);
+		// add all params to this map
+		newMap.params.putAll(pm.getParams());
+		newMap.initOptions();
+		return newMap;
+	}
+
+	
+	/** Returns the mime-type (of the input). 
+	 * @return
+	 * @throws IOException
+	 */
+	public String getMimeType() throws IOException {
+		if (mimeType == null) {
+			input = getInput();
+			mimeType = input.getMimetype();
+		}
+		return mimeType;
+	}
+	
+	/** Returns the ImageInput to use.
+	 * @return
+	 * @throws IOException
+	 */
+	public ImageInput getInput() throws IOException {
+		if(input == null){
+			imageSet = getImageSet();
+			
+			/* select a resolution */
+			if (isHiresOnly()) {
+				// get first element (= highest resolution)
+				input = imageSet.getBiggest();
+			} else if (isLoresOnly()) {
+				// enforced lores uses next smaller resolution
+				input = imageSet.getNextSmaller(getExpectedSourceSize());
+				if (input == null) {
+					// this is the smallest we have
+					input = imageSet.getSmallest();
+				}
+			} else {
+				// autores: use next higher resolution
+				input = imageSet.getNextBigger(getExpectedSourceSize());
+				if (input == null) {
+					// this is the highest we have
+					input = imageSet.getBiggest();
+				}
+			}
+			if (input == null || input.getMimetype() == null) {
+			    throw new FileOpException("Unable to load "+input);
+			}
+            logger.info("Planning to load: " + input);
+		}
+		return input;
+	}
+	
+	/** Returns the DocuDirectory for the input (file). 
+	 * @return
+	 * @throws FileOpException
+	 */
+	public DocuDirectory getFileDirectory() throws FileOpException {
+		if(fileDir == null){
+			DocuDirCache dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+			String fp = getFilePath();
+			fileDir = dirCache.getDirectory(fp);
+			if (fileDir == null) {
+				throw new FileOpException("Directory " + getFilePath() + " not found.");
+			}
+		}
+		return fileDir;
+	}
+	
+    /** Returns the ImageSet to load.
+     * @return
+     * @throws FileOpException
+     */
+    public ImageSet getImageSet() throws FileOpException {
+        if(imageSet==null){
+            DocuDirCache dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+    
+            imageSet = (ImageSet) dirCache.getFile(getFilePath(), getAsInt("pn"), FileClass.IMAGE);
+            if (imageSet == null) {
+                throw new FileOpException("File " + getFilePath() + "("
+                        + getAsInt("pn") + ") not found.");
+            }
+        }
+        return imageSet;
+    }
+    
+	/** Returns the file path name from the request.
+	 * @return
+	 */
+	public String getFilePath() {
+		if(filePath == null){
+			String s = this.getAsString("request.path");
+			s += this.getAsString("fn");
+			filePath = FileOps.normalName(s);
+		}
+		return filePath;
+	}
+
+	public boolean isHiresOnly(){
+		return hasOption("clip") || hasOption("hires");
+	}
+	
+	public boolean isLoresOnly(){
+		return hasOption("lores");
+	}
+
+	public boolean isScaleToFit() {
+		return !(hasOption("clip") || hasOption("osize") || hasOption("ascale"));
+	}
+
+	public boolean isAbsoluteScale(){
+		return hasOption("osize") || hasOption("ascale");
+	}
+	
+	
+	/** Returns the minimum size the source image should have for scaling.
+	 * @return
+	 * @throws IOException
+	 */
+	public ImageSize getExpectedSourceSize() throws IOException {
+		if (expectedSourceSize == null){
+			expectedSourceSize = new ImageSize();
+			if (isScaleToFit()) {
+				// scale to fit -- calculate minimum source size
+				float scale = (1 / Math.min(getAsFloat("ww"), getAsFloat("wh"))) * getAsFloat("ws");
+				expectedSourceSize.setSize((int) (getDw() * scale),
+						(int) (getDh() * scale));
+			} else if (isAbsoluteScale() && hasOption("ascale")) {
+				// absolute scale -- apply scale to hires size
+				expectedSourceSize = getHiresSize().getScaled(getAsFloat("scale"));
+			} else {
+				// clip to fit -- source = destination size
+				expectedSourceSize.setSize((int) (getDw() * getAsFloat("ws")),
+						(int) (getDh() * getAsFloat("ws")));
+			}
+		}
+		return expectedSourceSize;
+	}
+	
+	/** Returns the size of the highest resolution image.
+	 * @return
+	 * @throws IOException
+	 */
+	public ImageSize getHiresSize() throws IOException {
+		logger.debug("get_hiresSize()");
+
+		ImageSize hiresSize = null;
+		ImageSet fileset = getImageSet();
+		if (isAbsoluteScale()) {
+			ImageInput hiresFile = fileset.getBiggest();
+			hiresSize = hiresFile.getSize();
+		}
+		return hiresSize;
+	}
+	
+	/** Returns image scaling factor.
+	 * Uses image size and user parameters.
+	 * Modifies scaleXY, userImgArea. 
+	 * @return
+	 * @throws IOException
+	 * @throws ImageOpException
+	 */
+	public float getScaleXY() throws IOException, ImageOpException {
+		//logger.debug("get_scaleXY()");
+		if(scaleXY == null){
+			// coordinates and scaling
+			float areaWidth;
+			float areaHeight;
+			float ws = getAsFloat("ws");
+			ImageSize imgSize = getInput().getSize();
+			// user window area in [0,1] coordinates
+			Rectangle2D relUserArea = new Rectangle2D.Float(getAsFloat("wx"), getAsFloat("wy"),
+					getAsFloat("ww"), getAsFloat("wh"));
+			// transform from relative [0,1] to image coordinates.
+			AffineTransform imgTrafo = AffineTransform.getScaleInstance(imgSize
+					.getWidth(), imgSize.getHeight());
+			// transform user coordinate area to image coordinate area
+			userImgArea = imgTrafo.createTransformedShape(
+					relUserArea).getBounds2D();
+	
+			if (isScaleToFit()) {
+				// calculate scaling factors based on inner user area
+				areaWidth = (float) userImgArea.getWidth();
+				areaHeight = (float) userImgArea.getHeight();
+				float scaleX = getDw() / areaWidth * ws;
+				float scaleY = getDh() / areaHeight * ws;
+				scaleXY = (scaleX > scaleY) ? scaleY : scaleX;
+			} else if (isAbsoluteScale()) {
+				// absolute scaling factor
+				if (hasOption("osize")) {
+					// get original resolution from metadata
+					imageSet.checkMeta();
+					float origResX = imageSet.getResX();
+					float origResY = imageSet.getResY();
+					if ((origResX == 0) || (origResY == 0)) {
+						throw new ImageOpException("Missing image DPI information!");
+					}
+					float ddpix = getAsFloat("ddpix");
+                    float ddpiy = getAsFloat("ddpiy");
+					if (ddpix == 0 || ddpiy == 0) {
+					    float ddpi = getAsFloat("ddpi");
+					    if (ddpi == 0) {
+					        throw new ImageOpException("Missing display DPI information!");
+					    } else {
+					        ddpix = ddpi;
+					        ddpiy = ddpi;
+					    }
+					}
+					// calculate absolute scale factor
+					float sx = ddpix / origResX;
+					float sy = ddpiy / origResY;
+					// currently only same scale -- mean value
+					scaleXY = (sx + sy) / 2f;
+				} else {
+					scaleXY = getAsFloat("scale");
+				}
+				// we need to correct the factor if we use a pre-scaled image
+				ImageSize hiresSize = getHiresSize();
+				if (imgSize.getWidth() != hiresSize.getWidth()) {
+					scaleXY *= (float)hiresSize.getWidth() / (float)imgSize.getWidth();
+				}
+				areaWidth = getDw() / scaleXY * ws;
+				areaHeight = getDh() / scaleXY * ws;
+				// reset user area size
+				userImgArea.setRect(userImgArea.getX(), userImgArea.getY(),
+						areaWidth, areaHeight);
+			} else {
+				// crop to fit -- don't scale
+				areaWidth = getDw() * ws;
+				areaHeight = getDh() * ws;
+				// reset user area size
+				userImgArea.setRect(userImgArea.getX(), userImgArea.getY(),
+						areaWidth, areaHeight);
+				scaleXY = 1f;
+			}
+		}
+		return (float) scaleXY;
+	}
+	
+	/** Returns the width of the destination image.
+	 * Uses dh parameter and aspect ratio if dw parameter is empty. 
+	 * @return
+	 * @throws IOException
+	 */
+	public int getDw() throws IOException {
+		logger.debug("get_paramDW()");
+		if (paramDW == null) {
+
+			paramDW = getAsInt("dw");
+			paramDH = getAsInt("dh");
+
+			float imgAspect = getInput().getAspect();
+			if (paramDW == 0) {
+				// calculate dw
+				paramDW = Math.round(paramDH * imgAspect);
+				setValue("dw", paramDW);
+			} else if (paramDH == 0) {
+				// calculate dh
+				paramDH = Math.round(paramDW / imgAspect);
+				setValue("dh", paramDH);
+			}
+		}
+		return paramDW;
+	}
+	
+	/** Returns the height of the destination image.
+	 * Uses dw parameter and aspect ratio if dh parameter is empty. 
+	 * @return
+	 * @throws IOException
+	 */
+	public int getDh() throws IOException {
+		logger.debug("get_paramDH()");
+		if (paramDH == null) {
+			
+			paramDW = getAsInt("dw");
+			paramDH = getAsInt("dh");
+
+			float imgAspect = getInput().getAspect();
+			if (paramDW == 0) {
+				// calculate dw
+				paramDW = Math.round(paramDH * imgAspect);
+				setValue("dw", paramDW);
+			} else if (paramDH == 0) {
+				// calculate dh
+				paramDH = Math.round(paramDW / imgAspect);
+				setValue("dh", paramDH);
+			}
+		}
+		return paramDH;
+	}
+	
+	/** Returns image quality as an integer.
+	 * @return
+	 */
+	public int getScaleQual(){
+		logger.debug("get_scaleQual()");
+		int qual = dlConfig.getAsInt("default-quality");
+		if(hasOption("q0"))
+			qual = 0;
+		else if(hasOption("q1"))
+			qual = 1;
+		else if(hasOption("q2"))
+			qual = 2;
+		return qual;
+	}
+
+	public ColorOp getColOp() {
+		String op = getAsString("colop");
+		if (op == null || op.length() == 0) {
+			return null;
+		}
+		try {
+			return ColorOp.valueOf(op.toUpperCase());
+		} catch (Exception e) {
+			logger.error("Invalid color op: " + op);
+		}
+		return null;
+	}
+	
+	/**
+	 * Returns the area of the source image that will be transformed into the
+	 * destination image.
+	 * 
+	 * @return
+	 * @throws IOException
+	 * @throws ImageOpException
+	 */
+	public Rectangle2D getUserImgArea() throws IOException, ImageOpException{
+		if(userImgArea == null) {
+			// getScaleXY sets userImgArea
+			getScaleXY();
+		}
+		return userImgArea;		
+	}
+	
+	/** Returns the maximal area of the source image that will be used.
+	 * @return
+	 * @throws IOException
+	 * @throws ImageOpException
+	 */
+	public Rectangle2D getOuterUserImgArea() throws IOException, ImageOpException {
+		if(outerUserImgArea == null){
+			outerUserImgArea = getUserImgArea();
+			
+			// image size in pixels
+			ImageSize imgSize = getInput().getSize();
+			Rectangle2D imgBounds = new Rectangle2D.Float(0, 0, imgSize.getWidth(), 
+					imgSize.getHeight());
+			
+			// clip area at the image border
+			outerUserImgArea = outerUserImgArea.createIntersection(imgBounds);
+	
+			// check image parameters sanity
+			scaleXY = getScaleXY();
+			logger.debug("outerUserImgArea.getWidth()=" + outerUserImgArea.getWidth());
+			logger.debug("get_scaleXY() * outerUserImgArea.getWidth() = " + (scaleXY * outerUserImgArea.getWidth()));
+			
+			if ((outerUserImgArea.getWidth() < 1)
+					|| (outerUserImgArea.getHeight() < 1)
+					|| (scaleXY * outerUserImgArea.getWidth() < 2)
+					|| (scaleXY * outerUserImgArea.getHeight() < 2)) {
+				logger.error("ERROR: invalid scale parameter set!");
+				throw new ImageOpException("Invalid scale parameter set!");
+			}
+		}
+		return outerUserImgArea;
+	}
+	
+	
+	public float[] getRGBM(){
+		float[] paramRGBM = null;//{0f,0f,0f};
+		Parameter p = params.get("rgbm");
+		if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
+			return p.parseAsFloatArray("/");
+		}	
+		return paramRGBM;
+	}
+	
+	public float[] getRGBA(){
+		float[] paramRGBA =  null;//{0f,0f,0f};
+		Parameter p = params.get("rgba");
+		if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
+			paramRGBA = p.parseAsFloatArray("/");
+		}
+		return paramRGBA;
+	}
+	
+	/** Has send-as-file been requested?
+	 * @return
+	 */
+	public boolean getSendAsFile(){
+		return hasOption("file")
+		|| hasOption("rawfile");
+	}
+	
+    /**
+     * Returns if the image can be sent without processing. Takes image type and
+     * additional image operations into account. Does not check requested size
+     * transformation.
+     * 
+     * @return
+     * @throws IOException
+     */
+    public boolean isImageSendable() throws IOException {
+        if (imageSendable == null) {
+            String mimeType = getMimeType();
+            imageSendable = (mimeType != null
+                    && (mimeType.equals("image/jpeg") || mimeType.equals("image/png") 
+                            || mimeType.equals("image/gif"))
+                    && !(hasOption("hmir")
+                    || hasOption("vmir") || (getAsFloat("rot") != 0.0)
+                    || (getRGBM() != null) || (getRGBA() != null)
+                    || (getAsFloat("cont") != 0.0) || (getAsFloat("brgt") != 0.0)));
+        }
+        return imageSendable;
+    }
+	
+	
+	/**
+	 * Returns if any transformation of the source image (image manipulation or
+	 * format conversion) is required.
+	 * 
+	 * @return
+	 * @throws IOException
+	 */
+	public boolean isTransformRequired() throws IOException {
+		ImageSize is = getInput().getSize();
+		ImageSize ess = getExpectedSourceSize();
+		// nt = no transform required
+		boolean nt = isImageSendable() && (
+			// lores: send if smaller
+			(isLoresOnly() && is.isSmallerThan(ess))
+			// else send if it fits
+			|| (!(isLoresOnly() || isHiresOnly()) && is.fitsIn(ess)));
+		return ! nt;
+	}
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/ImageLoaderDocuImage.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,650 @@
+/* ImageLoaderDocuImage -- Image class implementation using JDK 1.4 ImageLoader
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2002 - 2011 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package digilib.image;
+
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.color.ColorSpace;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.AffineTransformOp;
+import java.awt.image.BandCombineOp;
+import java.awt.image.BufferedImage;
+import java.awt.image.ByteLookupTable;
+import java.awt.image.ColorConvertOp;
+import java.awt.image.ColorModel;
+import java.awt.image.ConvolveOp;
+import java.awt.image.IndexColorModel;
+import java.awt.image.Kernel;
+import java.awt.image.LookupOp;
+import java.awt.image.LookupTable;
+import java.awt.image.RescaleOp;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.util.Arrays;
+import java.util.Iterator;
+
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.FileImageInputStream;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
+import javax.servlet.ServletException;
+
+import digilib.io.FileOpException;
+import digilib.io.FileOps;
+import digilib.io.ImageInput;
+import digilib.util.ImageSize;
+
+/** Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. */
+public class ImageLoaderDocuImage extends ImageInfoDocuImage {
+    
+	/** image object */
+	protected BufferedImage img;
+	
+	/** interpolation type */
+	protected RenderingHints renderHint = null;
+
+	/** convolution kernels for blur() */
+	protected static Kernel[] convolutionKernels = {
+	        null,
+	        new Kernel(1, 1, new float[] {1f}),
+            new Kernel(2, 2, new float[] {0.25f, 0.25f, 0.25f, 0.25f}),
+            new Kernel(3, 3, new float[] {1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f, 1f/9f})
+	};
+
+	/* lookup tables for inverting images (byte) */
+	protected static LookupTable invertSingleByteTable;
+    protected static LookupTable invertRgbaByteTable;
+    protected static boolean needsInvertRgba = false;
+	/* RescaleOp for contrast/brightness operation */
+    protected static boolean needsRescaleRgba = false;
+    /* lookup table for false-color */
+    protected static LookupTable mapBgrByteTable;
+    protected static boolean needsMapBgr = false;
+    
+	static {
+	    /*
+	     * create static lookup tables
+	     */
+		byte[] invertByte = new byte[256];
+		byte[] orderedByte = new byte[256];
+		byte[] nullByte = new byte[256];
+        byte[] mapR = new byte[256];
+        byte[] mapG = new byte[256];
+        byte[] mapB = new byte[256];
+		for (int i = 0; i < 256; ++i) {
+		    // counting down
+			invertByte[i] = (byte) (256 - i);
+			// counting up
+			orderedByte[i] = (byte) i;
+			// constant 0
+			nullByte[i] = 0;
+			// three overlapping slopes
+			if (i < 64) {
+			    mapR[i] = 0;
+			    mapG[i] = (byte) (4 * i);
+			    mapB[i] = (byte) 255;
+			} else if (i >= 64 && i < 192) {
+                mapR[i] = (byte) (2 * (i - 64));
+                mapG[i] = (byte) 255;
+                mapB[i] = (byte) (255 - 2 * (i - 64));
+			} else {
+                mapR[i] = (byte) 255;
+                mapG[i] = (byte) (255 - (4 * (i - 192)));
+                mapB[i] = 0;
+			}
+		}
+		// should(!) work for all color models
+		invertSingleByteTable = new ByteLookupTable(0, invertByte);
+		// but doesn't work with alpha channel on all platforms
+		String ver = System.getProperty("java.version");
+		String os =  System.getProperty("os.name");
+		logger.debug("os="+os+" ver="+ver);
+		if (os.startsWith("Linux") && ver.startsWith("1.6")) {
+			// GRAB(WTF?) works in Linux JDK1.6 with transparency
+			invertRgbaByteTable = new ByteLookupTable(0, new byte[][] {
+					invertByte, invertByte, orderedByte, invertByte});
+			needsInvertRgba = true;
+			needsRescaleRgba = true;
+			needsMapBgr = true;
+		} else {
+			invertRgbaByteTable = invertSingleByteTable;
+		}
+		// this hopefully works for all
+        mapBgrByteTable = new ByteLookupTable(0, new byte[][] {
+                mapR, mapG, mapB});
+	}
+	
+	/** the size of the current image */
+    protected ImageSize imageSize;
+	
+	
+	/* loadSubimage is supported. */
+	public boolean isSubimageSupported() {
+		return true;
+	}
+
+	public void setQuality(int qual) {
+		quality = qual;
+		renderHint = new RenderingHints(null);
+		// hint.put(RenderingHints.KEY_ANTIALIASING,
+		// RenderingHints.VALUE_ANTIALIAS_OFF);
+		// setup interpolation quality
+		if (qual > 0) {
+			logger.debug("quality q1");
+			renderHint.put(RenderingHints.KEY_INTERPOLATION,
+					RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+		} else {
+			logger.debug("quality q0");
+			renderHint.put(RenderingHints.KEY_INTERPOLATION,
+					RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
+		}
+	}
+
+    /* returns the size of the current image */
+    public ImageSize getSize() {
+        if (imageSize == null) {
+            int h = 0;
+            int w = 0;
+            try {
+                if (img == null) {
+                    ImageReader reader = getReader(input);
+                    // get size from ImageReader
+                    h = reader.getHeight(0);
+                    w = reader.getWidth(0);
+                } else {
+                    // get size from image
+                    h = img.getHeight();
+                    w = img.getWidth();
+                }
+                imageSize = new ImageSize(w, h);
+            } catch (IOException e) {
+                logger.debug("error in getSize:", e);
+            }
+        }
+        return imageSize;
+    }
+
+	/* returns a list of supported image formats */
+	public Iterator<String> getSupportedFormats() {
+		String[] formats = ImageIO.getReaderFormatNames();
+		return Arrays.asList(formats).iterator();
+	}
+
+    /* Check image size and type and store in ImageInput */
+    public ImageInput identify(ImageInput input) throws IOException {
+        // try parent method first
+        ImageInput ii = super.identify(input);
+        if (ii != null) {
+            return ii;
+        }
+        logger.debug("identifying (ImageIO) " + input);
+        ImageReader reader = null;
+        try {
+            /*
+             * try ImageReader
+             */
+            reader = getReader(input);
+            // set size
+            ImageSize d = new ImageSize(reader.getWidth(0), reader.getHeight(0));
+            input.setSize(d);
+            // set mime type
+            if (input.getMimetype() == null) {
+                if (input.hasFile()) {
+                    String t = FileOps.mimeForFile(input.getFile());
+                    input.setMimetype(t);
+                } else {
+                    // FIXME: is format name a mime type???
+                    String t = reader.getFormatName();
+                    input.setMimetype(t);
+                }
+            }
+            return input;
+        } catch (FileOpException e) {
+            // maybe just our class doesn't know what to do
+            logger.error("ImageLoaderDocuimage unable to identify:", e);
+            return null;
+        } finally {
+            if (reader != null) {
+                reader.dispose();
+            }
+        }
+    }
+    
+    /* load image file */
+	public void loadImage(ImageInput ii) throws FileOpException {
+		logger.debug("loadImage: " + ii);
+		this.input = ii;
+		try {
+		    if (ii.hasImageInputStream()) {
+                img = ImageIO.read(ii.getImageInputStream());
+		    } else if (ii.hasFile()) {
+		        img = ImageIO.read(ii.getFile());
+		    }
+		} catch (IOException e) {
+			throw new FileOpException("Error reading image.");
+		}
+	}
+
+	/**
+	 * Get an ImageReader for the image file.
+	 * 
+	 * @return
+	 */
+	public ImageReader getReader(ImageInput input) throws IOException {
+		logger.debug("get ImageReader for " + input);
+		ImageInputStream istream = null;
+		if (input.hasImageInputStream()) {
+			// stream input
+			istream = input.getImageInputStream();
+		} else if (input.hasFile()) {
+			// file only input
+			RandomAccessFile rf = new RandomAccessFile(input.getFile(), "r");
+			istream = new FileImageInputStream(rf);
+		} else {
+			throw new FileOpException("Unable to get data from ImageInput");
+		}
+		Iterator<ImageReader> readers;
+		String mt = null;
+		if (input.hasMimetype()) {
+	        // check hasMimetype first or we might get into a loop
+		    mt = input.getMimetype();
+		} else {
+		    // try file extension
+            mt = FileOps.mimeForFile(input.getFile());
+		}
+		if (mt == null) {
+			logger.debug("No mime-type. Trying automagic.");
+			readers = ImageIO.getImageReaders(istream);
+		} else {
+			logger.debug("File type:" + mt);
+			readers = ImageIO.getImageReadersByMIMEType(mt);
+		}
+		if (!readers.hasNext()) {
+			throw new FileOpException("Can't find Reader to load File!");
+		}
+		ImageReader reader = readers.next();
+		/* are there more readers? */
+		logger.debug("ImageIO: this reader: " + reader.getClass());
+		/* while (readers.hasNext()) {
+			logger.debug("ImageIO: next reader: " + readers.next().getClass());
+		} */
+		reader.setInput(istream);
+		return reader;
+	}
+
+	/* Load an image file into the Object. */
+	public void loadSubimage(ImageInput ii, Rectangle region, int prescale)
+			throws FileOpException {
+		logger.debug("loadSubimage");
+        this.input = ii;
+        ImageReader reader = null;
+		try {
+			reader = getReader(ii);
+			// set up reader parameters
+			ImageReadParam readParam = reader.getDefaultReadParam();
+			readParam.setSourceRegion(region);
+			if (prescale > 1) {
+				readParam.setSourceSubsampling(prescale, prescale, 0, 0);
+			}
+			// read image
+			logger.debug("loading..");
+			img = reader.read(0, readParam);
+			logger.debug("loaded");
+			/* downconversion of highcolor images seems not to work
+	        if (img.getColorModel().getComponentSize(0) > 8) {
+	            logger.debug("converting to 8bit");
+	            BufferedImage dest = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_3BYTE_BGR);
+	            dest.createGraphics().drawImage(img, null, 0, 0);
+	            img = dest;
+	        } */
+		} catch (IOException e) {
+			throw new FileOpException("Unable to load File!");
+		} finally {
+		    if (reader != null) {
+		        reader.dispose();
+		    }
+		}
+	}
+
+	/* write image of type mt to Stream */
+	public void writeImage(String mt, OutputStream ostream)
+			throws ImageOpException, ServletException {
+		logger.debug("writeImage");
+		// setup output
+		ImageWriter writer = null;
+		ImageOutputStream imgout = null;
+		try {
+			imgout = ImageIO.createImageOutputStream(ostream);
+			if (mt == "image/jpeg") {
+				/*
+				 * JPEG doesn't do transparency so we have to convert any RGBA
+				 * image to RGB or we the client will think its CMYK :-( *Java2D BUG*
+				 */
+				if (img.getColorModel().hasAlpha()) {
+					logger.debug("BARF: JPEG with transparency!!");
+                    BufferedImage rgbImg = new BufferedImage(img.getWidth(),
+                            img.getHeight(), BufferedImage.TYPE_INT_RGB);
+					rgbImg.createGraphics().drawImage(img, null, 0, 0);
+					img = rgbImg;
+				}
+				writer = ImageIO.getImageWritersByFormatName("jpeg").next();
+				if (writer == null) {
+					throw new ImageOpException("Unable to get JPEG writer");
+				}
+				ImageWriteParam param = writer.getDefaultWriteParam();
+				if (quality > 1) {
+					// change JPEG compression quality
+					param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+					param.setCompressionQuality(0.9f);
+				}
+				writer.setOutput(imgout);
+				// render output
+				logger.debug("writing JPEG");
+				writer.write(null, new IIOImage(img, null, null), param);
+			} else if (mt == "image/png") {
+				// render output
+				writer = ImageIO.getImageWritersByFormatName("png").next();
+				if (writer == null) {
+					throw new ImageOpException("Unable to get PNG writer");
+				}
+				writer.setOutput(imgout);
+				logger.debug("writing PNG");
+				writer.write(img);
+			} else {
+				// unknown mime type
+				throw new ImageOpException("Unknown mime type: " + mt);
+			}
+
+		} catch (IOException e) {
+		    logger.error("Error writing image:", e);
+			throw new ServletException("Error writing image:", e);
+		}
+		// TODO: should we: finally { writer.dispose(); }
+	}
+
+    public void scale(double scaleX, double scaleY) throws ImageOpException {
+        logger.debug("scale: " + scaleX);
+        /* for downscaling in high quality the image is blurred first */
+        if ((scaleX <= 0.5) && (quality > 1)) {
+            int bl = (int) Math.floor(1 / scaleX);
+            blur(bl);
+        }
+        /* then scaled */
+        AffineTransformOp scaleOp = new AffineTransformOp(
+                AffineTransform.getScaleInstance(scaleX, scaleY), renderHint);
+        img = scaleOp.filter(img, null);
+        logger.debug("scaled to " + img.getWidth() + "x" + img.getHeight()
+                + " img=" + img);
+    }
+
+	public void blur(int radius) throws ImageOpException {
+		logger.debug("blur: " + radius);
+		// minimum radius is 2
+		int klen = Math.max(radius, 2);
+		Kernel blur = null;
+		if (klen < convolutionKernels.length) {
+		    // use precalculated Kernel
+            blur = convolutionKernels[klen];
+		} else {
+            // calculate our own kernel
+            int ksize = klen * klen;
+            // kernel is constant 1/k
+            float f = 1f / ksize;
+            float[] kern = new float[ksize];
+            for (int i = 0; i < ksize; ++i) {
+                kern[i] = f;
+            }
+            blur = new Kernel(klen, klen, kern);
+		}
+		// blur with convolve operation
+		ConvolveOp blurOp = new ConvolveOp(blur, ConvolveOp.EDGE_NO_OP,
+				renderHint);
+		BufferedImage dest = null;
+        // blur needs explicit destination image type for 3BYTE_BGR *Java2D BUG*
+		if (img.getType() == BufferedImage.TYPE_3BYTE_BGR) {
+		    logger.debug("blur: fixing destination image type");
+		    dest = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_3BYTE_BGR);
+		}
+		img = blurOp.filter(img, dest);
+		logger.debug("blurred: "+img);
+	}
+
+	public void crop(int x_off, int y_off, int width, int height)
+			throws ImageOpException {
+		// setup Crop
+		img = img.getSubimage(x_off, y_off, width, height);
+		logger.debug("CROP:" + img.getWidth() + "x"
+				+ img.getHeight());
+	}
+
+	public void rotate(double angle) throws ImageOpException {
+        logger.debug("rotate: " + angle);
+		// setup rotation
+		double rangle = Math.toRadians(angle);
+		// center of rotation is center of image
+        double w = img.getWidth();
+        double h = img.getHeight();
+		double x = (w / 2);
+		double y = (h / 2);
+        AffineTransform trafo = AffineTransform.getRotateInstance(rangle, x, y);
+		AffineTransformOp rotOp = new AffineTransformOp(trafo, renderHint);
+        // rotate bounds to see how much of the image would be off screen
+		Rectangle2D rotbounds = rotOp.getBounds2D(img);
+		double xoff = rotbounds.getX();
+		double yoff = rotbounds.getY();
+		if (Math.abs(xoff) > epsilon || Math.abs(yoff) > epsilon) {
+		    // move image back on screen
+		    logger.debug("move rotation: xoff="+xoff+" yoff="+yoff);
+		    trafo.preConcatenate(AffineTransform.getTranslateInstance(-xoff, -yoff));
+	        rotOp = new AffineTransformOp(trafo, renderHint);
+		}
+		// transform image
+		img = rotOp.filter(img, null);
+		logger.debug("rotated: "+img);
+	}
+
+	public void mirror(double angle) throws ImageOpException {
+        logger.debug("mirror: " + angle);
+		// setup mirror
+		double mx = 1;
+		double my = 1;
+		double tx = 0;
+		double ty = 0;
+		if (Math.abs(angle - 0) < epsilon) { // 0 degree
+			mx = -1;
+			tx = img.getWidth();
+		} else if (Math.abs(angle - 90) < epsilon) { // 90 degree
+			my = -1;
+			ty = img.getHeight();
+		} else if (Math.abs(angle - 180) < epsilon) { // 180 degree
+			mx = -1;
+			tx = img.getWidth();
+		} else if (Math.abs(angle - 270) < epsilon) { // 270 degree
+			my = -1;
+			ty = img.getHeight();
+		} else if (Math.abs(angle - 360) < epsilon) { // 360 degree
+			mx = -1;
+			tx = img.getWidth();
+		} else {
+		    logger.error("invalid mirror angle "+angle);
+		    return;
+		}
+		AffineTransformOp mirOp = new AffineTransformOp(new AffineTransform(mx,
+				0, 0, my, tx, ty), renderHint);
+		img = mirOp.filter(img, null);
+	}
+
+    public void enhance(float mult, float add) throws ImageOpException {
+        RescaleOp op = null;
+        logger.debug("enhance: img=" + img);
+        if (needsRescaleRgba) {
+            /*
+             * Only one constant should work regardless of the number of bands
+             * according to the JDK spec. Doesn't work on JDK 1.4 for OSX and
+             * Linux (at least).
+             * 
+             * The number of constants must match the number of bands in the
+             * image.
+             */
+            int ncol = img.getColorModel().getNumComponents();
+            float[] dm = new float[ncol];
+            float[] da = new float[ncol];
+            for (int i = 0; i < ncol; i++) {
+                dm[i] = (float) mult;
+                da[i] = (float) add;
+            }
+            op = new RescaleOp(dm, da, null);
+        } else {
+            op = new RescaleOp(mult, add, renderHint);
+        }
+        op.filter(img, img);
+    }
+
+    public void enhanceRGB(float[] rgbm, float[] rgba) throws ImageOpException {
+        logger.debug("enhanceRGB: rgbm="+rgbm+" rgba="+rgba);
+        /*
+         * The number of constants must match the number of bands in the image.
+         * We do only 3 (RGB) bands.
+         */
+        int ncol = img.getColorModel().getNumColorComponents();
+        if ((ncol != 3) || (rgbm.length != 3) || (rgba.length != 3)) {
+            logger.error("enhanceRGB: unknown number of color bands or coefficients ("
+                            + ncol + ")");
+            return;
+        }
+        if (img.getColorModel().hasAlpha()) {
+            // add constant for alpha
+            rgbm = new float[] {rgbm[0], rgbm[1], rgbm[2], 1};
+            rgba = new float[] {rgba[0], rgba[1], rgba[2], 0};
+        }
+        RescaleOp scaleOp = new RescaleOp(rgbm, rgba, renderHint);
+        scaleOp.filter(img, img);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * digilib.image.DocuImageImpl#colorOp(digilib.image.DocuImage.ColorOps)
+     */
+    public void colorOp(ColorOp colop) throws ImageOpException {
+        if (colop == ColorOp.GRAYSCALE) {
+            /*
+             * convert image to grayscale
+             */
+            logger.debug("Color op: grayscaling");
+            ColorModel cm = img.getColorModel();
+            if (cm.getNumColorComponents() < 3) {
+                // grayscale already
+                logger.debug("Color op: not grayscaling");
+                return;
+            }
+            ColorConvertOp op = new ColorConvertOp(
+                    ColorSpace.getInstance(ColorSpace.CS_GRAY), renderHint);
+            // let filter create new image
+            img = op.filter(img, null);
+        } else if (colop == ColorOp.NTSC_GRAY) {
+            /*
+             * convert image to grayscale NTSC-style: luminance = 0.2989*red +
+             * 0.5870*green + 0.1140*blue
+             */
+            logger.debug("Color op: NTSC gray");
+            logger.debug("img="+img);
+            ColorModel cm = img.getColorModel();
+            if (cm.getNumColorComponents() < 3 || cm instanceof IndexColorModel) {
+                // grayscale already or not possible
+                logger.debug("Color op: unable to NTSC gray");
+                return;
+            }
+            float[][] combineFn = new float[1][4];
+            combineFn[0] = new float[] { 0.299f, 0.587f, 0.114f, 0f };
+            BandCombineOp op = new BandCombineOp(combineFn, renderHint);
+            // BandCombineOp only works on Rasters so we create a
+            // new image and use its Raster
+            BufferedImage dest = new BufferedImage(img.getWidth(),
+                    img.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
+            op.filter(img.getRaster(), dest.getRaster());
+            img = dest;
+        } else if (colop == ColorOp.INVERT) {
+            /*
+             * invert colors i.e. invert every channel
+             */
+            logger.debug("Color op: inverting");
+            LookupTable invtbl = null;
+            ColorModel cm = img.getColorModel();
+            if (cm instanceof IndexColorModel) {
+                // invert not possible
+                // TODO: should we convert?
+                logger.debug("Color op: unable to invert");
+                return;
+            }
+            if (needsInvertRgba && cm.hasAlpha()) {
+                // fix for some cases
+                invtbl = invertRgbaByteTable;
+            } else {
+                invtbl = invertSingleByteTable;
+            }
+            LookupOp op = new LookupOp(invtbl, renderHint);
+            logger.debug("colop: image=" + img);
+            op.filter(img, img);
+        } else if (colop == ColorOp.MAP_GRAY_BGR) {
+            /*
+             * false color image from grayscale (0: blue, 128: green, 255: red)
+             */
+            logger.debug("Color op: map_gray_bgr");
+            // convert to grayscale
+            ColorConvertOp grayOp = new ColorConvertOp(
+                    ColorSpace.getInstance(ColorSpace.CS_GRAY), renderHint);
+            // create new 3-channel image
+            int destType = BufferedImage.TYPE_INT_RGB;
+            if (needsMapBgr) {
+                // special case for broken Java2Ds
+                destType = BufferedImage.TYPE_3BYTE_BGR;
+            }
+            BufferedImage dest = new BufferedImage(img.getWidth(),
+                    img.getHeight(), destType);
+            img = grayOp.filter(img, dest);
+            logger.debug("map_gray: image=" + img);
+            // convert to false color
+            LookupOp mapOp = new LookupOp(mapBgrByteTable, renderHint);
+            mapOp.filter(img, img);
+            logger.debug("mapped image=" + img);
+        }
+    }
+
+	public void dispose() {
+	    // is this necessary?
+		img = null;
+	}
+
+	public Image getAwtImage(){
+		return (Image) img;
+	}
+	
+	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/ImageOpException.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,33 @@
+/* ImageOpException -- Exception class for image operations
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ */
+
+package digilib.image;
+
+public class ImageOpException extends Exception {
+
+	private static final long serialVersionUID = -8662921779682407942L;
+
+	public ImageOpException() {
+	}
+
+	public ImageOpException(String s) {
+		super(s);
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/ImageWorker.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,152 @@
+/** Worker (Callable) that renders an image.
+ * 
+ */
+package digilib.image;
+
+import java.awt.Rectangle;
+import java.io.IOException;
+import java.util.concurrent.Callable;
+
+import org.apache.log4j.Logger;
+
+import digilib.io.FileOpException;
+import digilib.servlet.DigilibConfiguration;
+
+/** Worker that renders an image.
+ * 
+ * @author casties
+ *
+ */
+public class ImageWorker implements Callable<DocuImage> {
+
+    protected static Logger logger = Logger.getLogger(ImageWorker.class);
+    private DigilibConfiguration dlConfig;
+    private ImageJobDescription jobinfo;
+
+    public ImageWorker(DigilibConfiguration dlConfig, ImageJobDescription jobinfo) {
+        super();
+        this.dlConfig = dlConfig;
+        this.jobinfo = jobinfo;
+    }
+
+    /**
+     * render and return the image
+     */
+    public DocuImage call() throws FileOpException, IOException, ImageOpException {
+        
+        logger.debug("image worker starting");
+        long startTime = System.currentTimeMillis();
+
+        /* crop and scale image */
+
+        // new DocuImage instance
+        DocuImage docuImage = DigilibConfiguration.getDocuImageInstance();
+        if (docuImage == null) {
+            throw new ImageOpException("Unable to load DocuImage class!");
+        }
+
+        // set interpolation quality
+        docuImage.setQuality(jobinfo.getScaleQual());
+
+        Rectangle loadRect = jobinfo.getOuterUserImgArea().getBounds();
+        float scaleXY = jobinfo.getScaleXY();
+        
+        // use subimage loading if possible
+        if (docuImage.isSubimageSupported()) {
+            logger.debug("Subimage: scale " + scaleXY + " = " + (1 / scaleXY));
+            float subf = 1f;
+            float subsamp = 1f;
+            if (scaleXY < 1) {
+                subf = 1 / scaleXY;
+                // for higher quality reduce subsample factor by minSubsample
+                if (jobinfo.getScaleQual() > 0) {
+                    subsamp = (float) Math.max(Math.floor(subf / dlConfig.getAsFloat("subsample-minimum")), 1d);
+                } else {
+                    subsamp = (float) Math.floor(subf);
+                }
+                scaleXY = subsamp / subf;
+                logger.debug("Using subsampling: " + subsamp + " rest "
+                        + scaleXY);
+            }
+            docuImage.loadSubimage(jobinfo.getInput(), loadRect, (int) subsamp);
+            logger.debug("SUBSAMP: " + subsamp + " -> " + docuImage.getSize());
+            docuImage.scale(scaleXY, scaleXY);
+        } else {
+            // else load and crop the whole file
+            docuImage.loadImage(jobinfo.getInput());
+            docuImage.crop((int) loadRect.getX(), (int) loadRect.getY(),
+                    (int) loadRect.getWidth(), (int) loadRect.getHeight());
+            docuImage.scale(scaleXY, scaleXY);
+        }
+
+        // mirror image
+        // operation mode: "hmir": mirror horizontally, "vmir": mirror
+        // vertically
+        if (jobinfo.hasOption("hmir")) {
+            docuImage.mirror(0);
+        }
+        if (jobinfo.hasOption("vmir")) {
+            docuImage.mirror(90);
+        }
+
+        // rotate image
+        if (jobinfo.getAsFloat("rot") != 0d) {
+            docuImage.rotate(jobinfo.getAsFloat("rot"));
+            /* if (jobinfo.get_wholeRotArea()) {
+                // crop to the inner bounding box
+                float xcrop = (float) (docuImage.getWidth() - jobinfo.get_innerUserImgArea().getWidth()
+                        * scaleXY);
+                float ycrop = (float) (docuImage.getHeight() - jobinfo.get_innerUserImgArea().getHeight()
+                        * scaleXY);
+                if ((xcrop > 0) || (ycrop > 0)) {
+                    // only crop smaller
+                    xcrop = (xcrop > 0) ? xcrop : 0;
+                    ycrop = (ycrop > 0) ? ycrop : 0;
+                    // crop image
+                    docuImage.crop((int) (xcrop / 2), (int) (ycrop / 2),
+                            (int) (docuImage.getWidth() - xcrop),
+                            (int) (docuImage.getHeight() - ycrop));
+                }
+            } */
+
+        }
+
+        // color modification
+        float[] paramRGBM = jobinfo.getRGBM();
+        float[] paramRGBA = jobinfo.getRGBA();
+        if ((paramRGBM != null) || (paramRGBA != null)) {
+            // make sure we actually have two arrays
+            if (paramRGBM == null) {
+                paramRGBM = new float[3];
+            }
+            if (paramRGBA == null) {
+                paramRGBA = new float[3];
+            }
+            // calculate "contrast" values (c=2^x)
+            float[] mult = new float[3];
+            for (int i = 0; i < 3; i++) {
+                mult[i] = (float) Math.pow(2, (float) paramRGBM[i]);
+            }
+            docuImage.enhanceRGB(mult, paramRGBA);
+        }
+
+        // contrast and brightness enhancement
+        float paramCONT = jobinfo.getAsFloat("cont");
+        float paramBRGT = jobinfo.getAsFloat("brgt");
+        if ((paramCONT != 0f) || (paramBRGT != 0f)) {
+            float mult = (float) Math.pow(2, paramCONT);
+            docuImage.enhance(mult, paramBRGT);
+        }
+
+        // color operation
+        DocuImage.ColorOp colop = jobinfo.getColOp();
+        if (colop != null) {
+        	docuImage.colorOp(colop);
+        }
+        
+        logger.debug("rendered in " + (System.currentTimeMillis() - startTime) + "ms");
+
+        return docuImage;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/JAIDocuImage.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,482 @@
+/* JAIDocuImage -- Image class implementation using JAI (Java Advanced Imaging)
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ */
+
+package digilib.image;
+
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.ParameterBlock;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.media.jai.BorderExtender;
+import javax.media.jai.Interpolation;
+import javax.media.jai.JAI;
+import javax.media.jai.KernelJAI;
+import javax.media.jai.ParameterBlockJAI;
+import javax.media.jai.RenderedOp;
+import javax.media.jai.operator.TransposeDescriptor;
+import javax.media.jai.operator.TransposeType;
+import javax.servlet.ServletException;
+
+import com.sun.media.jai.codec.ImageCodec;
+
+import digilib.io.FileOpException;
+import digilib.io.FileOps;
+import digilib.io.ImageInput;
+import digilib.util.ImageSize;
+
+/** A DocuImage implementation using Java Advanced Imaging Library. */
+/**
+ * @author casties
+ *
+ */
+public class JAIDocuImage extends ImageInfoDocuImage {
+
+	protected RenderedImage img;
+
+	protected Interpolation interpol = null;
+
+	/*
+	 * static { // we could set our own tile cache size here TileCache tc =
+	 * JAI.createTileCache(100*1024*1024);
+	 * JAI.getDefaultInstance().setTileCache(tc); }
+	 */
+
+	public boolean isSubimageSupported() {
+		return true;
+	}
+
+	/*
+	 * Real setQuality implementation. Creates the correct Interpolation.
+	 */
+	public void setQuality(int qual) {
+		quality = qual;
+		// setup interpolation quality
+		if (qual > 1) {
+			logger.debug("quality q2");
+			interpol = Interpolation.getInstance(Interpolation.INTERP_BICUBIC);
+		} else if (qual == 1) {
+			logger.debug("quality q1");
+			interpol = Interpolation.getInstance(Interpolation.INTERP_BILINEAR);
+		} else {
+			logger.debug("quality q0");
+			interpol = Interpolation.getInstance(Interpolation.INTERP_NEAREST);
+		}
+	}
+
+	/* returns a list of supported image formats */
+    @SuppressWarnings("unchecked") // ImageCodec.getCodecs() returns a naked Enumeration
+    public Iterator<String> getSupportedFormats() {
+        Enumeration<ImageCodec> codecs = ImageCodec.getCodecs();
+        List<String> formats = new ArrayList<String>();
+        for (ImageCodec codec = codecs.nextElement(); codecs.hasMoreElements(); codec = codecs
+                .nextElement()) {
+            logger.debug("known format:"+codec.getFormatName());
+            formats.add(codec.getFormatName());
+        }
+        logger.debug("tilecachesize:"
+                + JAI.getDefaultInstance().getTileCache().getMemoryCapacity());
+        return formats.iterator();
+    }
+
+	/* Check image size and type and store in ImageFile f */
+	public ImageInput identify(ImageInput input) throws IOException {
+        this.input = input;
+        // try parent method first
+	    ImageInput imf = super.identify(input);
+		if (imf != null) {
+			return imf;
+		}
+		/*
+		 * try JAI
+		 */
+		logger.debug("identifying (JAI) " + input);
+		try {
+		    RenderedOp img = null;
+		    if (input.hasFile()) {
+		        String t = FileOps.mimeForFile(input.getFile());
+		        input.setMimetype(t);
+		        img = JAI.create("fileload", input.getFile().getAbsolutePath());
+		    } else if (input.hasInputStream()) {
+                img = JAI.create("stream", input.getInputStream());
+                // FIXME: where do we get the mimetype?
+		    } else {
+	            throw new FileOpException("unable to get data for image!");
+		    }
+			ImageSize d = new ImageSize(img.getWidth(), img.getHeight());
+			input.setSize(d);
+			logger.debug("image size: " + d);
+			return input;
+		} catch (Exception e) {
+			throw new FileOpException("ERROR: unable to identify image!");
+		}
+	}
+
+	/* Load an image file into the Object. */
+	public void loadImage(ImageInput ii) throws FileOpException {
+        this.input = ii;
+        if (ii.hasFile()) {
+            img = JAI.create("fileload", ii.getFile().getAbsolutePath());
+        } else if (ii.hasInputStream()) {
+            img = JAI.create("stream", ii.getInputStream());
+        } else {
+            throw new FileOpException("unable to get data for image!");
+        }
+		if (img == null) {
+			throw new FileOpException("Unable to load File!");
+		}
+	}
+
+	/* Load an image file into the Object. */
+	public void loadSubimage(ImageInput ii, Rectangle region, int subsample) throws FileOpException {
+		logger.debug("loadSubimage");
+        this.input = ii;
+        if (ii.hasFile()) {
+            img = JAI.create("fileload", ii.getFile().getAbsolutePath());
+        } else if (ii.hasInputStream()) {
+            img = JAI.create("stream", ii.getInputStream());
+        } else {
+            throw new FileOpException("unable to get data for image!");
+        }
+		if ((region.width < img.getWidth())
+				|| (region.height < img.getHeight())) {
+			// setup Crop
+			ParameterBlock cp = new ParameterBlock();
+			cp.addSource(img);
+			cp.add((float) region.x);
+			cp.add((float) region.y);
+			cp.add((float) region.width);
+			cp.add((float) region.height);
+			logger.debug("loadSubimage: crop");
+			img = JAI.create("crop", cp);
+		}
+		if (subsample > 1) {
+			float sc = 1f / subsample;
+			ParameterBlockJAI sp = new ParameterBlockJAI("scale");
+			sp.addSource(img);
+			sp.setParameter("xScale", sc);
+			sp.setParameter("yScale", sc);
+			sp.setParameter("interpolation", Interpolation
+					.getInstance(Interpolation.INTERP_NEAREST));
+			// scale
+			logger.debug("loadSubimage: scale");
+			img = JAI.create("scale", sp);
+		}
+	}
+
+	/* Write the current image to an OutputStream. */
+	public void writeImage(String mt, OutputStream ostream) throws ServletException, ImageOpException {
+		try {
+			// setup output
+			ParameterBlock pb3 = new ParameterBlock();
+			pb3.addSource(img);
+			pb3.add(ostream);
+			if (mt == "image/jpeg") {
+				pb3.add("JPEG");
+			} else if (mt == "image/png") {
+				pb3.add("PNG");
+			} else {
+				// unknown mime type
+				throw new ImageOpException("Unknown mime type: " + mt);
+			}
+			// render output
+			JAI.create("encode", pb3);
+
+		} catch (RuntimeException e) {
+		    // JAI likes to throw RuntimeExceptions
+			throw new ServletException("Error writing image:", e);
+		}
+	}
+
+    /* returns the current image size
+     * @see digilib.image.DocuImageImpl#getSize()
+     */
+    public ImageSize getSize() {
+        ImageSize is = null;
+        // TODO: do we want to cache imgSize?
+        int h = 0;
+        int w = 0;
+        if (img != null) {
+            // get size from image
+            h = img.getHeight();
+            w = img.getWidth();
+            is = new ImageSize(w, h);
+        }
+        return is;
+    }
+
+	/* scales the current image */
+	public void scale(double scale, double scaleY) throws ImageOpException {
+		logger.debug("scale");
+		if ((scale < 1) && (img.getColorModel().getPixelSize() == 1)
+				&& (quality > 0)) {
+			/*
+			 * "SubsampleBinaryToGray" for downscaling BW
+			 */
+			scaleBinary((float) scale);
+		} else if ((scale <= 0.5) && (quality > 1)) {
+			/*
+			 * blur and "Scale" for downscaling color images
+			 */
+			if ((scale <= 0.5) && (quality > 1)) {
+				int bl = (int) Math.floor(1 / scale);
+				// don't blur more than 3
+				blur(Math.min(bl, 3));
+			}
+			scaleAll((float) scale);
+		} else {
+			/*
+			 * "Scale" for the rest
+			 */
+			scaleAll((float) scale);
+		}
+
+		// DEBUG
+		logger.debug("SCALE: " + scale + " ->" + img.getWidth() + "x"
+				+ img.getHeight());
+
+	}
+
+	public void scaleAll(float scale) throws ImageOpException {
+		RenderedImage scaledImg;
+		// DEBUG
+		logger.debug("scaleAll: " + scale);
+		ParameterBlockJAI param = new ParameterBlockJAI("Scale");
+		param.addSource(img);
+		param.setParameter("xScale", scale);
+		param.setParameter("yScale", scale);
+		param.setParameter("interpolation", interpol);
+		// hint with border extender
+		RenderingHints hint = new RenderingHints(JAI.KEY_BORDER_EXTENDER,
+				BorderExtender.createInstance(BorderExtender.BORDER_COPY));
+		// scale
+		scaledImg = JAI.create("Scale", param, hint);
+
+		if (scaledImg == null) {
+			throw new ImageOpException("Unable to scale");
+		}
+		img = scaledImg;
+	}
+
+	public void blur(int radius) throws ImageOpException {
+		RenderedImage blurredImg;
+		int klen = Math.max(radius, 2);
+		logger.debug("blur: " + klen);
+		int ksize = klen * klen;
+		float f = 1f / ksize;
+		float[] kern = new float[ksize];
+		for (int i = 0; i < ksize; i++) {
+			kern[i] = f;
+		}
+		KernelJAI blur = new KernelJAI(klen, klen, kern);
+		ParameterBlockJAI param = new ParameterBlockJAI("Convolve");
+		param.addSource(img);
+		param.setParameter("kernel", blur);
+		// hint with border extender
+		RenderingHints hint = new RenderingHints(JAI.KEY_BORDER_EXTENDER,
+				BorderExtender.createInstance(BorderExtender.BORDER_COPY));
+		blurredImg = JAI.create("Convolve", param, hint);
+		if (blurredImg == null) {
+			throw new ImageOpException("Unable to scale");
+		}
+		img = blurredImg;
+	}
+
+	public void scaleBinary(float scale) throws ImageOpException {
+		RenderedImage scaledImg;
+		// DEBUG
+		logger.debug("scaleBinary: " + scale);
+		ParameterBlockJAI param = new ParameterBlockJAI("SubsampleBinaryToGray");
+		param.addSource(img);
+		param.setParameter("xScale", scale);
+		param.setParameter("yScale", scale);
+		// hint with border extender
+		RenderingHints hint = new RenderingHints(JAI.KEY_BORDER_EXTENDER,
+				BorderExtender.createInstance(BorderExtender.BORDER_COPY));
+		// scale
+		scaledImg = JAI.create("SubsampleBinaryToGray", param, hint);
+		if (scaledImg == null) {
+			throw new ImageOpException("Unable to scale");
+		}
+		img = scaledImg;
+	}
+
+	/* crops the current image */
+	public void crop(int x_off, int y_off, int width, int height)
+			throws ImageOpException {
+		// setup Crop
+		ParameterBlock param = new ParameterBlock();
+		param.addSource(img);
+		param.add((float) x_off);
+		param.add((float) y_off);
+		param.add((float) width);
+		param.add((float) height);
+		RenderedImage croppedImg = JAI.create("crop", param);
+
+		logger.debug("CROP: " + x_off + "," + y_off + ", " + width + ","
+				+ height + " ->" + croppedImg.getWidth() + "x"
+				+ croppedImg.getHeight());
+		img = croppedImg;
+	}
+
+	/* rotates the current image */
+	public void rotate(double angle) throws ImageOpException {
+		RenderedImage rotImg;
+		// convert degrees to radians
+		double rangle = Math.toRadians(angle);
+		double x = img.getWidth() / 2;
+		double y = img.getHeight() / 2;
+
+		// optimize rotation by right angles
+		TransposeType rotOp = null;
+		if (Math.abs(angle - 0) < epsilon) {
+			// 0 degree
+			return;
+		} else if (Math.abs(angle - 90) < epsilon) {
+			// 90 degree
+			rotOp = TransposeDescriptor.ROTATE_90;
+		} else if (Math.abs(angle - 180) < epsilon) {
+			// 180 degree
+			rotOp = TransposeDescriptor.ROTATE_180;
+		} else if (Math.abs(angle - 270) < epsilon) {
+			// 270 degree
+			rotOp = TransposeDescriptor.ROTATE_270;
+		} else if (Math.abs(angle - 360) < epsilon) {
+			// 360 degree
+			return;
+		}
+		if (rotOp != null) {
+			// use Transpose operation
+			ParameterBlock pb = new ParameterBlock();
+			pb.addSource(img);
+			pb.add(rotOp);
+			rotImg = JAI.create("transpose", pb);
+		} else {
+			// setup "normal" rotation
+			ParameterBlock param = new ParameterBlock();
+			param.addSource(img);
+			param.add((float) x);
+			param.add((float) y);
+			param.add((float) rangle);
+			param.add(interpol);
+
+			rotImg = JAI.create("rotate", param);
+		}
+
+		logger.debug("ROTATE: " + x + "," + y + ", " + angle + " (" + rangle
+				+ ")" + " ->" + rotImg.getWidth() + "x" + rotImg.getHeight());
+		img = rotImg;
+	}
+
+	/*
+	 * mirrors the current image works only horizontal and vertical
+	 */
+	public void mirror(double angle) throws ImageOpException {
+		RenderedImage mirImg;
+		// only mirroring by right angles
+		TransposeType rotOp = null;
+		if (Math.abs(angle) < epsilon) {
+			// 0 degree
+			rotOp = TransposeDescriptor.FLIP_HORIZONTAL;
+		} else if (Math.abs(angle - 90) < epsilon) {
+			// 90 degree
+			rotOp = TransposeDescriptor.FLIP_VERTICAL;
+		} else if (Math.abs(angle - 180) < epsilon) {
+			// 180 degree
+			rotOp = TransposeDescriptor.FLIP_HORIZONTAL;
+		} else if (Math.abs(angle - 270) < epsilon) {
+			// 270 degree
+			rotOp = TransposeDescriptor.FLIP_VERTICAL;
+		} else if (Math.abs(angle - 360) < epsilon) {
+			// 360 degree
+			rotOp = TransposeDescriptor.FLIP_HORIZONTAL;
+		}
+		// use Transpose operation
+		ParameterBlock param = new ParameterBlock();
+		param.addSource(img);
+		param.add(rotOp);
+		mirImg = JAI.create("transpose", param);
+
+		if (mirImg == null) {
+			throw new ImageOpException("Unable to flip");
+		}
+		img = mirImg;
+	}
+
+	/* contrast and brightness enhancement */
+	public void enhance(float mult, float add) throws ImageOpException {
+		RenderedImage enhImg;
+		double[] ma = { mult };
+		double[] aa = { add };
+		// use Rescale operation
+		ParameterBlock param = new ParameterBlock();
+		param.addSource(img);
+		param.add(ma);
+		param.add(aa);
+		enhImg = JAI.create("rescale", param);
+
+		logger.debug("ENHANCE: *" + mult + ", +" + add + " ->"
+				+ enhImg.getWidth() + "x" + enhImg.getHeight());
+		// DEBUG
+		img = enhImg;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see digilib.image.DocuImage#enhanceRGB(float[], float[])
+	 */
+	public void enhanceRGB(float[] rgbm, float[] rgba) throws ImageOpException {
+		RenderedImage enhImg;
+		int nb = rgbm.length;
+		double[] ma = new double[nb];
+		double[] aa = new double[nb];
+		for (int i = 0; i < nb; i++) {
+			ma[i] = rgbm[i];
+			aa[i] = rgba[i];
+		}
+		// use Rescale operation
+		ParameterBlock param = new ParameterBlock();
+		param.addSource(img);
+		param.add(ma);
+		param.add(aa);
+		enhImg = JAI.create("rescale", param);
+
+		logger.debug("ENHANCE_RGB: *" + rgbm + ", +" + rgba + " ->"
+				+ enhImg.getWidth() + "x" + enhImg.getHeight());
+		img = enhImg;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see digilib.image.DocuImage#dispose()
+	 */
+	public void dispose() {
+		img = null;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/image/JAIImageLoaderDocuImage.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,219 @@
+/* JAIImageLoaderDocuImage -- Image class implementation using JAI's ImageLoader Plugin
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2002, 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+package digilib.image;
+
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.image.renderable.ParameterBlock;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.FileImageInputStream;
+import javax.imageio.stream.ImageInputStream;
+import javax.media.jai.JAI;
+import javax.servlet.ServletException;
+
+import digilib.io.FileOpException;
+import digilib.io.ImageInput;
+import digilib.util.ImageSize;
+
+/** DocuImage implementation using the Java Advanced Imaging API and the ImageLoader
+ * API of Java 1.4.
+ */
+public class JAIImageLoaderDocuImage extends JAIDocuImage {
+
+	/** ImageIO image reader */
+	protected ImageReader reader;
+	/** current image file */
+	protected File imgFile;
+
+	/* loadSubimage is supported. */
+	public boolean isSubimageSupported() {
+		return true;
+	}
+
+    /* returns the size of the current image */
+    public ImageSize getSize() {
+        ImageSize is = null;
+        // TODO: can we cache imageSize?
+        int h = 0;
+        int w = 0;
+        try {
+            if (img == null) {
+                // get size from ImageReader
+                h = reader.getHeight(0);
+                w = reader.getWidth(0);
+            } else {
+                // get size from image
+                h = img.getHeight();
+                w = img.getWidth();
+            }
+            is = new ImageSize(w, h);
+        } catch (IOException e) {
+            logger.debug("error in getSize:", e);
+        }
+        return is;
+    }
+
+
+	/* Load an image file into the Object. */
+	public void loadImage(ImageInput ii) throws FileOpException {
+		logger.debug("loadImage: "+ii);
+		if (ii.hasImageInputStream()) {
+			img = JAI.create("ImageRead", ii.getImageInputStream());
+		} else if (ii.hasFile()) {
+			img = JAI.create("ImageRead", ii.getFile().getAbsolutePath());
+		}
+		if (img == null) {
+			throw new FileOpException("Unable to load File!");
+		}
+	}
+
+	/* Get an ImageReader for the image file. */
+	public ImageReader getReader(ImageInput input) throws IOException {
+        logger.debug("get ImageReader for " + input);
+        if (this.reader != null) {
+            if (this.input == input) {
+                // it was the same input
+                logger.debug("reusing Reader");
+                return reader;
+            }
+            // clean up old reader
+            logger.debug("cleaning Reader!");
+            dispose();
+        }
+        this.input = input;
+        ImageInputStream istream = null;
+        if (input.hasImageInputStream()) {
+            // stream input
+            istream = input.getImageInputStream();
+        } else if (input.hasFile()) {
+            // file only input
+            RandomAccessFile rf = new RandomAccessFile(input.getFile(), "r");
+            istream = new FileImageInputStream(rf);
+        } else {
+            throw new FileOpException("Unable to get data from ImageInput");
+        }
+        Iterator<ImageReader> readers;
+        String mt = input.getMimetype();
+        if (mt == null) {
+            logger.debug("No mime-type. Trying automagic.");
+            readers = ImageIO.getImageReaders(istream);
+        } else {
+            logger.debug("File type:" + mt);
+            readers = ImageIO.getImageReadersByMIMEType(mt);
+        }
+        if (!readers.hasNext()) {
+            throw new FileOpException("Can't find Reader to load File!");
+        }
+        reader = readers.next();
+        logger.debug("ImageIO: this reader: " + reader.getClass());
+        /* are there more readers? */
+        /* while (readers.hasNext()) {
+            logger.debug("ImageIO: next reader: " + readers.next().getClass());
+        } */
+        reader.setInput(istream);
+        return reader;
+	}
+
+	/* Load an image file into the Object. */
+	public void loadSubimage(ImageInput ii, Rectangle region, int prescale)
+		throws FileOpException {
+		logger.debug("loadSubimage: "+ii.getFile());
+		//System.gc();
+		try {
+			if ((reader == null) || (imgFile != ii.getFile())) {
+				getReader(ii);
+			}
+			ImageReadParam readParam = reader.getDefaultReadParam();
+			readParam.setSourceRegion(region);
+			readParam.setSourceSubsampling(prescale, prescale, 0, 0);
+			img = reader.read(0, readParam);
+			/* JAI imageread seems to ignore the readParam :-(
+			ImageInputStream istream = (ImageInputStream) reader.getInput();
+			ParameterBlockJAI pb = new ParameterBlockJAI("imageread");
+			pb.setParameter("Input", istream);
+			pb.setParameter("ReadParam", readParam);
+			pb.setParameter("Reader", reader);
+			img = JAI.create("imageread", pb);
+			*/
+		} catch (IOException e) {
+			throw new FileOpException("Unable to load File!");
+		}
+		if (img == null) {
+			throw new FileOpException("Unable to load File!");
+		}
+		imgFile = ii.getFile();
+	}
+
+
+	/* Write the current image to an OutputStream. */
+	public void writeImage(String mt, OutputStream ostream)
+		throws ImageOpException, ServletException {
+		logger.debug("writeImage");
+		try {
+			// setup output
+			ParameterBlock pb3 = new ParameterBlock();
+			pb3.addSource(img);
+			pb3.add(ostream);
+			if (mt == "image/jpeg") {
+				pb3.add("JPEG");
+			} else if (mt == "image/png") {
+				pb3.add("PNG");
+			} else {
+				// unknown mime type
+				throw new ImageOpException("Unknown mime type: " + mt);
+			}
+			// render output
+			JAI.create("ImageWrite", pb3);
+		} catch (RuntimeException e) {
+			throw new ServletException("Error writing image.");
+		}
+	}
+
+	@Override
+    public Image getAwtImage() {
+        // TODO Auto-generated method stub
+        return (Image) img;
+    }
+
+    /* (non-Javadoc)
+	 * @see java.lang.Object#finalize()
+	 */
+	protected void finalize() throws Throwable {
+		dispose();
+		super.finalize();
+	}
+
+	public void dispose() {
+		// we must dispose the ImageReader because it keeps the filehandle open!
+		reader.dispose();
+		reader = null;
+		img = null;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/AliasingDocuDirCache.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,98 @@
+/*
+ * AliasingDocuDirCache -- DocuDirCache using alias entries from config file
+ * 
+ * Digital Image Library servlet components
+ * 
+ * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ * 
+ * Created on 04.11.2003
+ */
+
+package digilib.io;
+
+import java.io.File;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import digilib.io.FileOps.FileClass;
+import digilib.servlet.DigilibConfiguration;
+import digilib.util.XMLListLoader;
+
+/**
+ * @author casties
+ *  
+ */
+public class AliasingDocuDirCache extends DocuDirCache {
+
+	/**
+	 * @param baseDirs
+	 * @param fcs
+	 * @param confFileName
+	 * @throws FileOpException
+	 */
+	public AliasingDocuDirCache(String[] baseDirs, FileClass[] fcs,
+			File confFile, DigilibConfiguration dlConfig)
+			throws FileOpException {
+		// create standard DocuDirCache
+		super(baseDirs, fcs, dlConfig);
+		Map<String,String> pathMap = null;
+		// read alias config file
+		try {
+			// load into pathMap
+			XMLListLoader mapLoader = new XMLListLoader("digilib-aliases",
+					"mapping", "link", "dir");
+			pathMap = mapLoader.loadURL(confFile.toURL().toString());
+		} catch (Exception e) {
+			throw new FileOpException("ERROR loading mapping file: " + e);
+		}
+		if (pathMap == null) {
+			throw new FileOpException("ERROR: unable to load mapping file!");
+		}
+
+		/*
+		 * load map entries into cache
+		 */
+
+		for (Entry<String, String> linkdir: pathMap.entrySet()) {
+			if (linkdir.getValue() == null) {
+				logger.error("Key mismatch in mapping file!");
+				break;	
+			}
+			DocuDirectory destDir = new DocuDirectory(linkdir.getValue(), this);
+			if (destDir.isValid()) {
+				logger.debug("Aliasing dir: " + linkdir.getKey());
+				// add the alias name
+				putName(FileOps.normalName(linkdir.getKey()), destDir);
+				// add the real dir
+				putDir(destDir);
+			}
+		}
+	}
+
+	/**
+	 * Adds a DocuDirectory under another name to the cache.
+	 * 
+	 * @param name
+	 * @param newdir
+	 */
+    public void putName(String name, DocuDirectory newdir) {
+        if (map.containsKey(name)) {
+            logger.warn("Duplicate key in AliasingDocuDirCache.put -- ignored!");
+        } else {
+            map.put(name, newdir);
+        }
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/Directory.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,141 @@
+/* Directory -- Filesystem directory object
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ * Created on 26.08.2003
+ *
+ */
+package digilib.io;
+
+import java.io.File;
+import java.util.Arrays;
+
+import org.apache.log4j.Logger;
+
+/** Class for filesystem directories
+ * @author casties
+ *
+ */
+public class Directory {
+
+	protected Logger logger = Logger.getLogger(this.getClass());
+
+	/** File object pointing to the directory */
+	protected File dir = null;
+	/** parent directory */
+	protected Directory parent = null;
+	/** list of filenames in the directory */
+	protected String[] list = null;
+
+	/** Default constructor.
+	 * 
+	 */
+	public Directory() {
+		super();
+	}
+	
+	/** Constructor taking a File object.
+	 * 
+	 * @param d
+	 */
+	public Directory(File d) {
+		dir = d;
+	}
+
+	/** Constructor taking a File object and a parent.
+	 * 
+	 * @param dir
+	 * @param parent
+	 */
+	public Directory(File dir, Directory parent) {
+		this.dir = dir;
+		this.parent = parent;
+	}
+
+	/** Constructor taking a directory name.
+	 * 
+	 * @param d
+	 */
+	public Directory(String dn) {
+		dir = new File(dn);
+	}
+	
+	
+	/** Reads the names of the files in the directory.
+	 * Fills the filenames array. Returns if the operation was successful.
+	 * 
+	 * @return
+	 */
+	public boolean readDir() {
+		if (dir != null) {
+			//logger.debug("reading dir: "+dir.getPath());
+			list = dir.list();
+			if (list != null) {
+				Arrays.sort(list);
+			}
+			//logger.debug("  done");
+		}
+		return (list != null);
+	}
+	
+	/**
+	 * @return
+	 */
+	public File getDir() {
+		return dir;
+	}
+
+	/**
+	 * @param dir
+	 */
+	public void setDir(File dir) {
+		this.dir = dir;
+	}
+	
+	/**
+	 * @return
+	 */
+	Directory getParent() {
+		return parent;
+	}
+
+	/**
+	 * @param parent
+	 */
+	void setParent(Directory parent) {
+		this.parent = parent;
+	}
+
+
+	/**
+	 * @return Returns the filenames.
+	 */
+	public String[] getFilenames() {
+		return list;
+	}
+	
+	/**
+	 * @param filenames The filenames to set.
+	 */
+	public void setFilenames(String[] filenames) {
+		this.list = filenames;
+	}
+	
+	public void clearFilenames() {
+		this.list = null;
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/DocuDirCache.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,362 @@
+/*
+ * DocuDirCache.java
+ * 
+ * Digital Image Library servlet components
+ * 
+ * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ * 
+ * Created on 03.03.2003
+ */
+
+package digilib.io;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.log4j.Logger;
+
+import digilib.io.FileOps.FileClass;
+import digilib.servlet.DigilibConfiguration;
+
+/**
+ * @author casties
+ */
+public class DocuDirCache {
+
+	/** general logger for this class */
+	Logger logger = Logger.getLogger(this.getClass());
+
+	/** HashMap of directories */
+	ConcurrentMap<String, DocuDirectory> map = new ConcurrentHashMap<String, DocuDirectory>();
+
+	/** names of base directories */
+	String[] baseDirNames = null;
+
+	/** array of allowed file classes (image/text) */
+	private FileClass[] fileClasses = null;
+
+	/** number of files in the whole cache (approximate) */
+	long numFiles = 0;
+
+	/** number of cache hits */
+	long hits = 0;
+
+	/** number of cache misses */
+	long misses = 0;
+
+	/** the root directory element */
+	public static Directory ROOT = null;
+
+	/**
+	 * Constructor with array of base directory names and file classes.
+	 * 
+	 * @param bd
+	 *            base directory names
+	 */
+	public DocuDirCache(String[] bd, FileClass[] fcs,
+			DigilibConfiguration dlConfig) {
+		baseDirNames = bd;
+		this.fileClasses = fcs;
+	}
+
+	/**
+	 * Constructor with array of base directory names.
+	 * 
+	 * @param bd
+	 *            base directory names
+	 */
+	public DocuDirCache(String[] bd) {
+		baseDirNames = bd;
+		// default file class is CLASS_IMAGE
+		fileClasses = new FileClass[] { FileClass.IMAGE };
+	}
+
+	/**
+	 * The number of directories in the cache.
+	 * 
+	 * @return
+	 */
+	public int size() {
+		return (map != null) ? map.size() : 0;
+	}
+
+	/**
+	 * Add a DocuDirectory to the cache.
+	 * Always returns the correct Object from the cache, 
+	 * either newdir one or another one.
+	 * 
+	 * @param newdir
+	 * @return dir
+	 */
+	public DocuDirectory put(DocuDirectory newdir) {
+		String s = newdir.getDirName();
+		logger.debug("DocuDirCache.put for "+s+" in "+this);
+		DocuDirectory olddir = map.putIfAbsent(s, newdir);
+		if (olddir != null) {
+			logger.warn("Duplicate key in DocuDirCache.put -- ignoring!");
+			return olddir;
+		}
+		numFiles += newdir.size();
+		return newdir;
+	}
+
+	/**
+	 * Add a directory to the cache and check its parents.
+	 * Always returns the correct Object from the cache, 
+	 * either newDir one or another one.
+	 *
+	 * @param newDir
+	 * @return dir
+	 */
+	public DocuDirectory putDir(DocuDirectory newDir) {
+		DocuDirectory dd = put(newDir);
+		if (dd.getParent() == null) {
+			// no parent link yet
+			String parent = FileOps.parent(newDir.getDirName());
+			if (parent != "") {
+				// check the parent in the cache
+				DocuDirectory pd = map.get(parent);
+				if (pd == null) {
+					// the parent is unknown
+					pd = new DocuDirectory(parent, this);
+					pd = putDir(pd);
+				}
+				newDir.setParent(pd);
+			}
+		}
+		return dd;
+	}
+
+	/**
+	 * Get a list with all children of a directory.
+	 * 
+	 * Returns a List of DocuDirectory's. Returns an empty List if the directory
+	 * has no children. If recurse is false then only direct children are
+	 * returned.
+	 * 
+	 * @param dirname
+	 * @param recurse
+	 *            find all children and their children.
+	 * @return
+	 */
+	public List<DocuDirectory> getChildren(String dirname, boolean recurse) {
+		List<DocuDirectory> l = new LinkedList<DocuDirectory>();
+		for (DocuDirectory dd: map.values()) {
+			if (recurse) {
+				if (dd.getDirName().startsWith(dirname)) {
+					l.add(dd);
+				}
+			} else {
+				if (FileOps.parent(dd.getDirName()).equals(dirname)) {
+					l.add(dd);
+				}
+			}
+		}
+		return l;
+	}
+
+	/**
+	 * Returns the DocuDirent with the pathname <code>fn</code> and the index
+	 * <code>in</code> and the class <code>fc</code>.
+	 * 
+	 * If <code>fn</code> is a file then the corresponding DocuDirent is
+	 * returned and the index is ignored.
+	 * 
+	 * @param fn
+	 *            digilib pathname
+	 * @param in
+	 *            file index
+	 * @param fc
+	 *            file class
+	 * @return
+	 */
+	public DocuDirent getFile(String fn, int in, FileClass fc) {
+		DocuDirectory dd;
+		// file number is 1-based, vector index is 0-based
+		int n = in - 1;
+		// first, assume fn is a directory and look in the cache
+		dd = map.get(fn);
+		if (dd == null) {
+			// cache miss
+			misses++;
+			/*
+			 * see if fn is a directory
+			 */
+			File f = new File(baseDirNames[0], fn);
+			if (f.isDirectory()) {
+                // logger.debug(fn + " is a dir");
+				dd = new DocuDirectory(fn, this);
+				if (dd.isValid()) {
+					// add to the cache
+					dd = putDir(dd);
+				}
+			} else {
+				/*
+				 * maybe it's a file
+				 */
+				// get the parent directory string (like we store it in the
+				// cache)
+				String d = FileOps.parent(fn);
+				// try it in the cache
+                // logger.debug(fn + " is a file in dir " + d);
+				dd = map.get(d);
+				if (dd == null) {
+					// try to read from disk
+					dd = new DocuDirectory(d, this);
+					if (dd.isValid()) {
+						// add to the cache
+                        // logger.debug(dd + " is valid");
+						dd = putDir(dd);
+					} else {
+						// invalid path
+						return null;
+					}
+				} else {
+					// it was not a real cache miss
+					misses--;
+				}
+				// get the file's index
+				n = dd.indexOf(f.getName(), fc);
+			}
+		} else {
+			// cache hit
+			hits++;
+		}
+		dd.refresh();
+		if (dd.isValid()) {
+			try {
+				return dd.get(n, fc);
+			} catch (IndexOutOfBoundsException e) {
+                // logger.debug(fn + " not found in directory");
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the DocuDirectory indicated by the pathname <code>fn</code>.
+	 * 
+	 * If <code>fn</code> is a file then its parent directory is returned.
+	 * 
+	 * @param fn
+	 *            digilib pathname
+	 * @return
+	 */
+	public DocuDirectory getDirectory(String fn) {
+		DocuDirectory dd;
+		// first, assume fn is a directory and look in the cache
+		dd = map.get(fn);
+		if (dd == null) {
+			// cache miss
+			misses++;
+			// see if it's a directory
+			File f = new File(baseDirNames[0], fn);
+			if (f.isDirectory()) {
+				dd = new DocuDirectory(fn, this);
+				if (dd.isValid()) {
+					// add to the cache
+					dd = putDir(dd);
+				}
+			} else {
+				// maybe it's a file
+				if (f.canRead()) {
+					// try the parent directory in the cache
+					dd = map.get(f.getParent());
+					if (dd == null) {
+						// try to read from disk
+						dd = new DocuDirectory(f.getParent(), this);
+						if (dd.isValid()) {
+							// add to the cache
+							dd = putDir(dd);
+						} else {
+							// invalid path
+							return null;
+						}
+					} else {
+						// not a real cache miss then
+						misses--;
+					}
+				} else {
+					// it's not even a file :-(
+					return null;
+				}
+			}
+		} else {
+			// cache hit
+			hits++;
+		}
+		dd.refresh();
+		if (dd.isValid()) {
+			return dd;
+		}
+		return null;
+	}
+
+	/**
+	 * @return String[]
+	 */
+	public String[] getBaseDirNames() {
+		return baseDirNames;
+	}
+
+	/**
+	 * @return long
+	 */
+	public long getNumFiles() {
+		return numFiles;
+	}
+
+	/**
+	 * Sets the baseDirNames.
+	 * 
+	 * @param baseDirNames
+	 *            The baseDirNames to set
+	 */
+	public void setBaseDirNames(String[] baseDirNames) {
+		this.baseDirNames = baseDirNames;
+	}
+
+	/**
+	 * @return long
+	 */
+	public long getHits() {
+		return hits;
+	}
+
+	/**
+	 * @return long
+	 */
+	public long getMisses() {
+		return misses;
+	}
+
+	/**
+	 * @return
+	 */
+	public FileClass[] getFileClasses() {
+		return fileClasses;
+	}
+
+	/**
+	 * @param fileClasses
+	 */
+	public void setFileClasses(FileClass[] fileClasses) {
+		this.fileClasses = fileClasses;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/DocuDirectory.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,549 @@
+/* DocuDirectory -- Directory of DocuFilesets.
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ * Created on 25.02.2003
+ */
+
+package digilib.io;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.xml.sax.SAXException;
+
+import digilib.io.FileOps.FileClass;
+import digilib.meta.MetadataMap;
+import digilib.meta.XMLMetaLoader;
+
+/**
+ * @author casties
+ */
+public class DocuDirectory extends Directory {
+
+	/** list of files (DocuDirent) */
+	private List<List<DocuDirent>> list = null;
+
+	/** directory object is valid (exists on disk) */
+	private boolean isValid = false;
+
+	/** reference of the parent DocuDirCache */
+	private DocuDirCache cache = null;
+
+	/** directory name (digilib canonical form) */
+	private String dirName = null;
+
+	/** array of parallel dirs for scaled images */
+	private Directory[] dirs = null;
+
+	/** directory metadata */
+	private MetadataMap dirMeta = null;
+
+	/** state of metadata is valid */
+	private boolean metaChecked = false;
+
+	/** unresolved file metadata */
+	private Map<String, MetadataMap> unresolvedFileMeta = null;
+
+	/** time of last access of this object (not the filesystem) */
+	private long objectATime = 0;
+
+	/** time directory was last modified on the file system */
+	private long dirMTime = 0;
+
+	/**
+	 * Constructor with digilib directory path and a parent DocuDirCache.
+	 * 
+	 * Directory names at the given path are appended to the base directories
+	 * from the cache. The directory is checked on disk and isValid is set.
+	 * 
+	 * @see readDir
+	 * 
+	 * @param path
+	 *            digilib directory path name
+	 * @param cache
+	 *            parent DocuDirCache
+	 */
+	public DocuDirectory(String path, DocuDirCache cache) {
+		this.dirName = path;
+		this.cache = cache;
+		String baseDirName = cache.getBaseDirNames()[0];
+		// clear directory list
+		FileClass[] fcs = FileClass.values();
+		list = new ArrayList<List<DocuDirent>>(fcs.length);
+		// create empty list for all classes
+		for (@SuppressWarnings("unused") FileClass fc: fcs) {
+		    list.add(null);
+		}
+		dirMTime = 0;
+		// the first directory has to exist
+		dir = new File(baseDirName, path);
+		isValid = dir.isDirectory();
+	}
+
+	/**
+	 * number of DocuFiles in this directory.
+	 *  
+	 */
+	public int size() {
+		return ((list != null) && (list.get(0) != null)) ? list.get(0).size() : 0;
+	}
+
+	/**
+	 * number of files of this class in this directory.
+	 * 
+	 * @param fc
+	 *            fileClass
+	 */
+	public int size(FileClass fc) {
+		return ((list != null) && (list.get(fc.ordinal()) != null)) ? list.get(fc.ordinal()).size() : 0;
+	}
+
+	/**
+	 * Returns the ImageFileSet at the index.
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public DocuDirent get(int index) {
+		if ((list == null) || (list.get(0) == null) || (index >= list.get(0).size())) {
+			return null;
+		}
+		return list.get(0).get(index);
+	}
+
+	/**
+	 * Returns the file of the class at the index.
+	 * 
+	 * @param index
+	 * @param fc
+	 *            fileClass
+	 * @return
+	 */
+	public DocuDirent get(int index, FileClass fc) {
+		if ((list == null) || (list.get(fc.ordinal()) == null) || (index >= list.get(fc.ordinal()).size())) {
+			return null;
+		}
+		return (DocuDirent) list.get(fc.ordinal()).get(index);
+	}
+
+	/**
+	 * Read the filesystem directory and fill this object.
+	 * 
+	 * Clears the List and (re)reads all files.
+	 * 
+	 * @return boolean the directory exists
+	 */
+	public synchronized boolean readDir() {
+		// check directory first
+		if (!isValid) {
+			return false;
+		}
+		// re-check modification time because the thread may have slept
+		if (dir.lastModified() <= dirMTime) {
+			return true;
+		}
+		// read all filenames
+		logger.debug("reading directory "+this+" = "+dir.getPath());
+		File[] allFiles = null;
+		/*
+		 * using ReadableFileFilter is safer (we won't get directories with file
+		 * extensions) but slower.
+		 */
+		// allFiles = dir.listFiles(new FileOps.ReadableFileFilter());
+		allFiles = dir.listFiles();
+		if (allFiles == null) {
+			// not a directory
+			return false;
+		}
+		// init parallel directories
+		if (dirs == null) {
+			// list of base dirs from the parent cache
+			String[] baseDirNames = cache.getBaseDirNames();
+			// number of base dirs
+			int nb = baseDirNames.length;
+			// array of parallel dirs
+			dirs = new Directory[nb];
+			// first entry is this directory
+			dirs[0] = this;
+			// fill array with the remaining directories
+			for (int j = 1; j < nb; j++) {
+				// add dirName to baseDirName
+				File d = new File(baseDirNames[j], dirName);
+				if (d.isDirectory()) {
+					dirs[j] = new Directory(d);
+					logger.debug("  reading scaled directory " + d.getPath());
+					dirs[j].readDir();
+				}
+			}
+		}
+
+		// go through all file classes
+		for (FileClass fileClass : cache.getFileClasses()) {
+			File[] fileList = FileOps.listFiles(allFiles,
+					FileOps.filterForClass(fileClass));
+			// number of files in the directory
+			int numFiles = fileList.length;
+			if (numFiles > 0) {
+				// create new list
+				ArrayList<DocuDirent> dl = new ArrayList<DocuDirent>(numFiles);
+				list.set(fileClass.ordinal(), dl);
+				for (File f : fileList) {
+					DocuDirent df = FileOps.fileForClass(fileClass, f, dirs);
+					df.setParent(this);
+					// add the file to our list
+					dl.add(df);
+				}
+				/*
+				 * we sort the inner ArrayList (the list of files not the list
+				 * of file types) for binarySearch to work (DocuDirent's natural
+				 * sort order is by filename)
+				 */
+				Collections.sort(dl);
+			}
+		}
+		// clear the scaled directories
+		for (Directory d: dirs) {
+			if (d != null) {
+				d.clearFilenames();
+			}
+		}
+		// update number of cached files if this was the first time
+		if (dirMTime == 0) {
+			cache.numFiles += size();
+		}
+		dirMTime = dir.lastModified();
+		// read metadata as well
+		readMeta();
+		return isValid;
+	}
+
+	/**
+	 * Check to see if the directory has been modified and reread if necessary.
+	 * 
+	 * @return boolean the directory is valid
+	 */
+	public boolean refresh() {
+		if (isValid) {
+			if (dir.lastModified() > dirMTime) {
+				// on-disk modification time is more recent
+				readDir();
+			}
+			touch();
+		}
+		return isValid;
+	}
+
+	/**
+	 * Read directory metadata.
+	 *  
+	 */
+	public void readMeta() {
+		// check for directory metadata...
+		File mf = new File(dir, "index.meta");
+		if (mf.canRead()) {
+			XMLMetaLoader ml = new XMLMetaLoader();
+			try {
+				// read directory meta file
+				Map<String, MetadataMap> fileMeta = ml.loadURL(mf.getAbsolutePath());
+				if (fileMeta == null) {
+					return;
+				}
+				// meta for the directory itself is in the "" bin
+				dirMeta = fileMeta.remove("");
+				// read meta for files in this directory
+				readFileMeta(fileMeta, null);
+				// is there meta for other files left?
+				if (fileMeta.size() > 0) {
+					unresolvedFileMeta = fileMeta;
+				}
+			} catch (SAXException e) {
+				logger.warn("error parsing index.meta", e);
+			} catch (IOException e) {
+				logger.warn("error reading index.meta", e);
+			}
+		}
+		readParentMeta();
+		metaChecked = true;
+	}
+
+	/**
+	 * Read metadata from all known parent directories.
+	 *  
+	 */
+	public void readParentMeta() {
+		// check the parent directories for additional file meta
+		Directory dd = parent;
+		String path = dir.getName();
+		while (dd != null) {
+			if (((DocuDirectory) dd).hasUnresolvedFileMeta()) {
+				readFileMeta(((DocuDirectory) dd).unresolvedFileMeta, path);
+			}
+			// prepend parent dir path
+			path = dd.dir.getName() + "/" + path;
+			// become next parent
+			dd = dd.parent;
+		}
+	}
+
+	/**
+	 * Read metadata for the files in this directory.
+	 * 
+	 * Takes a Map with meta-information, adding the relative path before the
+	 * lookup.
+	 * 
+	 * @param fileMeta
+	 * @param relPath
+	 * @param fc
+	 *            fileClass
+	 */
+	protected void readFileMeta(Map<String,MetadataMap> fileMeta, String relPath) {
+		if (list == null) {
+			// there are no files
+			return;
+		}
+		String path = (relPath != null) ? (relPath + "/") : "";
+		// go through all file classes
+		for (FileClass fc: FileClass.values()) {
+			if (list.get(fc.ordinal()) == null) {
+				continue;
+			}
+			// iterate through the list of files in this directory
+			for (DocuDirent f: list.get(fc.ordinal())) {
+				// prepend path to the filename
+				String fn = path + f.getName();
+				// look up meta for this file and remove from dir
+				MetadataMap meta = fileMeta.remove(fn);
+				if (meta != null) {
+					// store meta in file
+					f.setFileMeta(meta);
+				}
+			}
+		}
+	}
+
+	protected void notifyChildMeta(MetadataMap childmeta) {
+		List<DocuDirectory> children = cache.getChildren(this.dirName, true);
+		if (children.size() > 0) {
+			/*for (DocuDirectory d: children) {
+				// TODO: finish this!
+				//((DocuDirectory) i.next()).readFileMeta()
+			}*/
+		}
+	}
+
+	/**
+	 * Update access time.
+	 * 
+	 * @return long time of last access.
+	 */
+	public long touch() {
+		long t = objectATime;
+		objectATime = System.currentTimeMillis();
+		return t;
+	}
+
+	/**
+	 * Searches for the file with the name <code>fn</code>.
+	 * 
+	 * Searches the directory for the file with the name <code>fn</code> and
+	 * returns its index. Returns -1 if the file cannot be found.
+	 * 
+	 * @param fn
+	 *            filename
+	 * @param fc
+	 *            file class
+	 * @return int index of file <code>fn</code>
+	 */
+	public int indexOf(String fn) {
+		FileClass fc = FileOps.classForFilename(fn);
+		return indexOf(fn, fc);
+	}
+
+	/**
+	 * Searches for the file with the name <code>fn</code> and class fc.
+	 * 
+	 * Searches the directory for the file with the name <code>fn</code> and
+	 * returns its index. Returns -1 if the file cannot be found.
+	 * 
+	 * @param fn
+	 *            filename
+	 * @return int index of file <code>fn</code>
+	 */
+	public int indexOf(String fn, FileClass fc) {
+		if (!isRead()) {
+			// read directory now
+			if (!readDir()) {
+				return -1;
+			}
+		}
+		List<DocuDirent> fileList = list.get(fc.ordinal());
+		// empty directory?
+		if (fileList == null) {
+			return -1;
+		}
+        
+		// search for exact match (DocuDirent does compareTo<String>)
+        // OBS: fileList needs to be sorted first (see )! <hertzhaft>
+		int idx = Collections.binarySearch(fileList, fn);
+		if (idx >= 0) {
+			return idx;
+		} else {
+            logger.debug(fn + " not found by binarysearch");
+			// try closest matches without extension
+			idx = -idx - 1;
+			if ((idx < fileList.size())
+					&& isBasenameInList(fileList, idx, fn)) {
+				// idx matches
+				return idx;
+			} else if ((idx > 0)
+					&& isBasenameInList(fileList, idx-1, fn)) {
+				// idx-1 matches
+				return idx - 1;
+			} else if ((idx + 1 < fileList.size())
+					&& isBasenameInList(fileList, idx+1, fn)) {
+				// idx+1 matches
+				return idx + 1;
+			}
+
+		}
+		return -1;
+	}
+
+	private boolean isBasenameInList(List<DocuDirent> fileList, int idx, String fn) {
+		String dfn = FileOps.basename((fileList.get(idx)).getName());
+		return (dfn.equals(fn)||dfn.equals(FileOps.basename(fn))); 
+	}
+	
+	
+	/**
+	 * Finds the DocuDirent with the name <code>fn</code>.
+	 * 
+	 * Searches the directory for the DocuDirent with the name <code>fn</code>
+	 * and returns it. Returns null if the file cannot be found.
+	 * 
+	 * @param fn
+	 *            filename
+	 * @return DocuDirent
+	 */
+	public DocuDirent find(String fn) {
+		FileClass fc = FileOps.classForFilename(fn);
+		int i = indexOf(fn, fc);
+		if (i >= 0) {
+			return list.get(0).get(i);
+		}
+		return null;
+	}
+
+	/**
+	 * Finds the DocuDirent with the name <code>fn</code> and class
+	 * <code>fc</code>.
+	 * 
+	 * Searches the directory for the DocuDirent with the name <code>fn</code>
+	 * and returns it. Returns null if the file cannot be found.
+	 * 
+	 * @param fn
+	 *            filename
+	 * @return DocuDirent
+	 */
+	public DocuDirent find(String fn, FileClass fc) {
+		int i = indexOf(fn, fc);
+		if (i >= 0) {
+			return list.get(fc.ordinal()).get(i);
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the digilib canonical name.
+	 * 
+	 * @return
+	 */
+	public String getDirName() {
+		return dirName;
+	}
+
+	/**
+	 * The directory is valid (exists on disk).
+	 * 
+	 * @return boolean
+	 */
+	public boolean isValid() {
+		return isValid;
+	}
+
+	/**
+	 * The directory has been read from disk.
+	 * 
+	 * @return
+	 */
+	public boolean isRead() {
+		return (dirMTime != 0);
+	}
+
+	/**
+	 * @return long
+	 */
+	public long getAccessTime() {
+		return objectATime;
+	}
+
+	/**
+	 * @return Hashtable
+	 */
+	public MetadataMap getDirMeta() {
+		return dirMeta;
+	}
+
+	/**
+	 * Checks metadata
+	 *  
+	 */
+	public void checkMeta() {
+		if (metaChecked) {
+			return;
+		} else {
+			readMeta();
+		}
+	}
+
+	/**
+	 * @return long
+	 */
+	public long getDirMTime() {
+		return dirMTime;
+	}
+
+	/**
+	 * Sets the dirMeta.
+	 * 
+	 * @param dirMeta
+	 *            The dirMeta to set
+	 */
+	public void setDirMeta(MetadataMap dirMeta) {
+		this.dirMeta = dirMeta;
+	}
+
+	public boolean hasUnresolvedFileMeta() {
+		return (this.unresolvedFileMeta != null);
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/DocuDirent.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,81 @@
+package digilib.io;
+
+import java.io.File;
+
+import digilib.meta.MetadataMap;
+
+public interface DocuDirent extends Comparable<Object> {
+
+    /**
+     * Checks metadata and does something with it.
+     *  
+     */
+    public abstract void checkMeta();
+
+    /**
+     * gets the (default) File
+     * 
+     * @return
+     */
+    public abstract File getFile();
+
+    /**
+     * Reads meta-data for this Fileset if there is any.
+     *  
+     */
+    public abstract void readMeta();
+
+    /**
+     * The name of the file.
+     * 
+     * If this is a Fileset, the method returns the name of the default file
+     * (for image filesets the highest resolution file).
+     * 
+     * @return
+     */
+    public abstract String getName();
+
+    /**
+     * Returns the parent Directory.
+     * 
+     * @return DocuDirectory
+     */
+    public abstract Directory getParent();
+
+    /**
+     * Sets the parent Directory.
+     * 
+     * @param parent
+     *            The parent to set
+     */
+    public abstract void setParent(Directory parent);
+
+    /**
+     * Returns the meta-data for this file(set).
+     * 
+     * @return HashMap
+     */
+    public abstract MetadataMap getFileMeta();
+
+    /**
+     * Sets the meta-data for this file(set) .
+     * 
+     * @param fileMeta
+     *            The fileMeta to set
+     */
+    public abstract void setFileMeta(MetadataMap fileMeta);
+
+    /**
+     * @return
+     */
+    public abstract boolean isMetaChecked();
+
+    /** Comparator using the file name.
+     * Compares to a String (for binarySearch)
+     * or to another DocuDirent (for sort)
+     * 
+     * @see java.lang.Comparable#compareTo(java.lang.Object)
+     */
+    public abstract int compareTo(Object arg0);
+
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/DocuDirentImpl.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,149 @@
+/*
+ * DocuDirent.java -- Abstract directory entry in a DocuDirectory
+ * 
+ * Digital Image Library servlet components
+ * 
+ * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ * 
+ * Created on 15.09.2003 by casties
+ *  
+ */
+package digilib.io;
+
+import java.io.File;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import digilib.io.FileOps.FileClass;
+import digilib.meta.MetadataMap;
+import digilib.meta.XMLMetaLoader;
+
+/**
+ * Abstract directory entry in a DocuDirectory.
+ * 
+ * @author casties
+ *  
+ */
+public abstract class DocuDirentImpl implements DocuDirent {
+
+	/** the file class of this file */
+	protected static FileClass fileClass = FileClass.NONE;
+	/** HashMap with metadata */
+	protected MetadataMap fileMeta = null;
+	/** Is the Metadata valid */
+	protected boolean metaChecked = false;
+	/** the parent directory */
+	protected Directory parent = null;
+
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#checkMeta()
+     */
+	public abstract void checkMeta();
+
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getInput()
+     */
+	public abstract File getFile();
+
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#readMeta()
+     */
+	public void readMeta() {
+		if ((fileMeta != null) || (getFile() == null)) {
+			// there is already metadata or there is no file
+			return;
+		}
+		// metadata is in the file {filename}.meta
+		String fn = getFile().getAbsolutePath();
+		File mf = new File(fn + ".meta");
+		if (mf.canRead()) {
+			XMLMetaLoader ml = new XMLMetaLoader();
+			try {
+				// read meta file
+				Map<String, MetadataMap> meta = ml.loadURL(mf.getAbsolutePath());
+				if (meta == null) {
+					return;
+				}
+				fileMeta = meta.get(getName());
+			} catch (Exception e) {
+				Logger.getLogger(this.getClass()).warn("error reading file .meta", e);
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getName()
+     */
+	public String getName() {
+		File f = getFile();
+		return (f != null) ? f.getName() : null;
+	} 
+	
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getParent()
+     */
+	public Directory getParent() {
+		return parent;
+	}
+	
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#setParent(digilib.io.Directory)
+     */
+	public void setParent(Directory parent) {
+		this.parent = parent;
+	} 
+	
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getFileMeta()
+     */
+	public MetadataMap getFileMeta() {
+		return fileMeta;
+	} 
+	
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#setFileMeta(digilib.io.MetadataMap)
+     */
+	public void setFileMeta(MetadataMap fileMeta) {
+		this.fileMeta = fileMeta;
+	} 
+	
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#isMetaChecked()
+     */
+	public boolean isMetaChecked() {
+		return metaChecked;
+	} 
+	
+	/**
+	 * @return
+	 */
+	public static FileClass getFileClass() {
+		return fileClass;
+	}
+
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#compareTo(java.lang.Object)
+     */
+	public int compareTo(Object arg0) {
+		if (arg0 instanceof DocuDirentImpl) {
+		    return getName().compareTo(((DocuDirent) arg0).getName());
+		} else {
+		    return getName().compareTo((String) arg0);
+		}
+	}
+
+	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/FileOpException.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,35 @@
+/*  FileOpException -- Exception class for file operations
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ */
+
+package digilib.io;
+
+import java.io.IOException;
+
+public class FileOpException extends IOException {
+
+	private static final long serialVersionUID = 7299056561734277644L;
+
+	public FileOpException() {
+	}
+
+	public FileOpException(String s) {
+		super(s);
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/FileOps.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,398 @@
+/*
+ * FileOps -- Utility class for file operations
+ * 
+ * Digital Image Library servlet components
+ * 
+ * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *  
+ */
+
+package digilib.io;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+public class FileOps {
+
+	/**
+	 * Array of file extensions and corresponding mime-types.
+	 */
+	private static final String[][] ft = { { "jpg", "image/jpeg" },
+			{ "jpeg", "image/jpeg" }, { "jp2", "image/jp2" },
+			{ "png", "image/png" }, { "gif", "image/gif" },
+			{ "tif", "image/tiff" }, { "tiff", "image/tiff" },
+                        { "fpx", "image/fpx" },
+			{ "txt", "text/plain" }, { "html", "text/html" },
+			{ "htm", "text/html" }, { "xml", "text/xml" },
+			{ "svg", "image/svg+xml" }, { "meta", "text/xml" } };
+
+	public static Map<String, String> fileTypes;
+
+	public static List<String> imageExtensions;
+
+	public static List<String> textExtensions;
+
+	public static List<String> svgExtensions;
+
+	public static enum FileClass {NONE, IMAGE, TEXT, SVG}
+
+	public static final Integer HINT_BASEDIRS = new Integer(1);
+
+	public static final Integer HINT_FILEEXT = new Integer(2);
+
+	public static final Integer HINT_DIRS = new Integer(3);
+
+	/**
+	 * static initializer for FileOps
+	 */
+	static {
+		fileTypes = new HashMap<String, String>();
+		imageExtensions = new ArrayList<String>();
+		textExtensions = new ArrayList<String>();
+		svgExtensions = new ArrayList<String>();
+		// iterate through file types in ft and fill the Map and Lists
+		for (int i = 0; i < ft.length; i++) {
+			String ext = ft[i][0];
+			String mt = ft[i][1];
+			fileTypes.put(ext, mt);
+			if (classForMimetype(mt) == FileClass.IMAGE) {
+				imageExtensions.add(ext);
+			} else if (classForMimetype(mt) == FileClass.TEXT) {
+				textExtensions.add(ext);
+			} else if (classForMimetype(mt) == FileClass.SVG) {
+				svgExtensions.add(ext);
+			}
+		}
+	}
+
+	/**
+	 * returns the file class for a mime-type
+	 * 
+	 * @param mt
+	 * @return
+	 */
+	public static FileClass classForMimetype(String mt) {
+		if (mt == null) {
+			return FileClass.NONE;
+		}
+		if (mt.startsWith("image/svg")) {
+			return FileClass.SVG;
+		} else if (mt.startsWith("image")) {
+			return FileClass.IMAGE;
+		} else if (mt.startsWith("text")) {
+			return FileClass.TEXT;
+		}
+		return FileClass.NONE;
+	}
+
+	/**
+	 * get the mime type for a file format (by extension)
+	 */
+	public static String mimeForFile(File f) {
+	    if (f == null) {
+	        return null;
+	    }
+		return fileTypes.get(extname(f.getName().toLowerCase()));
+	}
+
+	/**
+	 * get the file class for the filename (by extension)
+	 * 
+	 * @param fn
+	 * @return
+	 */
+	public static FileClass classForFilename(String fn) {
+		String mt = (String) fileTypes.get(extname(fn).toLowerCase());
+		return classForMimetype(mt);
+	}
+
+	public static Iterator<String> getImageExtensionIterator() {
+		return imageExtensions.iterator();
+	}
+
+    public static List<String> getImageExtensions() {
+        return imageExtensions;
+    }
+
+    public static Iterator<String> getTextExtensionIterator() {
+		return textExtensions.iterator();
+	}
+
+	public static List<String> getTextExtensions() {
+        return textExtensions;
+    }
+
+    public static Iterator<String> getSVGExtensionIterator() {
+		return svgExtensions.iterator();
+	}
+
+    public static List<String> getSvgExtensions() {
+        return svgExtensions;
+    }
+
+
+	/**
+	 * convert a string with a list of pathnames into an array of strings using
+	 * the system's path separator string
+	 */
+	public static String[] pathToArray(String paths) {
+		// split list into directories
+		StringTokenizer dirs = new StringTokenizer(paths, File.pathSeparator);
+		int n = dirs.countTokens();
+		if (n < 1) {
+			return null;
+		}
+		// add directories into array
+		String[] pathArray = new String[n];
+		for (int i = 0; i < n; i++) {
+			String s = dirs.nextToken();
+			// make shure the dir name ends with a directory separator
+			if (s.endsWith(File.separator)) {
+				pathArray[i] = s;
+			} else {
+				pathArray[i] = s + File.separator;
+			}
+		}
+		return pathArray;
+	}
+
+	/**
+	 * Extract the base of a file name (sans extension).
+	 * 
+	 * Returns the filename without the extension. The extension is the part
+	 * behind the last dot in the filename. If the filename has no dot the full
+	 * file name is returned.
+	 * 
+	 * @param fn
+	 * @return
+	 */
+	public static String basename(String fn) {
+		if (fn == null) {
+			return null;
+		}
+		int i = fn.lastIndexOf('.');
+		if (i > 0) {
+			return fn.substring(0, i);
+		}
+		return fn;
+	}
+
+	/**
+	 * Extract the extension of a file name.
+	 * 
+	 * Returns the extension of a file name. The extension is the part behind
+	 * the last dot in the filename. If the filename has no dot the empty string
+	 * is returned.
+	 * 
+	 * @param fn
+	 * @return
+	 */
+	public static String extname(String fn) {
+		if (fn == null) {
+			return null;
+		}
+		int i = fn.lastIndexOf('.');
+		if (i > 0) {
+			return fn.substring(i + 1);
+		}
+		return "";
+	}
+
+	/**
+	 * Extract the parent directory of a (digilib) path name.
+	 * 
+	 * Returns the parent directory of a path name. The parent is the part
+	 * before the last slash in the path name. If the path name has no slash the
+	 * empty string is returned.
+	 * 
+	 * @param fn
+	 * @return
+	 */
+	public static String parent(String fn) {
+		if (fn == null) {
+			return null;
+		}
+		int i = fn.lastIndexOf('/');
+		if (i > 0) {
+			return fn.substring(0, i);
+		}
+		return "";
+	}
+
+	/**
+	 * Normalize a path name.
+	 * 
+	 * Removes leading and trailing slashes. Returns null if there is other
+	 * unwanted stuff in the path name.
+	 * 
+	 * @param pathname
+	 * @return
+	 */
+	public static String normalName(String pathname) {
+		if (pathname == null) {
+			return null;
+		}
+		// upper-dir references are unwanted
+		if (pathname.indexOf("../") >= 0) {
+			return null;
+		}
+		int a = 0;
+		int e = pathname.length() - 1;
+		if (e < 0) {
+			return pathname;
+		}
+		// leading and trailing "/" are removed
+		while ((a <= e) && (pathname.charAt(a) == '/')) {
+			a++;
+		}
+		while ((a < e) && (pathname.charAt(e) == '/')) {
+			e--;
+		}
+		return pathname.substring(a, e + 1);
+	}
+
+	/**
+	 * FileFilter for general files
+	 */
+	static class ReadableFileFilter implements FileFilter {
+
+		public boolean accept(File f) {
+			return f.canRead();
+		}
+	}
+
+	/**
+	 * FileFilter for image types (helper class for getFile)
+	 */
+	static class ImageFileFilter implements FileFilter {
+
+		public boolean accept(File f) {
+			return (classForFilename(f.getName()) == FileClass.IMAGE);
+		}
+	}
+
+	/**
+	 * FileFilter for text types (helper class for getFile)
+	 */
+	static class TextFileFilter implements FileFilter {
+
+		public boolean accept(File f) {
+			return (classForFilename(f.getName()) == FileClass.TEXT);
+		}
+	}
+
+	/**
+	 * FileFilter for svg types (helper class for getFile).
+	 *  
+	 */
+	static class SVGFileFilter implements FileFilter {
+
+		public boolean accept(File f) {
+			return (classForFilename(f.getName()) == FileClass.SVG);
+		}
+	}
+
+	/**
+	 * Factory for FileFilters (image or text).
+	 * 
+	 * @param fileClass
+	 * @return
+	 */
+	public static FileFilter filterForClass(FileClass fileClass) {
+		if (fileClass == FileClass.IMAGE) {
+			return new ImageFileFilter();
+		}
+		if (fileClass == FileClass.TEXT) {
+			return new TextFileFilter();
+		}
+		if (fileClass == FileClass.SVG) {
+			return new SVGFileFilter();
+		}
+		return null;
+	}
+
+	/**
+	 * Factory for DocuDirents based on file class.
+	 * 
+	 * Returns an ImageSet, TextFile or SVGFile. scaleDirs are
+	 * only for ImageFilesets.
+	 * 
+	 * @param fileClass
+	 * @param file
+	 * @param scaleDirs
+	 *            optional additional parameters
+	 * @return
+	 */
+	public static DocuDirent fileForClass(FileClass fileClass, File file, Directory[] scaleDirs) {
+		// what class of file do we have?
+		if (fileClass == FileClass.IMAGE) {
+			// image file
+			return new ImageFileSet(file, scaleDirs);
+		} else if (fileClass == FileClass.TEXT) {
+			// text file
+			return new TextFile(file);
+		} else if (fileClass == FileClass.SVG) {
+			// text file
+			return new SVGFile(file);
+		}
+		return null;
+	}
+
+	/**
+	 * Filters a list of Files through a FileFilter.
+	 * 
+	 * @param files
+	 * @param filter
+	 * @return
+	 */
+	public static File[] listFiles(File[] files, FileFilter filter) {
+		if (files == null) {
+			return null;
+		}
+		File[] ff = new File[files.length];
+		int ffi = 0;
+		for (int i = 0; i < files.length; i++) {
+			if (filter.accept(files[i])) {
+				ff[ffi] = files[i];
+				ffi++;
+			}
+		}
+		File[] fff = new File[ffi];
+		System.arraycopy(ff, 0, fff, 0, ffi);
+		return fff;
+	}
+
+	/**
+	 * Creates a new hints Map with the given first element.
+	 * 
+	 * @param type
+	 * @param value
+	 * @return
+	 */
+	public static Map<Integer, Object> newHints(Integer type, Object value) {
+		Map<Integer, Object> m = new HashMap<Integer, Object>();
+		if (type != null) {
+			m.put(type, value);
+		}
+		return m;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/ImageCacheStream.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,49 @@
+/**
+ * 
+ */
+package digilib.io;
+
+import java.io.InputStream;
+
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.MemoryCacheImageInputStream;
+
+/**
+ * @author casties
+ *
+ */
+public class ImageCacheStream extends ImageStream {
+
+    public ImageCacheStream(InputStream stream, String mimeType) {
+        super(stream, mimeType);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see digilib.io.ImageInput#hasImageInputStream()
+     */
+    @Override
+    public boolean hasImageInputStream() {
+        return true;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see digilib.io.ImageInput#getImageInputStream()
+     */
+    @Override
+    public ImageInputStream getImageInputStream() {
+        /*
+         * TODO: which type of stream backing? 
+         * In general, it is preferable to
+         * use a FileCacheImageInputStream when reading from a regular
+         * InputStream. This class is provided for cases where it is not
+         * possible to create a writable temporary file.
+         */
+        ImageInputStream iis = new MemoryCacheImageInputStream(this.stream);
+        return iis;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/ImageFile.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,183 @@
+/* ImageFile.java -- digilib image file class.
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ * Created on 25.02.2003
+ */
+ 
+package digilib.io;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+import javax.imageio.stream.FileImageInputStream;
+import javax.imageio.stream.ImageInputStream;
+
+import digilib.servlet.DigilibConfiguration;
+import digilib.util.ImageSize;
+
+/**
+ * @author casties
+ */
+public class ImageFile extends ImageInput {
+	
+	// file
+	private File file = null;
+	// file name
+	private String name = null;
+	// parent directory
+	private Directory dir = null;
+
+	/** Constructor with File.
+	 * 
+	 * @param f
+	 * @param parent
+	 * @param dir
+	 */
+	public ImageFile(File f, ImageSet parent, Directory dir) {
+		this.file = f;
+		this.name = f.getName();
+		this.parent = parent;
+		this.dir = dir;
+	}
+	
+	/** Constructor with filename (without path).
+	 * @param fn
+	 * @param parent
+	 * @param dir
+	 */
+	public ImageFile(String fn, ImageSet parent, Directory dir) {
+		this.name = fn;
+		this.dir = dir;
+		this.file = new File(this.dir.getDir(), fn);
+		this.parent = parent;
+	}
+	
+	
+	/** Checks the image and sets size and type.
+	 * 
+	 */
+	public void check() {
+	    if (pixelSize == null) {
+	        try {
+	            // use the configured toolkit to identify the image
+                DigilibConfiguration.identifyDocuImage(this);
+            } catch (IOException e) {
+                // nothing much to do...
+            }
+	    }
+	}
+	
+	/* (non-Javadoc)
+     * @see digilib.io.ImageInput#getSize()
+     */
+    @Override
+    public ImageSize getSize() {
+        check();
+        return pixelSize;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.ImageInput#getMimetype()
+     */
+    @Override
+    public String getMimetype() {
+        check();
+        return mimetype;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.ImageInput#getAspect()
+     */
+    @Override
+    public float getAspect() {
+        check();
+        return (pixelSize != null) ? pixelSize.getAspect() : 0f;
+    }
+
+    /** Returns the file name (without path).
+	 * 
+	 * @return
+	 */
+	public String getName() {
+		return name;
+	}
+
+	
+	/* (non-Javadoc)
+     * @see digilib.io.ImageInput#hasImageInputStream()
+     */
+    @Override
+    public boolean hasImageInputStream() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.ImageInput#getImageInputStream()
+     */
+    @Override
+    public ImageInputStream getImageInputStream() {
+        try {
+            RandomAccessFile rf = new RandomAccessFile(file, "r");
+            return new FileImageInputStream(rf);
+        } catch (IOException e) {
+            // what now?
+        }
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.ImageInput#hasFile()
+     */
+    @Override
+    public boolean hasFile() {
+        return true;
+    }
+
+    /* (non-Javadoc)
+	 * @see digilib.io.ImageInput#getFile()
+	 */
+	public File getFile() {
+		return file;
+	}
+
+	/* (non-Javadoc)
+	 * @see digilib.io.ImageInput#setSize(digilib.image.ImageSize)
+	 */
+	public void setSize(ImageSize imageSize) {
+		this.pixelSize = imageSize;
+		// pass on to parent
+		if (this.parent != null) {
+			this.parent.setAspect(imageSize);
+		}
+	}
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        // try to use File.toString
+        if (file != null) {
+            return file.toString();
+        }
+        return super.toString();
+    }
+
+	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/ImageFileSet.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,307 @@
+/**
+ * 
+ */
+package digilib.io;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import digilib.io.FileOps.FileClass;
+import digilib.meta.MetadataMap;
+import digilib.meta.XMLMetaLoader;
+
+/**
+ * @author casties
+ *
+ */
+public class ImageFileSet extends ImageSet implements DocuDirent {
+
+    /** this is an image file */
+    protected static FileClass fileClass = FileClass.IMAGE;
+    /** the (main) file */
+    protected File file = null;
+    /** the file name */
+    protected String name = null;
+	/** HashMap with metadata */
+	protected MetadataMap fileMeta = null;
+	/** Is the Metadata valid */
+	protected boolean metaChecked = false;
+	/** the parent directory */
+	protected Directory parentDir = null;
+    
+    /**
+     * Constructor with a File and Directories.
+     * 
+     * @param file
+     * @param scaleDirs
+     */
+    public ImageFileSet(File file, Directory[] scaleDirs) {
+        int nb = scaleDirs.length;
+        list = new ArrayList<ImageInput>(nb);
+        // first dir is our parent
+        parentDir = scaleDirs[0];
+        this.file = file;
+        this.name = file.getName();
+        fill(scaleDirs, file);
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getName()
+     */
+    public String getName() {
+    	return this.name;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getParent()
+     */
+    public Directory getParent() {
+    	return this.parentDir;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#setParent(digilib.io.Directory)
+     */
+    public void setParent(Directory parent) {
+    	this.parentDir = parent;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getFileMeta()
+     */
+    public MetadataMap getFileMeta() {
+    	return this.fileMeta;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#setFileMeta(digilib.io.MetadataMap)
+     */
+    public void setFileMeta(MetadataMap fileMeta) {
+    	this.fileMeta = fileMeta;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#isMetaChecked()
+     */
+    public boolean isMetaChecked() {
+    	return this.metaChecked;
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#compareTo(java.lang.Object)
+     */
+    public int compareTo(Object arg0) {
+		if (arg0 instanceof DocuDirent) {
+		    return name.compareTo(((DocuDirent) arg0).getName());
+		} else {
+		    return getName().compareTo((String) arg0);
+		}
+    }
+
+    /* (non-Javadoc)
+     * @see digilib.io.DocuDirent#getFile()
+     */
+    public File getFile() {
+        return file;
+    }
+
+    /**
+     * Adds an ImageFile to this Fileset.
+     * 
+     * The files should be added in the order of higher to lower resolutions.
+     * The first file is considered the hires "original".
+     * 
+     * 
+     * @param f
+     *            file to add
+     * @return true (always)
+     */
+    public boolean add(ImageInput f) {
+    	f.setParent(this);
+    	return list.add(f);
+    }
+
+    /**
+     * Fill the ImageSet with files from different base directories.
+     * 
+     * 
+     * @param dirs
+     *            list of base directories
+     * @param fl
+     *            file (from first base dir)
+     * @param hints
+     *  
+     */
+    void fill(Directory[] dirs, File fl) {
+    	String fn = fl.getName();
+    	String baseFn = FileOps.basename(fn);
+    	// add the first ImageFile to the ImageSet
+    	add(new ImageFile(fl, this, parentDir));
+    	// iterate the remaining base directories
+    	for (int i = 1; i < dirs.length; ++i) {
+    	    Directory dir = dirs[i];
+    		if (dir == null) {
+    			continue;
+    		}
+    		// read the directory
+    		if (dir.getFilenames() == null) {
+    			dir.readDir();
+    		}
+    		String[] dirFiles = dir.getFilenames();
+    		// try the same filename as the original
+    		int fileIdx = Arrays.binarySearch(dirFiles, fn);
+    		if (fileIdx < 0) {
+    			// try closest matches without extension
+    			fileIdx = -fileIdx - 1;
+    			// try idx
+    			if ((fileIdx < dirFiles.length)
+    					&& (FileOps.basename(dirFiles[fileIdx]).equals(baseFn))) {
+    				// idx ok
+    			} else if ((fileIdx > 0)
+    					&& (FileOps.basename(dirFiles[fileIdx - 1])
+    							.equals(baseFn))) {
+    				// idx-1 ok
+    				fileIdx = fileIdx - 1;
+    			} else if ((fileIdx+1 < dirFiles.length)
+    					&& (FileOps.basename(dirFiles[fileIdx + 1])
+    							.equals(baseFn))) {
+    				// idx+1 ok
+    				fileIdx = fileIdx + 1;
+    			} else {
+    				// basename doesn't match
+    				continue;
+    			}
+    		}
+    		if (FileOps.classForFilename(dirFiles[fileIdx]) == fileClass) {
+    			/* logger.debug("adding file " + dirFiles[fileIdx]
+    					+ " to Fileset " + this.getName()); */
+    			add(new ImageFile(dirFiles[fileIdx], this, dir));
+    		}
+    	}
+    }
+
+    /**
+     * Checks metadata and sets resolution in resX and resY.
+     *  
+     */
+    public void checkMeta() {
+        if (metaChecked) {
+            return;
+        }
+        if (fileMeta == null) {
+            // try to read metadata file
+            readMeta();
+            if (fileMeta == null) {
+                // try directory metadata
+                ((DocuDirectory) parentDir).checkMeta();
+                if (((DocuDirectory) parentDir).getDirMeta() != null) {
+                    fileMeta = ((DocuDirectory) parentDir).getDirMeta();
+                } else {
+                    // try parent directory metadata
+                    DocuDirectory gp = (DocuDirectory) parentDir.getParent();
+                    if (gp != null) {
+                        gp.checkMeta();
+                        if (gp.getDirMeta() != null) {
+                            fileMeta = gp.getDirMeta();
+                        }
+                    }
+                }
+            }
+        }
+        if (fileMeta == null) {
+            // no metadata available
+            metaChecked = true;
+            return;
+        }
+        metaChecked = true;
+        float dpi = 0;
+        float dpix = 0;
+        float dpiy = 0;
+        float sizex = 0;
+        float sizey = 0;
+        float pixx = 0;
+        float pixy = 0;
+        // DPI is valid for X and Y
+        if (fileMeta.containsKey("original-dpi")) {
+            try {
+                dpi = Float.parseFloat((String) fileMeta.get("original-dpi"));
+            } catch (NumberFormatException e) {
+            }
+            if (dpi != 0) {
+                resX = dpi;
+                resY = dpi;
+                return;
+            }
+        }
+        // DPI-X and DPI-Y
+        if (fileMeta.containsKey("original-dpi-x")
+                && fileMeta.containsKey("original-dpi-y")) {
+            try {
+                dpix = Float.parseFloat((String) fileMeta
+                        .get("original-dpi-x"));
+                dpiy = Float.parseFloat((String) fileMeta
+                        .get("original-dpi-y"));
+            } catch (NumberFormatException e) {
+            }
+            if ((dpix != 0) && (dpiy != 0)) {
+                resX = dpix;
+                resY = dpiy;
+                return;
+            }
+        }
+        // SIZE-X and SIZE-Y and PIXEL-X and PIXEL-Y
+        if (fileMeta.containsKey("original-size-x")
+                && fileMeta.containsKey("original-size-y")
+                && fileMeta.containsKey("original-pixel-x")
+                && fileMeta.containsKey("original-pixel-y")) {
+            try {
+                sizex = Float.parseFloat((String) fileMeta
+                        .get("original-size-x"));
+                sizey = Float.parseFloat((String) fileMeta
+                        .get("original-size-y"));
+                pixx = Float.parseFloat((String) fileMeta
+                        .get("original-pixel-x"));
+                pixy = Float.parseFloat((String) fileMeta
+                        .get("original-pixel-y"));
+            } catch (NumberFormatException e) {
+            }
+            if ((sizex != 0) && (sizey != 0) && (pixx != 0) && (pixy != 0)) {
+                resX = pixx / (sizex * 100 / 2.54f);
+                resY = pixy / (sizey * 100 / 2.54f);
+                return;
+            }
+        }
+    }
+
+	/* (non-Javadoc)
+     * @see digilib.io.DocuDirent#readMeta()
+     */
+	public void readMeta() {
+		if ((fileMeta != null) || (file == null)) {
+			// there is already metadata or there is no file
+			return;
+		}
+		// metadata is in the file {filename}.meta
+		String fn = file.getAbsolutePath();
+		File mf = new File(fn + ".meta");
+		if (mf.canRead()) {
+			XMLMetaLoader ml = new XMLMetaLoader();
+			try {
+				// read meta file
+				Map<String, MetadataMap> meta = ml.loadURL(mf.getAbsolutePath());
+				if (meta == null) {
+					return;
+				}
+				fileMeta = meta.get(name);
+			} catch (Exception e) {
+				Logger.getLogger(this.getClass()).warn("error reading file .meta", e);
+			}
+		}
+	}
+
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/ImageInput.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,159 @@
+/* ImageInput-- digilib image input interface.
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2010 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ * Created on 20.12.2010
+ */
+
+package digilib.io;
+
+import java.io.File;
+import java.io.InputStream;
+
+import javax.imageio.stream.ImageInputStream;
+
+import digilib.util.ImageSize;
+
+public abstract class ImageInput {
+
+	// mime file type
+	protected String mimetype = null;
+	// image size in pixels
+	protected ImageSize pixelSize = null;
+    protected ImageSet parent = null;
+
+	/**
+	 * @return ImageSize
+	 */
+	public ImageSize getSize() {
+		return pixelSize;
+	}
+
+	/**
+	 * Sets the imageSize.
+	 * @param imageSize The imageSize to set
+	 */
+	public void setSize(ImageSize imageSize) {
+		this.pixelSize = imageSize;
+	}
+
+    /** returns if mimetype has been set.
+     * 
+     * @return String
+     */
+    public boolean hasMimetype() {
+        return (mimetype != null);
+    }
+
+    /**
+	 * @return String
+	 */
+	public String getMimetype() {
+		return mimetype;
+	}
+
+	/**
+	 * Sets the mimetype.
+	 * @param mimetype The mimetype to set
+	 */
+	public void setMimetype(String filetype) {
+		this.mimetype = filetype;
+	}
+
+	/** returns if this image has been checked 
+	 * (i.e. has size and mimetype)
+	 * TODO: deprecated
+	 * @return boolean
+	 */
+	public boolean isChecked() {
+		return (pixelSize != null);
+	}
+	
+	/** Returns the aspect ratio of the image (width/height).
+	 * 
+	 * @return
+	 */
+	public float getAspect() {
+		return (pixelSize != null) ? pixelSize.getAspect() : 0f;
+	}
+	
+    /**
+     * @return ImageSet
+     */
+    public ImageSet getParent() {
+        return parent;
+    }
+
+    /**
+     * Sets the parent.
+     * @param parent The parent to set
+     */
+    public void setParent(ImageSet parent) {
+        this.parent = parent;
+    }
+
+    /** Returns if the input can be returned as ImageInputStream.
+	 * 
+	 * @return
+	 */
+	public boolean hasImageInputStream() {
+		return false;
+	}
+	
+	/** Returns the input as ImageInputStream (if available)
+	 * 
+	 * @return
+	 */
+	public ImageInputStream getImageInputStream() {
+		return null;
+	}
+	
+    /** Returns if the input can be returned as InputStream.
+     * 
+     * @return
+     */
+    public boolean hasInputStream() {
+        return false;
+    }
+    
+    /** Returns the input as InputStream (if available)
+     * 
+     * @return
+     */
+    public InputStream getInputStream() {
+        return null;
+    }
+    
+	/** Returns if the input can be returned as File.
+	 * 
+	 * @return
+	 */
+	public boolean hasFile() {
+		return false;
+	}
+	
+	/** Returns the input as File (if available)
+	 * 
+	 * @return
+	 */
+	public File getFile() {
+		return null;
+	}
+
+	
+	
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/ImageSet.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,211 @@
+/* ImageSet -- digilib image file info class.  
+ * Digital Image Library servlet components  
+ * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)  
+ * 
+ * This program is free software; you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.  
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be 
+ * found at http://www.gnu.org/copyleft/lgpl.html  
+ * 
+ * You should have received a copy of the GNU General Public License along 
+ * with this program; if not, write to the Free Software Foundation, Inc., 
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA  
+ */
+
+package digilib.io;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+import digilib.util.ImageSize;
+
+/**
+ * @author casties
+ */
+public class ImageSet {
+
+	/** list of files (ImageFile) */
+	protected List<ImageInput> list = null;
+
+	/** aspect ratio (width/height) */
+	protected float aspect = 0f;
+
+	/** resolution of the biggest image (DPI) */
+	protected float resX = 0f;
+
+	/** resolution of the biggest image (DPI) */
+	protected float resY = 0f;
+
+	/**
+	 * Creator for empty fileset.
+	 * 
+	 * 
+	 * @param initialCapacity
+	 */
+	public ImageSet() {
+		list = new ArrayList<ImageInput>();
+	}
+
+	/**
+	 * The number of image files in this Fileset.
+	 * 
+	 * 
+	 * @return number of image files
+	 */
+	public int size() {
+		return (list != null) ? list.size() : 0;
+	}
+
+	/**
+	 * Gets the default Input.
+	 *  
+	 */
+	public ImageInput get() {
+		return (list != null) ? list.get(0) : null;
+	}
+
+	/**
+	 * Get the ImageFile at the index.
+	 * 
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public ImageInput get(int index) {
+		return list.get(index);
+	}
+
+	/**
+	 * Get the next smaller ImageFile than the given size.
+	 * 
+	 * Returns the ImageFile from the set that has a width and height smaller or
+	 * equal the given size. Returns null if there isn't any smaller image.
+	 * 
+	 * @param size
+	 * @param info
+	 * @return
+	 */
+	public ImageInput getNextSmaller(ImageSize size) {
+		for (ListIterator<ImageInput> i = getHiresIterator(); i.hasNext();) {
+			ImageInput f = i.next();
+            ImageSize is = f.getSize();
+            if (is != null && is.isTotallySmallerThan(size)) {
+				return f;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get the next bigger ImageFile than the given size.
+	 * 
+	 * Returns the ImageFile from the set that has a width or height bigger or
+	 * equal the given size. Returns null if there isn't any bigger image.
+	 * 
+	 * @param size
+	 * @param info
+	 * @return
+	 */
+	public ImageInput getNextBigger(ImageSize size) {
+		for (ListIterator<ImageInput> i = getLoresIterator(); i.hasPrevious();) {
+			ImageInput f = i.previous();
+			ImageSize is = f.getSize();
+			if (is != null && is.isBiggerThan(size)) {
+				return f;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the biggest ImageFile in the set.
+	 * 
+	 * 
+	 * @return
+	 */
+	public ImageInput getBiggest() {
+		return this.get(0);
+	}
+
+	/**
+	 * Returns the biggest ImageFile in the set.
+	 * 
+	 * 
+	 * @return
+	 */
+	public ImageInput getSmallest() {
+		return this.get(this.size() - 1);
+	}
+
+	/**
+	 * Get an Iterator for this Fileset starting at the highest resolution
+	 * images.
+	 * 
+	 * 
+	 * @return
+	 */
+	public ListIterator<ImageInput> getHiresIterator() {
+		return list.listIterator();
+	}
+
+	/**
+	 * Get an Iterator for this Fileset starting at the lowest resolution
+	 * images.
+	 * 
+	 * The Iterator starts at the last element, so you have to use it backwards
+	 * with hasPrevious() and previous().
+	 * 
+	 * 
+	 * @return
+	 */
+	public ListIterator<ImageInput> getLoresIterator() {
+		return list.listIterator(list.size());
+	}
+
+	/**
+	 * @return
+	 */
+	public float getResX() {
+		return resX;
+	}
+
+	/**
+	 * @return
+	 */
+	public float getResY() {
+		return resY;
+	}
+
+	/**
+	 * Sets the aspect ratio from an ImageSize.
+	 * 
+	 * 
+	 * @param f
+	 */
+	public void setAspect(ImageSize s) {
+		aspect = s.getAspect();
+	}
+
+	/**
+	 * Returns the aspect ratio.
+	 * 
+	 * Aspect ratio is (width/height). So it's <1 for portrait and >1 for
+	 * landscape.
+	 * 
+	 * 
+	 * @return
+	 */
+	public float getAspect() {
+		return aspect;
+	}
+
+    public void checkMeta() {
+        // TODO Auto-generated method stub
+        
+    }
+
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/ImageStream.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,41 @@
+/**
+ * 
+ */
+package digilib.io;
+
+import java.io.InputStream;
+
+/**
+ * @author casties
+ * 
+ */
+public class ImageStream extends ImageInput {
+
+    protected InputStream stream = null;
+
+    public ImageStream(InputStream stream, String mimeType) {
+        this.stream = stream;
+        this.mimetype = mimeType;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see digilib.io.ImageInput#hasInputStream()
+     */
+    @Override
+    public boolean hasInputStream() {
+        return true;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see digilib.io.ImageInput#getInputStream()
+     */
+    @Override
+    public InputStream getInputStream() {
+        return stream;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/SVGFile.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,62 @@
+/* SVGFile -- Class for SVG files
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ * Created on 25.11.2003 by casties
+ *
+ */
+package digilib.io;
+
+import java.io.File;
+
+import digilib.io.FileOps.FileClass;
+
+/** Class for SVG files.
+ * 
+ * @author casties
+ *
+ */
+public class SVGFile extends DocuDirentImpl {
+	/** this is a text file */
+	protected static FileClass fileClass = FileClass.SVG;
+	/** our File instance */
+	protected File file = null;
+	
+	/** Constructor taking a file.
+	 * 
+	 * @param f
+	 */
+	public SVGFile(File f) {
+		this.file = f;
+	}
+
+	/* (non-Javadoc)
+	 * @see digilib.io.DocuDirent#checkMeta()
+	 */
+	public void checkMeta() {
+		// Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see digilib.io.DocuDirent#getFile()
+	 */
+	public File getFile() {
+		return file;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/io/TextFile.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,62 @@
+/* TextFile.java -- Class for text files
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ * Created on 15.09.2003 by casties
+ *
+ */
+package digilib.io;
+
+import java.io.File;
+
+import digilib.io.FileOps.FileClass;
+
+/** Class for text files.
+ * 
+ * @author casties
+ *
+ */
+public class TextFile extends DocuDirentImpl {
+	/** this is a text file */
+	protected static FileClass fileClass = FileClass.TEXT;
+	/** our File instance */
+	protected File file = null;
+	
+	/** Constructor taking a file.
+	 * 
+	 * @param f
+	 */
+	public TextFile(File f) {
+		this.file = f;
+	}
+
+	/* (non-Javadoc)
+	 * @see digilib.io.DocuDirent#checkMeta()
+	 */
+	public void checkMeta() {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see digilib.io.DocuDirent#getFile()
+	 */
+	public File getFile() {
+		return file;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/meta/MetadataMap.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,15 @@
+/**
+ * 
+ */
+package digilib.meta;
+
+import java.util.HashMap;
+
+/** Map for metadata related to files.
+ * @author casties
+ *
+ */
+@SuppressWarnings("serial")
+public class MetadataMap extends HashMap<String, String> {
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/meta/XMLMetaLoader.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,287 @@
+/* XMLMetaLoader -- Load an XML format metadata into a Hashtable
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+package digilib.meta;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.log4j.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class XMLMetaLoader {
+
+	private Logger logger = Logger.getLogger(this.getClass());
+	private String metaTag = "meta";
+	private String fileTag = "file";
+	private String fileNameTag = "name";
+	private String filePathTag = "path";
+	private String imgTag = "img";
+	private String collectTag = "context";
+
+	public XMLMetaLoader() {
+	}
+
+	/**
+	 *  inner class XMLMetaParser to be called by the parser
+	 */
+	private class XMLMetaParser extends DefaultHandler {
+
+		private LinkedList<String> tags;
+		private Map<String, MetadataMap> files;
+		private MetadataMap meta;
+		private StringBuffer content;
+		private boolean collecting;
+		private StringBuffer collectedContent;
+		private String fileName;
+		private String filePath;
+
+		/**
+		 * extracts the elements name from either localName ln or qName qn.
+		 * 
+		 * @param ln localName
+		 * @param qn qName
+		 * @return element name
+		 */
+		private String getName(String ln, String qn) {
+			if (ln != null) {
+				if (ln.length() > 0) {
+					return ln;
+				}
+			}
+			// else it's qName (or nothing)
+			return qn;
+		}
+
+		/**
+		 * returns all attributes as a String
+		 * 
+		 * @param attrs
+		 * @return 
+		 */
+		private String getAttrString(Attributes attrs) {
+			StringBuffer s = new StringBuffer();
+			for (int i = 0; i < attrs.getLength(); i++) {
+				String key = getName(attrs.getLocalName(i), attrs.getQName(i));
+				s.append(" "+key+"=\""+attrs.getValue(i)+"\"");
+			}
+			return s.toString();
+		}
+
+			
+		// Parser calls this once at the beginning of a document
+		public void startDocument() throws SAXException {
+			tags = new LinkedList<String>();
+			files = new HashMap<String, MetadataMap>();
+			collecting = false;
+			collectedContent = null;
+		}
+
+		// Parser calls this for each element in a document
+		public void startElement(
+			String namespaceURI,
+			String localName,
+			String qName,
+			Attributes atts)
+			throws SAXException {
+
+			String name = getName(localName, qName);
+			// open a new tag
+			tags.addLast(name);
+			// start new content (no nesting of tags and content)
+			content = new StringBuffer();
+
+			if (name.equals(metaTag)) {
+				// new meta tag
+				meta = new MetadataMap();
+				collectedContent = new StringBuffer();
+			} else if (name.equals(fileTag)) {
+				// new file tag
+				fileName = null;
+				filePath = null;
+				meta = new MetadataMap();
+				collectedContent = new StringBuffer();
+			} else if (name.equals(collectTag)) {
+				// start collecting
+				collecting = true;
+				if (collectedContent == null) {
+					collectedContent = new StringBuffer();
+				}
+			}
+			
+			// record mode
+			if (collecting) {
+				collectedContent.append("<"+name);
+				collectedContent.append(getAttrString(atts));
+				collectedContent.append(">");
+			}
+		}
+
+		// parser calls this for all tag content (possibly more than once)
+		public void characters(char[] ch, int start, int length)
+			throws SAXException {
+			// append data to current string buffer
+			if (content == null) {
+				content = new StringBuffer();
+			}
+			content.append(ch, start, length);
+		}
+
+		// parser calls this at the end of each element
+		public void endElement(
+			String namespaceURI,
+			String localName,
+			String qName)
+			throws SAXException {
+
+			String name = getName(localName, qName);
+			// exit the tag
+			tags.removeLast();
+			String lastTag = (tags.isEmpty()) ? "" : tags.getLast();
+
+			// was it a file/name tag?
+			if (name.equals(fileNameTag) && lastTag.equals(fileTag)) {
+				// save name as filename
+				if ((content != null) && (content.length() > 0)) {
+					fileName = content.toString().trim();
+				}
+				content = null;
+				return;
+			}
+
+			// was it a file/path tag?
+			if (name.equals(filePathTag) && lastTag.equals(fileTag)) {
+				// save path as filepath 
+				if ((content != null) && (content.length() > 0)) {
+					filePath = content.toString().trim();
+				}
+				content = null;
+				return;
+			}
+
+			// was it a file tag?
+			if (name.equals(fileTag)) {
+				// is there meta to save?
+				if ((meta != null) && (meta.size() > 0)) {
+					// file name is (optional file/path) / file/name
+					String fn = null;
+
+					if (fileName != null) {
+						if (filePath != null) {
+							fn = filePath + "/" + fileName;
+						} else {
+							fn = fileName;
+						}
+					} else {
+						// no file name, no file
+						content = null;
+						return;
+					}
+					// save meta in file list 
+					files.put(fn, meta);
+				}
+				content = null;
+				return;
+			}
+
+			// was it a meta tag outside a file tag?
+			if (name.equals(metaTag) && !tags.contains(fileTag)) {
+				// save meta as dir meta
+				if ((meta != null) && (meta.size() > 0)) {
+					files.put("", meta);
+				}
+				content = null;
+				return;
+			}
+
+			// is this inside an digilib info (=img) tag?
+			if (lastTag.equals(imgTag)) {
+				// then add whatever this is
+				if ((content != null) && (content.length() > 0)) {
+					meta.put(name, content.toString().trim());
+				}
+				content = null;
+				return;
+			}
+
+			// is this the end of collectTag?
+			if (name.equals(collectTag)) {
+				collecting = false;
+				collectedContent.append("</"+collectTag+">\n");
+				// store collected stuff
+				meta.put(collectTag, collectedContent.toString());
+				//logger.debug("collected: '"+collectedContent+"'");
+				content = null;
+				return;
+			}
+
+			// write collected content
+			if (collecting) {
+				String s = "";
+				if ((content != null) && (content.length() > 0)) {
+					s = content.toString().trim();
+				}
+				//logger.debug("collect:"+name+" = "+s);
+				collectedContent.append(s);
+				collectedContent.append("</"+name+">\n");
+				content = null;
+				return;
+			}
+		}
+
+	}
+
+	/**
+	 *  load and parse a file (as URL)
+	 *    returns HashMap with list data
+	 */
+	public Map<String, MetadataMap> loadURL(String path) throws SAXException, IOException {
+		logger.debug("loading meta: "+path);
+		// Create a JAXP SAXParserFactory and configure it
+		SAXParserFactory spf = SAXParserFactory.newInstance();
+		spf.setNamespaceAware(true);
+
+		SAXParser parser = null;
+		try {
+			// Create a JAXP SAXParser
+			parser = spf.newSAXParser();
+
+		} catch (ParserConfigurationException e) {
+			throw new SAXException(e);
+		}
+
+		// create a list parser (keeps the data!)
+		XMLMetaParser listParser = new XMLMetaParser();
+
+		// Tell the SAXParser to parse the XML document
+		parser.parse(path, listParser);
+
+		return listParser.files;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/pdf/DigilibInfoReader.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,76 @@
+package digilib.pdf;
+
+/** DigilibInfoReader 
+ * A class for reading the information from info.xml files used in digilib image directories.
+ *
+ */
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.input.SAXBuilder;
+
+
+
+public class DigilibInfoReader {
+
+	/** gengeral logger for this class */
+	protected static Logger logger = Logger.getLogger("digilib.servlet");
+	
+	private String filename = null;
+	//private static String base_element = "info";
+	
+	public DigilibInfoReader(String fn){
+		filename = fn;
+	}
+
+	/**
+	 * Returns the attribute defined by 'attr' as a String.
+	 * 
+	 * @param attr
+	 * @return
+	 */
+	@SuppressWarnings("unchecked") // Element.getChildren() returns naked List
+    public String getAsString(String attr){
+		try{
+			SAXBuilder builder = new SAXBuilder();
+			Document doc = builder.build(new File(filename));
+			Element root = doc.getRootElement();
+			List<Element> mainElements = root.getChildren();
+			// logger.debug("XML mainElements:"+mainElements.toString());
+
+			for(int i=0; i<mainElements.size(); i++){
+				Element elem = mainElements.get(i);
+				if(elem.getName()==attr){
+					// logger.debug(attr+" == "+(String)elem.getTextTrim());
+					return (String)elem.getTextTrim();
+				}
+			}
+
+		}
+		catch(Exception e){
+			logger.error(e.getMessage());
+		}
+		return null;
+	}
+	
+	
+	/**
+	 * Find out if the info.xml exists
+	 * @return
+	 */
+	public boolean hasInfo(){
+		try {
+			SAXBuilder builder = new SAXBuilder();
+			builder.build(new File(filename));
+			return true;
+		}
+		catch(Exception e){
+			return false;
+		}
+	}
+	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/pdf/PDFFileWorker.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,65 @@
+/**
+ * 
+ */
+package digilib.pdf;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.concurrent.Callable;
+
+import digilib.image.DocuImage;
+import digilib.servlet.DigilibConfiguration;
+import digilib.servlet.PDFRequest;
+import digilib.util.DigilibJobCenter;
+
+/**
+ * @author casties
+ *
+ */
+public class PDFFileWorker implements Callable<File> {
+	/** the wrapped PDFStreamWorker */
+    protected PDFStreamWorker streamWorker;
+    
+    /** the temporary output file */
+    protected File tempFile;
+
+    /** the final output file */
+    protected File finalFile;
+
+    /** Create new PDFFileWorker.
+     * @param dlConfig
+     * @param tempFile
+     * @param job_info
+     * @param imageJobCenter
+     * @throws FileNotFoundException
+     */
+    public PDFFileWorker(DigilibConfiguration dlConfig, 
+    		File tempFile, File finalFile,
+			PDFRequest job_info,
+			DigilibJobCenter<DocuImage> imageJobCenter) throws FileNotFoundException {
+        this.tempFile = tempFile; 
+    	OutputStream outstream = new FileOutputStream(tempFile);
+    	this.finalFile = finalFile;
+    	this.streamWorker = new PDFStreamWorker(dlConfig, outstream, job_info, imageJobCenter);
+    }
+    
+    public File call() throws Exception {
+        OutputStream outstream = null;
+        try {
+            outstream = streamWorker.call();
+            outstream.flush();
+            outstream.close();
+            // move temporary to final file
+            tempFile.renameTo(finalFile);
+        } finally {
+            if (outstream != null) {
+                outstream.close();
+            }
+        }
+        return finalFile;
+    }
+    
+    
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/pdf/PDFStreamWorker.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,162 @@
+package digilib.pdf;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.apache.log4j.Logger;
+
+import com.itextpdf.text.Document;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.Image;
+import com.itextpdf.text.PageSize;
+import com.itextpdf.text.pdf.PdfWriter;
+
+import digilib.image.DocuImage;
+import digilib.image.ImageJobDescription;
+import digilib.image.ImageWorker;
+import digilib.servlet.DigilibConfiguration;
+import digilib.servlet.PDFRequest;
+import digilib.util.DigilibJobCenter;
+import digilib.util.NumRange;
+
+public class PDFStreamWorker implements Callable<OutputStream> {
+
+	protected static Logger logger = Logger.getLogger(PDFStreamWorker.class);
+
+	protected DigilibConfiguration dlConfig = null;
+
+	protected Document doc = null;
+
+	protected OutputStream outstream = null;
+
+	protected PDFRequest job_info = null;
+
+	protected DigilibJobCenter<DocuImage> imageJobCenter = null;
+
+	/**
+	 * @param dlConfig
+	 * @param outputfile
+	 * @param job_info
+	 */
+	public PDFStreamWorker(DigilibConfiguration dlConfig, OutputStream outputfile,
+			PDFRequest job_info,
+			DigilibJobCenter<DocuImage> imageJobCenter) {
+		super();
+		this.dlConfig = dlConfig;
+		this.outstream = outputfile;
+		this.job_info = job_info;
+		this.imageJobCenter = imageJobCenter;
+	}
+
+	public OutputStream call() throws Exception {
+		outstream = renderPDF();
+		return outstream;
+	}
+
+	/**
+	 * @throws DocumentException
+	 * @throws InterruptedException
+	 * @throws ExecutionException
+	 * @throws IOException
+	 */
+	protected OutputStream renderPDF() throws DocumentException, InterruptedException,
+			ExecutionException, IOException {
+		// create document object
+		doc = new Document(PageSize.A4, 0, 0, 0, 0);
+		PdfWriter docwriter = null;
+
+		long start_time = System.currentTimeMillis();
+
+		docwriter = PdfWriter.getInstance(doc, outstream);
+
+		setPDFProperties(doc);
+
+		doc.open();
+
+		addTitlePage(doc);
+
+		logger.debug("PDF: " + outstream + " doc.open()ed ("
+				+ (System.currentTimeMillis() - start_time) + "ms)");
+
+		NumRange pgs = job_info.getPages();
+
+		for (int p : pgs) {
+			logger.debug("PDF: adding Image " + p + " to " + outstream);
+			// create ImageJobInformation
+			ImageJobDescription iji = ImageJobDescription.getInstance(job_info, job_info.getDlConfig());
+			iji.setValue("pn", p);
+			addImage(doc, iji);
+			logger.debug("PDF: done adding Image " + p + " to " + outstream);
+		}
+
+		logger.debug("PDF: done adding all Images to " + outstream);
+
+		doc.close();
+		logger.debug("PDF: " + outstream + " doc.close() ("
+				+ (System.currentTimeMillis() - start_time) + "ms)");
+		docwriter.flush();
+		docwriter.close();
+		return outstream;
+	}
+
+	/**
+	 * Set PDF-Meta-Attributes.
+	 */
+	public Document setPDFProperties(Document doc) {
+		// TODO get proper Information from dlConfig
+		doc.addAuthor(this.getClass().getName());
+		doc.addCreationDate();
+		doc.addKeywords("digilib");
+		doc.addTitle("digilib PDF");
+		doc.addCreator(this.getClass().getName());
+		return doc;
+	}
+
+	/**
+	 * Create a title page and append it to the document (should, of course, be
+	 * called first)
+	 * 
+	 * @throws DocumentException
+	 */
+	public Document addTitlePage(Document doc) throws DocumentException {
+		PDFTitlePage titlepage = new PDFTitlePage(job_info);
+		doc.add(titlepage.getPageContents());
+		doc.newPage();
+		return doc;
+	}
+
+	/**
+	 * adds an image to the document.
+	 * 
+	 * @param doc
+	 * @param iji
+	 * @return
+	 * @throws InterruptedException
+	 * @throws ExecutionException
+	 * @throws IOException
+	 * @throws DocumentException
+	 */
+	public Document addImage(Document doc, ImageJobDescription iji)
+			throws InterruptedException, ExecutionException, IOException,
+			DocumentException {
+		// create image worker
+		ImageWorker job = new ImageWorker(dlConfig, iji);
+		// submit
+		Future<DocuImage> jobTicket = imageJobCenter.submit(job);
+		// wait for result
+		DocuImage img = jobTicket.get();
+		// scale the image
+		Image pdfimg = Image.getInstance(img.getAwtImage(), null);
+		float docW = PageSize.A4.getWidth() - 2 * PageSize.A4.getBorder();
+		float docH = PageSize.A4.getHeight() - 2 * PageSize.A4.getBorder();
+		// TODO: do we really scale this again?
+		pdfimg.scaleToFit(docW, docH);
+		// add to PDF
+		doc.add(pdfimg);
+		return doc;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/pdf/PDFTitlePage.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,173 @@
+package digilib.pdf;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.log4j.Logger;
+
+import com.itextpdf.text.Anchor;
+import com.itextpdf.text.BadElementException;
+import com.itextpdf.text.Chunk;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.FontFactory;
+import com.itextpdf.text.Image;
+import com.itextpdf.text.Paragraph;
+
+import digilib.io.FileOpException;
+import digilib.servlet.PDFCache;
+import digilib.servlet.PDFRequest;
+
+/** A class for the generation of title pages for the generated pdf documents.
+ * 
+ * 
+ */
+public class PDFTitlePage {
+	
+	private PDFRequest job_info = null;
+	private DigilibInfoReader info_reader= null;
+	protected static Logger logger = Logger.getLogger("digilib.servlet");
+
+	
+	/**
+	 * Initialize a TitlePage
+	 * @param pdfji
+	 */
+	public PDFTitlePage(PDFRequest pdfji){
+		job_info = pdfji;
+
+		// use MPIWG-style info.xml
+        info_reader = getInfoXmlReader(pdfji);
+	}
+
+    /**
+     * @param pdfji
+     * @return 
+     */
+    protected DigilibInfoReader getInfoXmlReader(PDFRequest pdfji) {
+        try {
+            // try to load ../presentation/info.xml
+            File imgDir = pdfji.getImageJobInformation().getFileDirectory().getDir();
+            File docDir = imgDir.getParentFile();
+            File infoFn = new File(new File(docDir, "presentation"), "info.xml");
+            return new DigilibInfoReader(infoFn.getAbsolutePath());
+        } catch (FileOpException e) {
+            logger.warn("info.xml not found");
+        }
+        return null;
+    }
+	
+	/**
+	 * generate iText-PDF-Contents for the title page
+	 * 
+	 * @return
+	 */
+	public Element getPageContents(){
+		Paragraph content = new Paragraph();
+		content.setAlignment(Element.ALIGN_CENTER);
+
+		// add vertical whitespace
+		for(int i=0; i<8; i++){
+			content.add(Chunk.NEWLINE);
+		}
+		
+		// add logo
+		content.add(getLogo());
+		content.add(Chunk.NEWLINE);
+		content.add(Chunk.NEWLINE);
+
+		// add title
+		Anchor title = new Anchor(new Paragraph(getTitle(),FontFactory.getFont(FontFactory.HELVETICA,16)));
+		String burl = job_info.getImageJobInformation().getAsString("base.url");
+		
+		title.setReference(burl+"digilib.jsp?fn="+job_info.getImageJobInformation().getAsString("fn"));
+		content.add(title);		
+		content.add(Chunk.NEWLINE);
+
+		// add author
+		if(getDate()!=" ")
+			content.add(new Paragraph(getAuthor()+" ("+getDate()+")",FontFactory.getFont(FontFactory.HELVETICA,14)));
+		else
+			content.add(new Paragraph(getAuthor(),FontFactory.getFont(FontFactory.HELVETICA,14)));
+		
+		content.add(Chunk.NEWLINE);
+		
+		// add page numbers
+		content.add(new Paragraph(getPages(), FontFactory.getFont(FontFactory.HELVETICA, 12)));
+
+
+		content.add(Chunk.NEWLINE);
+		content.add(Chunk.NEWLINE);
+		content.add(Chunk.NEWLINE);
+
+		// add digilib version
+		content.add(new Paragraph(getDigilibVersion(),FontFactory.getFont(FontFactory.HELVETICA,10)));
+
+		for(int i=0; i<8; i++){
+			content.add(Chunk.NEWLINE);
+		}
+		Anchor address = new Anchor(
+				new Paragraph(burl+"digilib.jsp?fn="+job_info.getImageJobInformation().getAsString("fn"), FontFactory.getFont(FontFactory.COURIER, 9))
+									);
+		address.setReference(burl+"digilib.jsp?fn="+job_info.getImageJobInformation().getAsString("fn"));
+		
+		content.add(address);
+
+		
+		return content;
+	}
+	
+	/*
+	 * Methods for the different attributes.
+	 * 
+	 */
+	
+	private Image getLogo(){
+		try {
+			URL url = new URL(job_info.getDlConfig().getAsString("pdf-logo"));
+			if(url!=null && !url.equals("")){
+				Image logo = Image.getInstance(url);
+				logo.setAlignment(Element.ALIGN_CENTER);
+				return logo;
+			}
+		} catch (BadElementException e) {
+			logger.error(e.getMessage());
+		} catch (MalformedURLException e) {
+			logger.error(e.getMessage());
+		} catch (IOException e) {
+			logger.error(e.getMessage());
+		}
+		return null;
+	}
+	
+	private String getTitle(){
+		if(info_reader.hasInfo())
+			return info_reader.getAsString("title");
+		else
+			return job_info.getImageJobInformation().getAsString("fn");
+	}
+	
+	private String getAuthor(){
+		if(info_reader.hasInfo())
+			return info_reader.getAsString("author");
+		else
+			return " ";
+	}
+	
+	private String getDate(){
+		if(info_reader.hasInfo())
+			return info_reader.getAsString("date");
+		else
+			return " ";
+	}
+	
+	private String getPages(){
+		return "Pages "+job_info.getAsString("pgs") + " (scan page numbers)";
+	}
+
+	private String getDigilibVersion(){
+		return "Digilib PDFMaker v."+PDFCache.version;
+	}
+	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/AsyncServletWorker.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,94 @@
+/**
+ * 
+ */
+package digilib.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.image.DocuImage;
+import digilib.image.ImageJobDescription;
+import digilib.image.ImageOpException;
+import digilib.image.ImageWorker;
+import digilib.servlet.Scaler.ErrMsg;
+import digilib.servlet.Scaler.Error;
+
+/**
+ * @author casties
+ * 
+ */
+public class AsyncServletWorker implements Runnable {
+
+    /** the AsyncServlet context */
+    private AsyncContext asyncContext;
+
+    /** the ImageWorker we use */
+    private ImageWorker imageWorker;
+
+    protected static Logger logger = Logger.getLogger(AsyncServletWorker.class);
+    private long startTime;
+    private ErrMsg errMsgType = ErrMsg.IMAGE;
+	private ImageJobDescription jobinfo;
+
+    /**
+     * @param dlConfig
+     * @param jobinfo
+     */
+    public AsyncServletWorker(DigilibConfiguration dlConfig,
+            ImageJobDescription jobinfo, AsyncContext asyncContext,
+            ErrMsg errMsgType, long startTime) {
+        // set up image worker
+        imageWorker = new ImageWorker(dlConfig, jobinfo);
+        // save AsyncContext
+        this.asyncContext = asyncContext;
+        this.startTime = startTime;
+        this.errMsgType = errMsgType;
+        this.jobinfo = jobinfo;
+    }
+
+    /**
+     * runs the ImageWorker and writes the image to the ServletResponse.
+     */
+    public void run() {
+        // get fresh response
+        HttpServletResponse response = (HttpServletResponse) asyncContext.getResponse();
+        logger.debug("working on response: (" + ServletOps.headersToString(response) + ")");
+        try {
+            // render the image
+            DocuImage img = imageWorker.call();
+            // forced destination image type
+            String mt = null;
+            if (jobinfo.hasOption("jpg")) {
+            	mt = "image/jpeg";
+            } else if (jobinfo.hasOption("png")) {
+            	mt = "image/png";
+            }
+            // send image
+            ServletOps.sendImage(img, mt, response, logger);
+            logger.debug("Job done in: "
+                    + (System.currentTimeMillis() - startTime) + "ms");
+        } catch (ImageOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            Scaler.digilibError(errMsgType, Error.IMAGE, null, response);
+        } catch (IOException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            Scaler.digilibError(errMsgType, Error.FILE, null, response);
+        } catch (ServletException e) {
+            logger.error("Servlet error: ", e);
+        } catch (Exception e) {
+            logger.error("Other error: ", e);
+        } finally {
+            // submit response
+            logger.debug("context complete.");
+            logger.debug("response: (" + ServletOps.headersToString(response) + ")");
+            asyncContext.complete();
+        }
+
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/DigilibConfiguration.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,297 @@
+/*
+ * DigilibConfiguration -- Holding all parameters for digilib servlet.
+ * 
+ * Digital Image Library servlet components
+ * 
+ * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *  
+ */
+
+package digilib.servlet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Logger;
+
+import digilib.image.DocuImage;
+import digilib.image.DocuImageImpl;
+import digilib.io.FileOps;
+import digilib.io.ImageFile;
+import digilib.io.XMLListLoader;
+import digilib.util.Parameter;
+import digilib.util.ParameterMap;
+
+/**
+ * Class to hold the digilib servlet configuration parameters. The parameters
+ * can be read from the digilib-config file and be passed to other servlets or
+ * beans. <br>errorImgFileName: image file to send in case of error. <br>
+ * denyImgFileName: image file to send if access is denied. <br>baseDirs:
+ * array of base directories in order of preference (prescaled versions first).
+ * <br>useAuth: use authentication information. <br>authConfPath:
+ * authentication configuration file. <br>... <br>
+ * 
+ * @author casties
+ *  
+ */
+public class DigilibConfiguration extends ParameterMap {
+
+	/** DocuImage class instance */
+	private static Class<DocuImageImpl> docuImageClass = null;
+
+	/** Log4J logger */
+	private Logger logger = Logger.getLogger("digilib.config");
+
+	/**
+	 * Default constructor defines all parameters and their default values.
+	 *  
+	 */
+	public DigilibConfiguration() {
+		super(20);
+		// we start with a default logger config
+		BasicConfigurator.configure();
+		initParams();
+	}
+
+	/**
+	 * 
+	 */
+	protected void initParams() {
+		/*
+		 * Definition of parameters and default values. System parameters that
+		 * are not read from config file have a type 's'.
+		 */
+
+		// digilib servlet version
+		newParameter(
+			"servlet.version",
+			digilib.servlet.Scaler.getVersion(),
+			null,
+			's');
+		// configuration file location
+		newParameter("servlet.config.file", null, null, 's');
+		// DocuDirCache instance
+		newParameter("servlet.dir.cache", null, null, 's');
+		// DocuImage class instance
+		newParameter(
+			"servlet.docuimage.class",
+			digilib.image.JAIDocuImage.class,
+			null,
+			's');
+		// AuthOps instance for authentication
+		newParameter("servlet.auth.op", null, null, 's');
+        // Executor for image operations
+        newParameter("servlet.worker.imageexecutor", null, null, 's');
+        // Executor for PDF operations
+        newParameter("servlet.worker.pdfexecutor", null, null, 's');
+        // Executor for PDF-image operations
+        newParameter("servlet.worker.pdfimageexecutor", null, null, 's');
+
+		/*
+		 * parameters that can be read from config file have a type 'f'
+		 */
+
+		// image file to send in case of error
+		newParameter(
+			"error-image",
+			new File("img/digilib-error.png"),
+			null,
+			'f');
+		// image file to send if access is denied
+		newParameter(
+			"denied-image",
+			new File("img/digilib-denied.png"),
+			null,
+			'f');
+		// image file to send if image file not found
+		newParameter(
+			"notfound-image",
+			new File("img/digilib-notfound.png"),
+			null,
+			'f');
+		// base directories in order of preference (prescaled versions last)
+		String[] bd = { "/docuserver/images", "/docuserver/scaled/small" };
+		newParameter("basedir-list", bd, null, 'f');
+		// use authentication information
+		newParameter("use-authorization", Boolean.FALSE, null, 'f');
+		// authentication configuration file
+		newParameter("auth-file", new File("digilib-auth.xml"), null, 'f');
+		// sending image files as-is allowed
+		newParameter("sendfile-allowed", Boolean.TRUE, null, 'f');
+		// Type of DocuImage instance
+		newParameter(
+			"docuimage-class",
+			"digilib.image.JAIDocuImage",
+			null,
+			'f');
+		// part of URL used to indicate authorized access
+		newParameter("auth-url-path", "authenticated/", null, 'f');
+		// degree of subsampling on image load
+		newParameter("subsample-minimum", new Float(2f), null, 'f');
+		// default scaling quality
+		newParameter("default-quality", new Integer(1), null, 'f');
+		// use mapping file to translate paths
+		newParameter("use-mapping", Boolean.FALSE, null, 'f');
+		// mapping file location
+		newParameter("mapping-file", new File("digilib-map.xml"), null, 'f');
+		// log4j config file location
+		newParameter("log-config-file", new File("log4j-config.xml"), null, 'f');
+		// maximum destination image size (0 means no limit)
+		newParameter("max-image-size", new Integer(0), null, 'f');
+		// number of working threads
+		newParameter("worker-threads", new Integer(1), null, 'f');
+		// max number of waiting threads
+		newParameter("max-waiting-threads", new Integer(20), null, 'f');
+		// number of pdf-generation threads
+		newParameter("pdf-worker-threads", new Integer(1), null, 'f');
+		// max number of waiting pdf-generation threads
+		newParameter("pdf-max-waiting-threads", new Integer(20), null, 'f');
+		// number of pdf-image generation threads
+		newParameter("pdf-image-worker-threads", new Integer(1), null, 'f');
+		// max number of waiting pdf-image generation threads
+		newParameter("pdf-image-max-waiting-threads", new Integer(10), null, 'f');
+        // PDF generation temp directory
+        newParameter("pdf-temp-dir", "pdf_temp", null, 'f');
+        // PDF generation cache directory
+        newParameter("pdf-cache-dir", "pdf_cache", null, 'f');
+	}
+
+	/**
+	 * Constructor taking a ServletConfig. Reads the config file location from
+	 * an init parameter and loads the config file. Calls <code>readConfig()</code>.
+	 * 
+	 * @see readConfig()
+	 */
+	public DigilibConfiguration(ServletConfig c) throws Exception {
+		this();
+		readConfig(c);
+	}
+
+	/**
+	 * read parameter list from the XML file in init parameter "config-file"
+	 * or file digilib-config.xml
+	 */
+	@SuppressWarnings("unchecked")
+    public void readConfig(ServletConfig c) throws Exception {
+
+		/*
+		 * Get config file name. The file name is first looked for as an init
+		 * parameter, then in a fixed location in the webapp.
+		 */
+		if (c == null) {
+			// no config no file...
+			return;
+		}
+		String fn = c.getInitParameter("config-file");
+		if (fn == null) {
+			fn = ServletOps.getConfigFile("digilib-config.xml", c);
+			if (fn == null) {
+				logger.fatal("readConfig: no param config-file");
+				throw new ServletException("ERROR: no digilib config file!");
+			}
+		}
+		File f = new File(fn);
+		// setup config file list reader
+		XMLListLoader lilo =
+			new XMLListLoader("digilib-config", "parameter", "name", "value");
+		// read config file into HashMap
+		Map<String,String> confTable = lilo.loadURL(f.toURL().toString());
+
+		// set config file path parameter
+		setValue("servlet.config.file", f.getCanonicalPath());
+
+		/*
+		 * read parameters
+		 */
+
+		for (Entry<String, String> confEntry: confTable.entrySet()) {
+			Parameter p = get(confEntry.getKey());
+			if (p != null) {
+				if (p.getType() == 's') {
+					// type 's' Parameters are not overwritten.
+					continue;
+				}
+				if (!p.setValueFromString(confEntry.getValue())) {
+					/*
+					 * automatic conversion failed -- try special cases
+					 */
+
+					// basedir-list
+					if (confEntry.getKey().equals("basedir-list")) {
+						// split list into directories
+						String[] sa = FileOps.pathToArray(confEntry.getValue());
+						if (sa != null) {
+							p.setValue(sa);
+						}
+					}
+				}
+			} else {
+				// parameter unknown -- just add
+				newParameter(confEntry.getKey(), null, confEntry.getValue(), 'f');
+			}
+		}
+		// initialise static DocuImage class instance
+		DigilibConfiguration.docuImageClass = (Class<DocuImageImpl>) Class.forName(getAsString("docuimage-class"));
+	}
+
+	/**
+	 * Creates a new DocuImage instance.
+	 * 
+	 * The type of DocuImage is specified by docuimage-class.
+	 * 
+	 * @return DocuImage
+	 */
+    public static DocuImage getDocuImageInstance() {
+		DocuImageImpl di = null;
+		try {
+			di = docuImageClass.newInstance();
+		} catch (Exception e) {
+		}
+		return di;
+	}
+
+	/**
+     * Check image size and type and store in ImageFile imgf
+     * 
+	 * @param imgf
+	 * @return
+	 * @throws IOException
+	 */
+	public static ImageFile docuImageIdentify(ImageFile imgf) throws IOException {
+	    // use fresh DocuImage instance
+	    DocuImage di = getDocuImageInstance();
+		return di.identify(imgf);
+	}
+	
+	/**
+	 * @return Returns the docuImageClass.
+	 */
+	public static Class<DocuImageImpl> getDocuImageClass() {
+		return docuImageClass;
+	}
+
+	/**
+	 * @param docuImageClass The docuImageClass to set.
+	 */
+	public static void setDocuImageClass(Class<DocuImageImpl> dic) {
+		docuImageClass = dic;
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/DigilibRequest.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,544 @@
+/*
+ * DigilibRequest.java
+ *
+ * lightweight class carrying all parameters for a request to digilib
+ *
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de),
+ Christian Luginbuehl
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ * Created on 27. August 2002, 19:43
+ */
+
+package digilib.servlet;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Enumeration;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+import digilib.image.DocuImage;
+import digilib.io.FileOps;
+import digilib.util.OptionsSet;
+import digilib.util.Parameter;
+import digilib.util.ParameterMap;
+
+/**
+ * Class holding the parameters of a digilib user request. The parameters are
+ * mostly named like the servlet parameters: <br>
+ * request_path: url of the page/document. <br>
+ * fn: url of the page/document. <br>
+ * pn: page number. <br>
+ * dw: width of result window in pixels. <br>
+ * dh: height of result window in pixels. <br>
+ * wx: left edge of image area (float from 0 to 1). <br>
+ * wy: top edge of image area (float from 0 to 1). <br>
+ * ww: width of image area(float from 0 to 1). <br>
+ * wh: height of image area(float from 0 to 1). <br>
+ * ws: scale factor. <br>
+ * mo: special options like 'fit' for gifs. <br>
+ * mk: list of marks. <br>
+ * pt: total number of pages (generated by sevlet). <br>
+ * baseURL: base URL (from http:// to below /servlet). <br>
+ * ...et alii
+ * 
+ * @author casties
+ * 
+ */
+public class DigilibRequest extends ParameterMap {
+
+	protected DocuImage image; // internal DocuImage instance for this request
+
+	protected ServletRequest servletRequest; // internal ServletRequest
+
+	public DigilibRequest() {
+		super(30);
+	}
+
+    /**
+     * Creates a new instance of DigilibRequest with parameters from a
+     * ServletRequest. All undefined parameters are set to default values.
+     * 
+     * @param request
+     */
+    public DigilibRequest(ServletRequest request) {
+        super(30);
+        setWithRequest(request);
+        initOptions();
+    }
+
+	/** set up parameters.
+	 * 
+	 */
+	protected void initParams() {
+		/*
+		 * Definition of parameters and default values. Parameter of type 's'
+		 * are for the servlet.
+		 */
+
+		// url of the page/document (second part)
+		newParameter("fn", "", null, 's');
+		// page number
+		newParameter("pn", new Integer(1), null, 's');
+		// width of client in pixels
+		newParameter("dw", new Integer(0), null, 's');
+		// height of client in pixels
+		newParameter("dh", new Integer(0), null, 's');
+		// left edge of image (float from 0 to 1)
+		newParameter("wx", new Float(0), null, 's');
+		// top edge in image (float from 0 to 1)
+		newParameter("wy", new Float(0), null, 's');
+		// width of image (float from 0 to 1)
+		newParameter("ww", new Float(1), null, 's');
+		// height of image (float from 0 to 1)
+		newParameter("wh", new Float(1), null, 's');
+		// scale factor
+		newParameter("ws", new Float(1), null, 's');
+		// special options like 'fit' for gifs
+		newParameter("mo", this.options, null, 's');
+		// rotation angle (degree)
+		newParameter("rot", new Float(0), null, 's');
+		// contrast enhancement factor
+		newParameter("cont", new Float(0), null, 's');
+		// brightness enhancement factor
+		newParameter("brgt", new Float(0), null, 's');
+		// color multiplicative factors
+		newParameter("rgbm", "0/0/0", null, 's');
+		// color additive factors
+		newParameter("rgba", "0/0/0", null, 's');
+		// display dpi resolution (total)
+		newParameter("ddpi", new Float(0), null, 's');
+		// display dpi X resolution
+		newParameter("ddpix", new Float(0), null, 's');
+		// display dpi Y resolution
+		newParameter("ddpiy", new Float(0), null, 's');
+		// scale factor for mo=ascale
+		newParameter("scale", new Float(1), null, 's');
+		// color conversion operation
+		newParameter("colop", "", null, 's');
+
+		/*
+		 * Parameters of type 'i' are not exchanged between client and server,
+		 * but are for the servlets or JSPs internal use.
+		 */
+
+		// url of the page/document (first part, may be empty)
+		newParameter("request.path", "", null, 'i');
+		// base URL (from http:// to below /servlet)
+		newParameter("base.url", null, null, 'i');
+		// DocuImage instance for this request
+		newParameter("docu.image", image, null, 'i');
+		image = null;
+		// HttpServletRequest for this request
+		newParameter("servlet.request", servletRequest, null, 'i');
+		servletRequest = null;
+
+		/*
+		 * Parameters of type 'c' are for the clients use
+		 */
+
+		// "real" filename
+		newParameter("img.fn", "", null, 'c');
+		// image dpi x
+		newParameter("img.dpix", new Integer(0), null, 'c');
+		// image dpi y
+		newParameter("img.dpiy", new Integer(0), null, 'c');
+		// hires image size x
+		newParameter("img.pix_x", new Integer(0), null, 'c');
+		// hires image size y
+		newParameter("img.pix_y", new Integer(0), null, 'c');
+		// total number of pages
+		newParameter("pt", new Integer(0), null, 'c');
+		// display level of digilib (0 = just image, 1 = one HTML page
+		// 2 = in frameset, 3 = XUL-'frameset'
+		// 4 = XUL-Sidebar )
+		newParameter("lv", new Integer(2), null, 'c');
+		// marks
+		newParameter("mk", "", null, 'c');
+	}
+
+    /* (non-Javadoc)
+     * @see digilib.servlet.ParameterMap#initOptions()
+     */
+    @Override
+    protected void initOptions() {
+        options = (OptionsSet) getValue("mo");
+    }
+
+	/**
+	 * Populate the request object with data from a ServletRequest.
+	 * 
+	 * 
+	 * @param request
+	 */
+	public void setWithRequest(ServletRequest request) {
+		servletRequest = request;
+		// decide if it's old-style or new-style
+		String qs = ((HttpServletRequest) request).getQueryString();
+		if (qs != null) {
+			if (qs.indexOf("&amp;") > -1) {
+				// &amp; separator
+				setWithParamString(qs, "&amp;");
+			} else if (qs.indexOf(";") > -1) {
+				// ; separator
+				setWithParamString(qs, ";");
+			} else if (request.getParameter("fn") != null) {
+				// standard '&' parameters
+				setWithParamRequest(request);
+			} else {
+				setWithOldString(qs);
+			}
+		}
+		setValue("servlet.request", request);
+		// add path from request
+		setValue("request.path", ((HttpServletRequest) request).getPathInfo());
+		// set the baseURL
+		setBaseURL((HttpServletRequest) request);
+	}
+
+	/**
+	 * Populate a request from a string in the old "++++" parameter form.
+	 * 
+	 * @param queryString
+	 *            String with paramters in the old "+++" form.
+	 */
+	public void setWithOldString(String queryString) {
+		if (queryString == null) {
+			return;
+		}
+		// enable the passing of delimiter to get empty parameters
+		StringTokenizer query = new StringTokenizer(queryString, "+", true);
+		String token;
+		// first parameter FN
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("fn", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// second parameter PN
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("pn", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// third parameter WS
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("ws", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// fourth parameter MO
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("mo", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// fifth parameter MK
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("mk", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// sixth parameter WX
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("wx", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// seventh parameter WY
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("wy", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// eigth parameter WW
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("ww", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+		// ninth parameter WH
+		if (query.hasMoreTokens()) {
+			token = query.nextToken();
+			if (!token.equals("+")) {
+				setValueFromString("wh", token);
+				if (query.hasMoreTokens()) {
+					query.nextToken();
+				}
+			}
+		}
+	}
+
+	/**
+	 * Return the request parameters as a String in the parameter form
+	 * 'fn=/icons&amp;pn=1'. Empty (undefined) fields are not included.
+	 * 
+	 * @return String of request parameters in parameter form.
+	 */
+	public String getAsString() {
+		return getAsString(0);
+	}
+
+	/**
+	 * Return the request parameters of a given type type as a String in the
+	 * parameter form 'fn=/icons&amp;pn=1'. Empty (undefined) fields are not
+	 * included.
+	 * 
+	 * @return String of request parameters in parameter form.
+	 */
+	public String getAsString(int type) {
+		StringBuffer s = new StringBuffer(50);
+		// go through all values
+		for (Parameter p: params.values()) {
+			if ((type > 0) && (p.getType() != type)) {
+				// skip the wrong types
+				continue;
+			}
+			String name = p.getName();
+			/*
+			 * handling special cases
+			 */
+			// request_path adds to fn
+			if (name.equals("fn")) {
+				s.append("&fn=" + getAsString("request.path")
+						+ getAsString("fn"));
+				continue;
+			}
+			/*
+			 * the rest is sent with its name
+			 */
+			// parameters that are not set or internal are not sent
+			if ((!p.hasValue()) || (p.getType() == 'i')) {
+				continue;
+			}
+			s.append("&" + name + "=" + p.getAsString());
+		}
+		// kill first "&"
+		s.deleteCharAt(0);
+		return s.toString();
+	}
+
+	/**
+	 * Returns request parameters in old '++++' form.
+	 * 
+	 * @return String with parameters in old '++++' form.
+	 */
+	public String getAsOldString() {
+		StringBuffer s = new StringBuffer(50);
+		s.append(getAsString("request.path"));
+		s.append(getAsString("fn"));
+		s.append("+" + getAsString("pn"));
+		s.append("+" + getAsString("ws"));
+		s.append("+" + getAsString("mo"));
+		s.append("+" + getAsString("mk"));
+		s.append("+" + getAsString("wx"));
+		s.append("+" + getAsString("wy"));
+		s.append("+" + getAsString("ww"));
+		s.append("+" + getAsString("wh"));
+		return s.toString();
+	}
+
+	/**
+	 * Set request parameters from javax.servlet.ServletRequest. Uses the
+	 * Requests getParameter methods for 'fn=foo' style parameters.
+	 * 
+	 * @param request
+	 *            ServletRequest to get parameters from.
+	 */
+	//@SuppressWarnings("unchecked") // ServletRequest.getParameterNames() returns naked Enumeration
+    public void setWithParamRequest(ServletRequest request) {
+		setValue("servlet.request", request);
+		// go through all request parameters
+		for (Enumeration<String> i = request.getParameterNames(); i.hasMoreElements();) {
+			String name = (String) i.nextElement();
+			// is this a known parameter?
+			if (params.containsKey(name)) {
+				Parameter p = (Parameter) this.get(name);
+				// internal parameters are not set
+				if (p.getType() == 'i') {
+					continue;
+				}
+				p.setValueFromString(request.getParameter(name));
+				continue;
+			}
+			// unknown parameters are just added with type 'r'
+			newParameter(name, null, request.getParameter(name), 'r');
+		}
+		// add path from request
+		setValue("request.path", ((HttpServletRequest) request).getPathInfo());
+	}
+
+	/**
+	 * Set request parameters from query string. Uses the separator string qs to
+	 * get 'fn=foo' style parameters.
+	 * 
+	 * @param qs
+	 *            query string
+	 * @param sep
+	 *            parameter-separator string
+	 */
+	public void setWithParamString(String qs, String sep) {
+		// go through all request parameters
+		String[] qa = qs.split(sep);
+		for (int i = 0; i < qa.length; i++) {
+			// split names and values on "="
+			String[] nv = qa[i].split("=");
+			try {
+				String name = URLDecoder.decode(nv[0], "UTF-8");
+				String val = URLDecoder.decode(nv[1], "UTF-8");
+				// is this a known parameter?
+				if (params.containsKey(name)) {
+					Parameter p = (Parameter) this.get(name);
+					// internal parameters are not set
+					if (p.getType() == 'i') {
+						continue;
+					}
+					p.setValueFromString(val);
+					continue;
+				}
+				// unknown parameters are just added with type 'r'
+				newParameter(name, null, val, 'r');
+			} catch (UnsupportedEncodingException e) {
+				// this shouldn't happen anyway
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * Test if option string <code>opt</code> is set. Checks if the substring
+	 * <code>opt</code> is contained in the options string <code>param</code>.
+	 * Deprecated! use hasOption(String opt) for "mo"-options.
+	 * 
+	 * @param opt
+	 *            Option string to be tested.
+	 * @return boolean
+	 */
+	public boolean hasOption(String param, String opt) {
+		String s = getAsString(param);
+		if (s != null) {
+			StringTokenizer i = new StringTokenizer(s, ",");
+			while (i.hasMoreTokens()) {
+				if (i.nextToken().equals(opt)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * The image file path to be accessed.
+	 * 
+	 * The mage file path is assembled from the servlets RequestPath and
+	 * Parameter fn and normalized.
+	 * 
+	 * @return String the effective filepath.
+	 */
+	public String getFilePath() {
+		String s = getAsString("request.path");
+		s += getAsString("fn");
+		return FileOps.normalName(s);
+	}
+
+	/* Property getter and setter */
+
+	/**
+	 * Set the requests base URL parameter from a
+	 * javax.sevlet.http.HttpServletRequest.
+	 * 
+	 * @param request
+	 *            HttpServletRequest to set the base URL.
+	 */
+	public void setBaseURL(javax.servlet.http.HttpServletRequest request) {
+		String baseURL = null;
+		// calculate base URL string from request (minus last part)
+		String s = request.getRequestURL().toString();
+		int eop = s.lastIndexOf("/");
+		if (eop > 0) {
+			baseURL = s.substring(0, eop);
+		} else {
+			// fall back
+			baseURL = "http://" + request.getServerName()
+					+ "/docuserver/digitallibrary";
+		}
+		setValue("base.url", baseURL);
+	}
+
+	/**
+	 * Returns the image.
+	 * 
+	 * @return DocuImage
+	 */
+	public DocuImage getImage() {
+		return image;
+	}
+
+	/**
+	 * Sets the image.
+	 * 
+	 * @param image
+	 *            The image to set
+	 */
+	public void setImage(DocuImage image) {
+		this.image = image;
+		setValue("docu.image", image);
+	}
+
+	/**
+	 * @return
+	 */
+	public ServletRequest getServletRequest() {
+		return servletRequest;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/DocumentBean.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,316 @@
+/*
+ * DocumentBean -- Access control bean for JSP
+ *
+ * Digital Image Library servlet components
+ *
+ * Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+package digilib.servlet;
+
+import java.util.List;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.auth.AuthOpException;
+import digilib.auth.AuthOps;
+import digilib.io.DocuDirCache;
+import digilib.io.DocuDirectory;
+import digilib.io.FileOps.FileClass;
+import digilib.io.ImageInput;
+import digilib.io.ImageSet;
+import digilib.util.ImageSize;
+
+public class DocumentBean {
+
+	// general logger
+	private static Logger logger = Logger.getLogger("digilib.docubean");
+
+	// AuthOps object to check authorization
+	private AuthOps authOp;
+
+	// use authorization database
+	private boolean useAuthentication = true;
+
+	// path to add for authenticated access
+	private String authURLPath = "";
+
+	// DocuDirCache
+	private DocuDirCache dirCache = null;
+
+	// DigilibConfiguration object
+	private DigilibConfiguration dlConfig;
+
+	// DigilibRequest object
+	private DigilibRequest dlRequest = null;
+
+	/**
+	 * Constructor for DocumentBean.
+	 */
+	public DocumentBean() {
+        logger.debug("new DocumentBean");
+	}
+
+	public DocumentBean(ServletConfig conf) {
+        logger.debug("new DocumentBean");
+		try {
+			setConfig(conf);
+		} catch (Exception e) {
+			logger.fatal("ERROR: Unable to read config: ", e);
+		}
+	}
+
+	public void setConfig(ServletConfig conf) throws ServletException {
+		logger.debug("setConfig");
+		// get our ServletContext
+		ServletContext context = conf.getServletContext();
+		// see if there is a Configuration instance
+		dlConfig = (DigilibConfiguration) context
+				.getAttribute("digilib.servlet.configuration");
+		if (dlConfig == null) {
+			// create new Configuration
+			throw new ServletException("ERROR: No configuration!");
+		}
+
+		// get cache
+		dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+
+		/*
+		 * authentication
+		 */
+		useAuthentication = dlConfig.getAsBoolean("use-authorization");
+		authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
+		authURLPath = dlConfig.getAsString("auth-url-path");
+		if (useAuthentication && (authOp == null)) {
+			throw new ServletException(
+					"ERROR: use-authorization configured but no AuthOp!");
+		}
+	}
+
+	/**
+	 * check if the request must be authorized to access filepath
+	 */
+	public boolean isAuthRequired(DigilibRequest request)
+			throws AuthOpException {
+		logger.debug("isAuthRequired");
+		return useAuthentication ? authOp.isAuthRequired(request) : false;
+	}
+
+	/**
+	 * check if the request is allowed to access filepath
+	 */
+	public boolean isAuthorized(DigilibRequest request) throws AuthOpException {
+		logger.debug("isAuthorized");
+		return useAuthentication ? authOp.isAuthorized(request) : true;
+	}
+
+	/**
+	 * return a list of authorization roles needed for request to access the
+	 * specified path
+	 */
+	public List<String> rolesForPath(DigilibRequest request) throws AuthOpException {
+		logger.debug("rolesForPath");
+		return useAuthentication ? authOp.rolesForPath(request) : null;
+	}
+
+	/**
+	 * check request authorization against a list of roles
+	 */
+	public boolean isRoleAuthorized(List<String> roles, DigilibRequest request) {
+		logger.debug("isRoleAuthorized");
+		return useAuthentication ? authOp.isRoleAuthorized(roles, request)
+				: true;
+	}
+
+	/**
+	 * check for authenticated access and redirect if necessary
+	 */
+	public boolean doAuthentication(HttpServletResponse response)
+			throws Exception {
+        logger.debug("doAuthenication-Method");
+		return doAuthentication(dlRequest, response);
+	}
+
+	/**
+	 * check for authenticated access and redirect if necessary
+	 */
+	public boolean doAuthentication(DigilibRequest request,
+			HttpServletResponse response) throws Exception {
+		logger.debug("doAuthentication");
+		if (!useAuthentication) {
+			// shortcut if no authentication
+			return true;
+		}
+		// check if we are already authenticated
+		if (((HttpServletRequest) request.getServletRequest()).getRemoteUser() == null) {
+			logger.debug("unauthenticated so far");
+			// if not maybe we must?
+			if (isAuthRequired(request)) {
+				logger.debug("auth required, redirect");
+				// we are not yet authenticated -> redirect
+				response.sendRedirect(authURLPath
+						+ ((HttpServletRequest) request.getServletRequest())
+								.getServletPath()
+						+ "?"
+						+ ((HttpServletRequest) request.getServletRequest())
+								.getQueryString());
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Sets the current DigilibRequest. Also completes information in the request.
+	 * 
+	 * @param dlRequest
+	 *            The dlRequest to set.
+	 */
+	public void setRequest(DigilibRequest dlRequest) throws Exception {
+		this.dlRequest = dlRequest;
+		if (dirCache == null) {
+			return;
+		}
+		String fn = dlRequest.getFilePath();
+		// get information about the file
+		ImageSet fileset = (ImageSet) dirCache.getFile(fn, dlRequest
+				.getAsInt("pn"), FileClass.IMAGE);
+		if (fileset == null) {
+			return;
+		}
+		// add file name
+		dlRequest.setValue("img.fn", fileset);
+		// add dpi
+		dlRequest.setValue("img.dpix", new Double(fileset.getResX()));
+		dlRequest.setValue("img.dpiy", new Double(fileset.getResY()));
+		// get number of pages in directory
+		DocuDirectory dd = dirCache.getDirectory(fn);
+		if (dd != null) {
+			// add pt
+			dlRequest.setValue("pt", dd.size());
+		}
+		// get original pixel size
+		ImageInput origfile = fileset.getBiggest();
+		// check image for size (TODO: just if mo=hires?)
+		ImageSize pixsize = origfile.getSize();
+		if (pixsize != null) {
+			// add pixel size
+			dlRequest.setValue("img.pix_x", new Integer(pixsize.getWidth()));
+			dlRequest.setValue("img.pix_y", new Integer(pixsize.getHeight()));
+		}
+	}
+
+	/**
+	 * get the first page number in the directory (not yet functional)
+	 */
+	public int getFirstPage(DigilibRequest request) {
+		logger.debug("getFirstPage");
+		return 1;
+	}
+
+	/**
+	 * get the number of pages/files in the directory
+	 */
+	public int getNumPages() throws Exception {
+		return getNumPages(dlRequest);
+	}
+
+    /**
+     * get the number of image pages/files in the directory
+     */
+    public int getNumPages(DigilibRequest request) throws Exception {
+        return getNumPages(request, FileClass.IMAGE);
+    }
+
+	/**
+	 * get the number of pages/files of type fc in the directory
+	 */
+	public int getNumPages(DigilibRequest request, FileClass fc) throws Exception {
+		logger.debug("getNumPages");
+		DocuDirectory dd = (dirCache != null) ? dirCache.getDirectory(request
+				.getFilePath()) : null;
+		if (dd != null) {
+			return dd.size(fc);
+		}
+		return 0;
+	}
+
+	/**
+	 * Returns the dlConfig.
+	 * 
+	 * @return DigilibConfiguration
+	 */
+	public DigilibConfiguration getDlConfig() {
+		return dlConfig;
+	}
+
+	/**
+	 * returns if the zoom area in the request can be moved
+	 * 
+	 * @return
+	 */
+	public boolean canMoveRight() {
+		float ww = dlRequest.getAsFloat("ww");
+		float wx = dlRequest.getAsFloat("wx");
+		return (ww + wx < 1.0);
+	}
+
+	/**
+	 * returns if the zoom area in the request can be moved
+	 * 
+	 * @return
+	 */
+	public boolean canMoveLeft() {
+		float ww = dlRequest.getAsFloat("ww");
+		float wx = dlRequest.getAsFloat("wx");
+		return ((ww < 1.0) && (wx > 0));
+	}
+
+	/**
+	 * returns if the zoom area in the request can be moved
+	 * 
+	 * @return
+	 */
+	public boolean canMoveUp() {
+		float wh = dlRequest.getAsFloat("wh");
+		float wy = dlRequest.getAsFloat("wy");
+		return ((wh < 1.0) && (wy > 0));
+	}
+
+	/**
+	 * returns if the zoom area in the request can be moved
+	 * 
+	 * @return
+	 */
+	public boolean canMoveDown() {
+		float wh = dlRequest.getAsFloat("wh");
+		float wy = dlRequest.getAsFloat("wy");
+		return (wh + wy < 1.0);
+	}
+
+	/**
+	 * @return Returns the dlRequest.
+	 */
+	public DigilibRequest getRequest() {
+		return dlRequest;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/Initialiser.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,201 @@
+/* Initialiser.java -- initalisation servlet for setup tasks
+ * 
+ * Digital Image Library servlet components
+ * 
+ * Copyright (C) 2004 Robert Casties (robcast@mail.berlios.de)
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *  
+ * Created on 18.10.2004
+ */
+package digilib.servlet;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.util.List;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.xml.DOMConfigurator;
+
+import digilib.auth.AuthOps;
+import digilib.auth.XMLAuthOps;
+import digilib.image.DocuImage;
+import digilib.io.AliasingDocuDirCache;
+import digilib.io.DocuDirCache;
+import digilib.io.FileOps.FileClass;
+import digilib.util.DigilibJobCenter;
+
+/**
+ * Singleton initalisation listener for setup tasks and resources.
+ * 
+ * @author casties
+ *  
+ */
+@WebListener
+public class Initialiser implements ServletContextListener {
+
+
+	/** servlet version */
+	public static final String version = "0.3";
+
+	/** gengeral logger for this class */
+	private static Logger logger = Logger.getLogger("digilib.init");
+
+	/** DocuDirCache instance */
+	DocuDirCache dirCache;
+
+	/** DigilibConfiguration instance */
+	DigilibConfiguration dlConfig;
+
+	/** Executor for digilib image jobs (AsyncServletWorker doesn't return anything) */
+	DigilibJobCenter<DocuImage> imageEx;
+	
+	/** Executor for PDF jobs */
+	DigilibJobCenter<OutputStream> pdfEx;
+	
+	/** Executor for PDF image jobs */
+	DigilibJobCenter<DocuImage> pdfImageEx;
+	
+	/**
+	 * Initialisation on first run.
+	 */
+    public void contextInitialized(ServletContextEvent cte) {
+        ServletContext context = cte.getServletContext();
+
+		System.out.println("***** Digital Image Library Initialiser (version "
+						+ version + ") *****");
+
+		// see if there is a Configuration instance
+		dlConfig = (DigilibConfiguration) context.getAttribute("digilib.servlet.configuration");
+		if (dlConfig == null) {
+			// create new Configuration
+			try {
+				dlConfig = new DigilibConfiguration(context);
+
+				/*
+				 * further initialization
+				 */
+
+				// set up the logger
+				File logConf = ServletOps.getConfigFile((File) dlConfig
+						.getValue("log-config-file"), context);
+				DOMConfigurator.configure(logConf.getAbsolutePath());
+				dlConfig.setValue("log-config-file", logConf);
+				// say hello in the log file
+				logger
+						.info("***** Digital Image Library Initialiser (version "
+								+ version + ") *****");
+				// directory cache
+				String[] bd = (String[]) dlConfig.getValue("basedir-list");
+				FileClass[] fcs = { FileClass.IMAGE, FileClass.TEXT };
+				if (dlConfig.getAsBoolean("use-mapping")) {
+					// with mapping file
+					File mapConf = ServletOps.getConfigFile((File) dlConfig
+							.getValue("mapping-file"), context);
+					dirCache = new AliasingDocuDirCache(bd, fcs, mapConf,
+							dlConfig);
+					dlConfig.setValue("mapping-file", mapConf);
+				} else {
+					// without mapping
+					dirCache = new DocuDirCache(bd, fcs, dlConfig);
+				}
+				dlConfig.setValue("servlet.dir.cache", dirCache);
+				// useAuthentication
+				if (dlConfig.getAsBoolean("use-authorization")) {
+					// DB version
+					//authOp = new DBAuthOpsImpl(util);
+					// XML version
+					File authConf = ServletOps.getConfigFile((File) dlConfig
+							.getValue("auth-file"), context);
+					AuthOps authOp = new XMLAuthOps(authConf);
+					dlConfig.setValue("servlet.auth.op", authOp);
+					dlConfig.setValue("auth-file", authConf);
+				}
+				// DocuImage class
+				DocuImage di = DigilibConfiguration.getDocuImageInstance();
+				dlConfig.setValue("servlet.docuimage.class", di.getClass().getName());
+				// disk cache for image toolkit
+				boolean dc = dlConfig.getAsBoolean("img-diskcache-allowed");
+				// TODO: methods for all toolkits?
+				ImageIO.setUseCache(dc);
+				// digilib worker threads
+				int nt = dlConfig.getAsInt("worker-threads");
+                int mt = dlConfig.getAsInt("max-waiting-threads");
+				imageEx = new DigilibJobCenter<DocuImage>(nt, mt, false, "servlet.worker.imageexecutor");
+                dlConfig.setValue("servlet.worker.imageexecutor", imageEx);				
+				// PDF worker threads
+				int pnt = dlConfig.getAsInt("pdf-worker-threads");
+                int pmt = dlConfig.getAsInt("pdf-max-waiting-threads");
+				pdfEx = new DigilibJobCenter<OutputStream>(pnt, pmt, false, "servlet.worker.pdfexecutor");
+                dlConfig.setValue("servlet.worker.pdfexecutor", pdfEx);				
+				// PDF image worker threads
+				int pint = dlConfig.getAsInt("pdf-image-worker-threads");
+                int pimt = dlConfig.getAsInt("pdf-image-max-waiting-threads");
+				pdfImageEx = new DigilibJobCenter<DocuImage>(pint, pimt, false, "servlet.worker.pdfimageexecutor");
+                dlConfig.setValue("servlet.worker.pdfimageexecutor", pdfImageEx);				
+				// set as the servlets main config
+				context.setAttribute("digilib.servlet.configuration", dlConfig);
+
+			} catch (Exception e) {
+				logger.error("Error in initialisation: ", e);
+			}
+		} else {
+			// say hello in the log file
+			logger.info("***** Digital Image Library Initialiser (version "
+							+ version + ") *****");
+			logger.warn("Already initialised!");
+		}
+	}
+
+    /** clean up local resources
+     * 
+     */
+    public void contextDestroyed(ServletContextEvent arg0) {
+        logger.info("Initialiser shutting down.");
+        if (dirCache != null) {
+            // shut down dirCache?
+            dirCache = null;
+        }
+        if (imageEx != null) {
+            // shut down image thread pool
+            List<Runnable> rj = imageEx.shutdownNow();
+            int nrj = rj.size();
+            if (nrj > 0) {
+                logger.error("Still running threads when shutting down image job queue: "+nrj);
+            }
+        }
+        if (pdfEx != null) {
+            // shut down pdf thread pool
+            List<Runnable> rj = pdfEx.shutdownNow();
+            int nrj = rj.size();
+            if (nrj > 0) {
+                logger.error("Still running threads when shutting down PDF job queue: "+nrj);
+            }
+        }
+        if (pdfImageEx != null) {
+            // shut down pdf image thread pool
+            List<Runnable> rj = pdfImageEx.shutdownNow();
+            int nrj = rj.size();
+            if (nrj > 0) {
+                logger.error("Still running threads when shutting down PDF-image job queue: "+nrj);
+            }
+        }
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/PDFCache.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,327 @@
+package digilib.servlet;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.concurrent.Future;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.image.DocuImage;
+import digilib.pdf.PDFFileWorker;
+import digilib.util.DigilibJobCenter;
+
+/**
+ * A class for handling user requests for pdf documents made from digilib images.  
+ * 
+ * If a document does not already exist, it will be enqueued for generation; if it does exist, it is sent
+ * to the user.
+ * 
+ * @author cmielack
+ *
+ */
+
+@SuppressWarnings("serial")
+public class PDFCache extends HttpServlet {
+
+    public static String version = "0.3a";
+
+    /** logger for accounting requests */
+    protected static Logger accountlog = Logger.getLogger("account.pdf.request");
+
+    /** gengeral logger for this class */
+    protected static Logger logger = Logger.getLogger("digilib.pdfcache");
+
+    /** logger for authentication related */
+    protected static Logger authlog = Logger.getLogger("digilib.pdf.auth");
+
+	private DigilibConfiguration dlConfig = null;
+	
+	public static String instanceKey = "digilib.servlet.PDFCache";
+	
+	private DigilibJobCenter<File> pdfJobCenter = null;
+	
+	private DigilibJobCenter<DocuImage> pdfImageJobCenter = null;
+	
+	private File cache_directory = new File("cache");  
+	
+	private File temp_directory = new File("pdf_temp");
+	
+	private static String JSP_WIP = "/pdf/wip.jsp";
+	
+	private static String JSP_ERROR = "/pdf/error.jsp";
+	
+	/** document status.
+	 *  DONE: document exists in cache
+	 *  WIP: document is "work in progress"
+	 *  NONEXISTENT: document does not exist in cache and is not in progress
+	 *  ERROR: an error occurred while processing the request
+	 */
+	public static enum PDFStatus {DONE, WIP, NONEXISTENT, ERROR};
+
+	
+	public void init(ServletConfig config) throws ServletException {
+		super.init(config);
+		
+        System.out.println("***** Digital Image Library Image PDF-Cache Servlet (version "
+                + version + ") *****");
+        // say hello in the log file
+        logger.info("***** Digital Image Library Image PDF-Cache Servlet (version "
+                + version + ") *****");
+
+		ServletContext context = getServletContext();
+		dlConfig = (DigilibConfiguration) context.getAttribute("digilib.servlet.configuration");
+		if (dlConfig == null) {
+			// no Configuration
+			throw new ServletException("No Configuration!");
+		}
+	
+		String temp_fn = dlConfig.getAsString("pdf-temp-dir");
+		temp_directory = new File(temp_fn);
+		if (!temp_directory.exists()) {
+			// try to create
+			temp_directory.mkdirs();
+		} else {
+	        // rid the temporary directory of possible incomplete document files
+	        emptyDirectory(temp_directory);
+		}
+		if (!temp_directory.isDirectory()) {
+		    throw new ServletException("Configuration error: problem with pdf-temp-dir="+temp_fn);
+		}
+        
+		String cache_fn = dlConfig.getAsString("pdf-cache-dir");
+       	cache_directory = new File(cache_fn);
+		if (!cache_directory.exists()) {
+			// try to create
+			cache_directory.mkdirs();
+		}
+        if (!cache_directory.isDirectory()) {
+            throw new ServletException("Configuration error: problem with pdf-cache-dir="+cache_fn);
+        }
+
+        pdfJobCenter = (DigilibJobCenter<File>) dlConfig.getValue("servlet.worker.pdfexecutor");
+        pdfImageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig.getValue("servlet.worker.pdfimageexecutor");
+        
+		// register this instance globally
+		context.setAttribute(instanceKey, this);
+		
+	}
+	
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("GET from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("POST from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+    
+	/** 
+	 * clean up any broken and unfinished files from the temporary directory.
+	 */
+	public void emptyDirectory(File dir){
+		File[] temp_files = dir.listFiles();
+		for (File f: temp_files){
+			f.delete();
+		}
+	}
+	
+	
+	public void processRequest(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException {
+
+        if (dlConfig == null) {
+            logger.error("ERROR: No Configuration!");
+            throw new ServletException("NO VALID digilib CONFIGURATION!");
+        }
+
+        String docid = "";
+	    try {
+		// evaluate request ( make a PDFJobDeclaration , get the DocumentId)
+		PDFRequest pdfji = new PDFRequest(request, dlConfig); 
+		
+		docid = pdfji.getDocumentId();
+		
+		// if some invalid data has been entered ...
+		if(!pdfji.checkValidity()) {
+			notifyUser(PDFStatus.ERROR, docid, request, response);
+			return;
+		}
+		
+		PDFStatus status = getStatus(docid);
+		
+        if (status == PDFStatus.NONEXISTENT) {
+        	// not there -- start creation
+            try {
+				createNewPdfDocument(pdfji, docid);
+	            notifyUser(status, docid, request, response);
+	            return;
+			} catch (FileNotFoundException e) {
+				// error in pdf creation
+                logger.error(e.getMessage());
+				notifyUser(PDFStatus.ERROR, docid, request, response);
+				return;
+			}
+        } else if (status == PDFStatus.DONE) {
+        	// pdf created -- send it
+            try {
+                ServletOps.sendFile(getCacheFile(docid), "application/pdf", getDownloadFilename(pdfji), response, logger);
+                return;
+            } catch (Exception e) {
+            	// sending didn't work
+                logger.error(e.getMessage());
+                return;
+            }
+        } else {
+        	// should be work in progress
+            notifyUser(status, docid, request, response);
+            return;
+        }
+	    } catch (Exception e) {
+            // error in pdf creation
+            logger.error(e.getMessage());
+            notifyUser(PDFStatus.ERROR, docid, request, response);
+            return;
+	    }
+	}
+
+    /**
+     * depending on the documents status, redirect the user to the appropriate
+     * waiting or download page.
+     * 
+     * @param status
+     * @param documentid
+     * @param request
+     * @param response
+     */
+    public void notifyUser(PDFStatus status, String documentid,
+            HttpServletRequest request, HttpServletResponse response) {
+
+        String jsp = null;
+
+        if (status == PDFStatus.NONEXISTENT) {
+            // tell the user that the document has to be created before he/she
+            // can download it
+            logger.debug("PDFCache: " + documentid + " has STATUS_NONEXISTENT.");
+            jsp = JSP_WIP;
+        } else if (status == PDFStatus.WIP) {
+            logger.debug("PDFCache: " + documentid + " has STATUS_WIP.");
+            jsp = JSP_WIP;
+
+            // TODO: estimate remaining work time
+            // TODO: tell the user he/she has to wait
+        } else if (status == PDFStatus.DONE) {
+            logger.debug("PDFCache: " + documentid + " has STATUS_DONE.");
+        } else {
+            logger.debug("PDFCache: " + documentid + " has STATUS_ERROR.");
+            jsp = JSP_ERROR;
+        }
+
+        try {
+            // forward to the relevant jsp
+            ServletContext context = getServletContext();
+            RequestDispatcher dispatch = context.getRequestDispatcher(jsp);
+            dispatch.forward(request, response);
+        } catch (ServletException e) {
+            logger.debug(e.getMessage());
+            e.printStackTrace();
+        } catch (IOException e) {
+            logger.debug(e.getMessage());
+            e.printStackTrace();
+        }
+
+    }
+
+	
+	/** check the status of the document corresponding to the documentid */
+	public PDFStatus getStatus(String documentid){
+		// looks into the cache and temp directory in order to find out the status of the document
+		File cached = getCacheFile(documentid);
+		File wip = getTempFile(documentid);
+		if(cached.exists()){
+			return PDFStatus.DONE;
+		} else if (wip.exists()){
+			return PDFStatus.WIP;
+		} else {
+			return PDFStatus.NONEXISTENT;
+		}
+	}
+
+	/** 
+	 * create new thread for pdf generation.
+	 * 
+	 * @param pdfji
+	 * @param filename
+	 * @return 
+	 * @throws FileNotFoundException 
+	 */
+	public Future<File> createNewPdfDocument(PDFRequest pdfji, String filename) throws FileNotFoundException{
+		// start new worker
+		File tempf = this.getTempFile(filename);
+		File finalf = this.getCacheFile(filename);
+		PDFFileWorker job = new PDFFileWorker(dlConfig, tempf, finalf, pdfji, pdfImageJobCenter);
+		// start job
+		Future<File> jobTicket = pdfJobCenter.submit(job);
+		return jobTicket;
+	}
+	
+	
+	/**
+	 * generate the filename the user is going to receive the pdf as
+	 * 
+	 * @param pdfji
+	 * @return
+	 */
+	public String getDownloadFilename(PDFRequest pdfji){
+		// filename example: digilib_example_pgs1-3.pdf
+		String filename;
+		filename =  "digilib_";
+		filename += pdfji.getAsString("fn");
+		filename += "_pgs" + pdfji.getAsString("pgs");
+		filename += ".pdf";
+		
+		return filename;
+	}
+		
+	public File getCacheDirectory(){
+		return cache_directory;
+	}
+	
+	public File getTempDirectory(){
+		return temp_directory;
+	}
+	
+	/** 
+	 * returns a File object based on filename in the temp directory.
+	 * @param filename
+	 * @return
+	 */
+	public File getTempFile(String filename) {
+	    return new File(temp_directory, filename);
+	}
+
+	/** 
+     * returns a File object based on filename in the cache directory.
+     * @param filename
+     * @return
+     */
+    public File getCacheFile(String filename) {
+        return new File(cache_directory, filename);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/PDFRequest.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,150 @@
+package digilib.servlet;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
+
+import digilib.image.ImageJobDescription;
+import digilib.io.DocuDirectory;
+import digilib.io.FileOpException;
+import digilib.io.FileOps.FileClass;
+import digilib.util.NumRange;
+import digilib.util.OptionsSet;
+import digilib.util.ParameterMap;
+
+
+/** 
+ * A container class for storing a set of instruction parameters 
+ * used for content generator classes like MakePDF.  
+ * 
+ * 
+ * @author cmielack, casties
+ *
+ */
+public class PDFRequest extends ParameterMap {
+
+	DigilibConfiguration dlConfig = null;
+	NumRange pages = null;
+	/** general logger for this class */
+	protected static Logger logger = Logger.getLogger("digilib.servlet");
+
+	
+	/**
+	 * Initialize the PDFJobInformation
+	 * 
+	 * @param dlcfg			
+	 * 						The DigilibConfiguration. 
+	 */
+	public PDFRequest(DigilibConfiguration dlcfg) {
+		super(30);
+		dlConfig = dlcfg;
+	}
+
+	/**
+	 * Initialize the PDFJobInformation with a request.
+	 * 
+	 * @param dlcfg		The DigilibConfiguration. 		
+	 * @param request
+	 * @throws FileOpException 
+	 */
+	public PDFRequest(HttpServletRequest request, DigilibConfiguration dlcfg) throws FileOpException {
+		super(30);
+		dlConfig = dlcfg;
+		this.setWithRequest(request);
+	}
+
+	
+	protected void initParams() {
+		// page numbers
+		newParameter("pgs", "", null, 's');
+		// url of the page/document (second part)
+		newParameter("fn", "", null, 's');
+		// width of client in pixels
+		newParameter("dw", new Integer(0), null, 's');
+		// height of client in pixels
+		newParameter("dh", new Integer(500), null, 's');
+	}
+	
+	/* (non-Javadoc)
+     * @see digilib.servlet.ParameterMap#initOptions()
+     */
+    @Override
+    protected void initOptions() {
+        options = (OptionsSet) getValue("mo");
+    }
+
+    /**
+	 * Read the request object.
+	 * 
+	 * @param request
+	 * @throws FileOpException 
+	 */
+	public void setWithRequest(HttpServletRequest request) throws FileOpException {
+	    // read matching request parameters for the parameters in this map 
+		for (String k : params.keySet()) {
+			if (request.getParameterMap().containsKey(k)) {
+				setValueFromString(k, request.getParameter(k));
+			}
+		}
+		// process parameters
+		pages = new NumRange(getAsString("pgs"));
+        ImageJobDescription ij = ImageJobDescription.getInstance(this, dlConfig);
+        DocuDirectory dir = ij.getFileDirectory();
+        int dirsize = dir.size(FileClass.IMAGE);
+        pages.setMaxnum(dirsize);
+	}
+	
+	
+	/**
+	 * Generate a filename for the pdf to be created.
+	 * 
+	 * @return
+	 */
+	public String getDocumentId(){
+		String fn = getAsString("fn");
+		String dh = getAsString("dh");
+		String dw = getAsString("dw");
+		String pgs = getAsString("pgs");
+			
+		String id = "fn=" + fn + "&dw=" + dw + "&dh=" + dh + "&pgs=" + pgs + ".pdf";
+		// make safe to use as filename by urlencoding
+		try {
+			id = URLEncoder.encode(id, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			// this shouldn't happen
+		}
+		return id;
+	}
+
+	
+	public ImageJobDescription getImageJobInformation(){
+		return ImageJobDescription.getInstance(this, dlConfig);
+	}
+	
+	
+	public NumRange getPages() {
+	    return pages;
+	}
+	
+	
+	/**
+	 * Check parameters for validity.
+	 * Returns true if no errors are found.
+	 * 
+	 * @return
+	 */
+	public boolean checkValidity(){
+	    if (pages != null) {
+	        return true;
+	    }
+	    return false;
+	} 
+	
+	public DigilibConfiguration getDlConfig(){
+		return dlConfig;
+	}
+	
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/Scaler.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,345 @@
+package digilib.servlet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.auth.AuthOpException;
+import digilib.auth.AuthOps;
+import digilib.image.DocuImage;
+import digilib.image.ImageJobDescription;
+import digilib.image.ImageOpException;
+import digilib.io.DocuDirCache;
+import digilib.io.DocuDirectory;
+import digilib.io.ImageInput;
+import digilib.util.DigilibJobCenter;
+
+@WebServlet(name="Scaler", urlPatterns={"/Scaler", "/servlet/Scaler/*"}, asyncSupported=true)
+public class Scaler extends HttpServlet {
+
+    private static final long serialVersionUID = 5289386646192471549L;
+
+    /** digilib servlet version (for all components) */
+    public static final String version = "1.9.1a26";
+
+    /** servlet error codes */
+    public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
+    
+    /** type of error message */
+    public static enum ErrMsg {IMAGE, TEXT, CODE};
+    
+    /** default error message type */
+    public static ErrMsg defaultErrMsgType = ErrMsg.IMAGE;
+    
+    /** logger for accounting requests */
+    protected static Logger accountlog = Logger.getLogger("account.request");
+
+    /** gengeral logger for this class */
+    protected static Logger logger = Logger.getLogger("digilib.scaler");
+
+    /** logger for authentication related */
+    protected static Logger authlog = Logger.getLogger("digilib.auth");
+
+    /** DocuDirCache instance */
+    protected DocuDirCache dirCache;
+
+    /** Image executor */
+    protected DigilibJobCenter<DocuImage> imageJobCenter;
+
+    /** authentication error image file */
+    public static File denyImgFile;
+
+    /** image error image file */
+    public static File errorImgFile;
+
+    /** not found error image file */
+    public static File notfoundImgFile;
+
+    /** send files as is? */
+    protected boolean sendFileAllowed = true;
+
+    /** DigilibConfiguration instance */
+    protected DigilibConfiguration dlConfig;
+
+    /** use authorization database */
+    protected boolean useAuthorization = true;
+
+    /** AuthOps instance */
+    protected AuthOps authOp;
+
+    /**
+     * Initialisation on first run.
+     * 
+     * @throws ServletException
+     * 
+     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+     */
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+
+        System.out
+                .println("***** Digital Image Library Image Scaler Servlet (version "
+                        + version + ") *****");
+        // say hello in the log file
+        logger.info("***** Digital Image Library Image Scaler Servlet (version "
+                + version + ") *****");
+
+        // get our ServletContext
+        ServletContext context = config.getServletContext();
+        // see if there is a Configuration instance
+        dlConfig = (DigilibConfiguration) context.getAttribute("digilib.servlet.configuration");
+        if (dlConfig == null) {
+            // no Configuration
+            throw new ServletException("No Configuration!");
+        }
+        // set our AuthOps
+        useAuthorization = dlConfig.getAsBoolean("use-authorization");
+        authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
+
+        // DocuDirCache instance
+        dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+
+        // Executor
+        imageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig
+                .getValue("servlet.worker.imageexecutor");
+
+        denyImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("denied-image"), context);
+        errorImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("error-image"), context);
+        notfoundImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("notfound-image"), context);
+        sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
+        try {
+            defaultErrMsgType = ErrMsg.valueOf(dlConfig.getAsString("default-errmsg-type"));
+        } catch (Exception e) {
+            // nothing to do
+        }
+    }
+
+    /**
+     * Returns modification time relevant to the request for caching.
+     * 
+     * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest)
+     */
+    public long getLastModified(HttpServletRequest request) {
+        accountlog.debug("GetLastModified from " + request.getRemoteAddr()
+                + " for " + request.getQueryString());
+        long mtime = -1;
+        try {
+            // create new digilib request
+            DigilibRequest dlReq = new DigilibRequest(request);
+            DocuDirectory dd = dirCache.getDirectory(dlReq.getFilePath());
+            if (dd != null) {
+                mtime = dd.getDirMTime() / 1000 * 1000;
+            }
+        } catch (Exception e) {
+            logger.error("error in getLastModified: " + e.getMessage());
+        }
+        logger.debug("  returns " + mtime);
+        return mtime;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("GET from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("POST from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+    
+
+	protected void doHead(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		logger.debug("HEAD from "+req.getRemoteAddr());
+		super.doHead(req, resp);
+	}
+
+	protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		logger.debug("OPTIONS from "+req.getRemoteAddr());
+		super.doOptions(req, resp);
+	}
+
+	/** Service this request using the response.
+     * @param request
+     * @param response
+     * @throws ServletException 
+     */
+    public void processRequest(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException {
+
+        if (dlConfig == null) {
+            logger.error("ERROR: No Configuration!");
+            throw new ServletException("NO VALID digilib CONFIGURATION!");
+        }
+
+        accountlog.debug("request: " + request.getQueryString());
+        logger.debug("request: " + request.getQueryString());
+        logger.debug("headers: " + ServletOps.headersToString(request));
+        //logger.debug("response:"+ response + " committed=" + response.isCommitted());
+        final long startTime = System.currentTimeMillis();
+
+        // parse request
+        DigilibRequest dlRequest = new DigilibRequest(request);
+        // extract the job information
+        final ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
+
+        // type of error reporting
+        ErrMsg errMsgType = defaultErrMsgType;
+        if (dlRequest.hasOption("errimg")) {
+            errMsgType = ErrMsg.IMAGE;
+        } else if (dlRequest.hasOption("errtxt")) {
+        	errMsgType = ErrMsg.TEXT;
+        } else if (dlRequest.hasOption("errcode")) {
+        	errMsgType = ErrMsg.CODE;
+        }
+        
+        try {
+        	/*
+        	 *  check if we can fast-track without scaling
+        	 */
+            ImageInput fileToLoad = (ImageInput) jobTicket.getInput();
+
+            // check permissions
+            if (useAuthorization) {
+                // get a list of required roles (empty if no restrictions)
+                List<String> rolesRequired = authOp.rolesForPath(
+                        jobTicket.getFilePath(), request);
+                if (rolesRequired != null) {
+                    authlog.debug("Role required: " + rolesRequired);
+                    authlog.debug("User: " + request.getRemoteUser());
+                    // is the current request/user authorized?
+                    if (!authOp.isRoleAuthorized(rolesRequired, request)) {
+                        // send deny answer and abort
+                        throw new AuthOpException();
+                    }
+                }
+            }
+
+            // if requested, send image as a file
+            if (sendFileAllowed && jobTicket.getSendAsFile()) {
+                String mt = null;
+                if (jobTicket.hasOption("rawfile")) {
+                    mt = "application/octet-stream";
+                }
+                logger.debug("Sending RAW File as is.");
+                ServletOps.sendFile(fileToLoad.getFile(), mt, null, response, logger);
+                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
+                return;
+            }
+
+            // if possible, send the image without actually having to transform it
+            if (! jobTicket.isTransformRequired()) {
+                logger.debug("Sending File as is.");
+                ServletOps.sendFile(fileToLoad.getFile(), null, null, response, logger);
+                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
+                return;
+            }
+
+            // check load of workers
+            if (imageJobCenter.isBusy()) {
+                logger.error("Servlet overloaded!");
+                response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+                return;
+            }
+            
+            // worker job is done asynchronously
+            AsyncContext asyncCtx = request.startAsync(request, response); 
+            // create job
+            AsyncServletWorker job = new AsyncServletWorker(dlConfig, jobTicket, asyncCtx, errMsgType, startTime);
+            // submit job
+            imageJobCenter.submit(job);
+            // we're done for now
+
+        } catch (ImageOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.IMAGE, null, response);
+        } catch (IOException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.FILE, null, response);
+        } catch (AuthOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.AUTH, null, response);
+        } catch (Exception e) {
+            logger.error("Other Exception: ", e);
+            // TODO: should we rethrow or swallow?
+            //throw new ServletException(e);
+        }
+    }
+
+    /**
+     * Sends an error to the client as text or image.
+     * 
+     * @param type
+     * @param error
+     * @param msg
+     * @param response
+     */
+    public static void digilibError(ErrMsg type, Error error, String msg,
+            HttpServletResponse response) {
+        try {
+            File img = null;
+            int status = 0;
+            if (error == Error.AUTH) {
+                if (msg == null) {
+                    msg = "ERROR: Unauthorized access!";
+                }
+                img = denyImgFile;
+                status = HttpServletResponse.SC_FORBIDDEN;
+            } else if (error == Error.FILE) {
+                if (msg == null) {
+                    msg = "ERROR: Image file not found!";
+                }
+                img = notfoundImgFile;
+                status = HttpServletResponse.SC_NOT_FOUND;
+            } else {
+                if (msg == null) {
+                    msg = "ERROR: Other image error!";
+                }
+                img = errorImgFile;
+                status = HttpServletResponse.SC_BAD_REQUEST;
+            }
+            if (response.isCommitted()) {
+                // response already committed
+                logger.warn("Response committed for error "+msg);
+            }
+            if (type == ErrMsg.TEXT) {
+                ServletOps.htmlMessage(msg, response);
+            } else if (type == ErrMsg.CODE) {
+                response.sendError(status, msg);
+            } else if (img != null) {
+                // default: image
+                ServletOps.sendFile(img, null, null, response, logger);
+            }
+        } catch (Exception e) {
+            logger.error("Error sending error!", e);
+        }
+
+    }
+
+    public static String getVersion() {
+        return version;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/ScalerNoAsync.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,346 @@
+package digilib.servlet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.auth.AuthOpException;
+import digilib.auth.AuthOps;
+import digilib.image.DocuImage;
+import digilib.image.ImageJobDescription;
+import digilib.image.ImageOpException;
+import digilib.image.ImageWorker;
+import digilib.io.DocuDirCache;
+import digilib.io.DocuDirectory;
+import digilib.io.ImageInput;
+import digilib.util.DigilibJobCenter;
+
+/**
+ * Version of Scaler servlet that uses a thread pool but not Servlet 3.0 async API. 
+ */
+public class ScalerNoAsync extends HttpServlet {
+
+    private static final long serialVersionUID = -5439198888139362735L;
+
+    /** digilib servlet version (for all components) */
+    public static final String version = "1.9.0a5 noasync";
+
+    /** servlet error codes */
+    public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
+    
+    /** type of error message */
+    public static enum ErrMsg {IMAGE, TEXT, CODE};
+    
+    /** logger for accounting requests */
+    protected static Logger accountlog = Logger.getLogger("account.request");
+
+    /** gengeral logger for this class */
+    protected static Logger logger = Logger.getLogger("digilib.scaler");
+
+    /** logger for authentication related */
+    protected static Logger authlog = Logger.getLogger("digilib.auth");
+
+    /** DocuDirCache instance */
+    protected DocuDirCache dirCache;
+
+    /** Image executor */
+    DigilibJobCenter<DocuImage> imageJobCenter;
+
+    /** authentication error image file */
+    public static File denyImgFile;
+
+    /** image error image file */
+    public static File errorImgFile;
+
+    /** not found error image file */
+    public static File notfoundImgFile;
+
+    /** send files as is? */
+    protected boolean sendFileAllowed = true;
+
+    /** DigilibConfiguration instance */
+    protected DigilibConfiguration dlConfig;
+
+    /** use authorization database */
+    protected boolean useAuthorization = true;
+
+    /** AuthOps instance */
+    protected AuthOps authOp;
+
+    /**
+     * Initialisation on first run.
+     * 
+     * @throws ServletException
+     * 
+     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+     */
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+
+        System.out
+                .println("***** Digital Image Library Image Scaler Servlet (version "
+                        + version + ") *****");
+        // say hello in the log file
+        logger.info("***** Digital Image Library Image Scaler Servlet (version "
+                + version + ") *****");
+
+        // get our ServletContext
+        ServletContext context = config.getServletContext();
+        // see if there is a Configuration instance
+        dlConfig = (DigilibConfiguration) context
+                .getAttribute("digilib.servlet.configuration");
+        if (dlConfig == null) {
+            // no Configuration
+            throw new ServletException("No Configuration!");
+        }
+        // set our AuthOps
+        useAuthorization = dlConfig.getAsBoolean("use-authorization");
+        authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
+
+        // DocuDirCache instance
+        dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+
+        // Executor
+        imageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig
+                .getValue("servlet.worker.imageexecutor");
+
+        denyImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("denied-image"), context);
+        errorImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("error-image"), context);
+        notfoundImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("notfound-image"), context);
+        sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
+    }
+
+    /** Returns modification time relevant to the request for caching.
+     * 
+     * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest)
+     */
+    public long getLastModified(HttpServletRequest request) {
+        accountlog.debug("GetLastModified from " + request.getRemoteAddr()
+                + " for " + request.getQueryString());
+        long mtime = -1;
+        // create new request
+        DigilibRequest dlReq = new DigilibRequest(request);
+        DocuDirectory dd = dirCache.getDirectory(dlReq.getFilePath());
+        if (dd != null) {
+            mtime = dd.getDirMTime() / 1000 * 1000;
+        }
+        logger.debug("  returns "+mtime);
+        return mtime;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("GET from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("POST from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+    
+
+	protected void doHead(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		logger.debug("HEAD from "+req.getRemoteAddr());
+		super.doHead(req, resp);
+	}
+
+	protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		logger.debug("OPTIONS from "+req.getRemoteAddr());
+		super.doOptions(req, resp);
+	}
+
+	/** Service this request using the response.
+     * @param request
+     * @param response
+     * @throws ServletException 
+     */
+    public void processRequest(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException {
+
+        if (dlConfig == null) {
+            logger.error("ERROR: No Configuration!");
+            throw new ServletException("NO VALID digilib CONFIGURATION!");
+        }
+
+        accountlog.debug("request: " + request.getQueryString());
+        logger.debug("request: " + request.getQueryString());
+        long startTime = System.currentTimeMillis();
+
+        // parse request
+        DigilibRequest dlRequest = new DigilibRequest(request);
+        // extract the job information
+        ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
+
+        // type of error reporting
+        ErrMsg errMsgType = ErrMsg.IMAGE;
+        if (dlRequest.hasOption("errtxt")) {
+        	errMsgType = ErrMsg.TEXT;
+        } else if (dlRequest.hasOption("errcode")) {
+        	errMsgType = ErrMsg.CODE;
+        }
+        
+        try {
+        	/*
+        	 *  check if we can fast-track without scaling
+        	 */
+            ImageInput fileToLoad = (ImageInput) jobTicket.getInput();
+
+            // check permissions
+            if (useAuthorization) {
+                // get a list of required roles (empty if no restrictions)
+                List<String> rolesRequired = authOp.rolesForPath(
+                        jobTicket.getFilePath(), request);
+                if (rolesRequired != null) {
+                    authlog.debug("Role required: " + rolesRequired);
+                    authlog.debug("User: " + request.getRemoteUser());
+                    // is the current request/user authorized?
+                    if (!authOp.isRoleAuthorized(rolesRequired, request)) {
+                        // send deny answer and abort
+                        throw new AuthOpException();
+                    }
+                }
+            }
+
+            // if requested, send image as a file
+            if (sendFileAllowed && jobTicket.getSendAsFile()) {
+                String mt = null;
+                if (jobTicket.hasOption("rawfile")) {
+                    mt = "application/octet-stream";
+                }
+                logger.debug("Sending RAW File as is.");
+                ServletOps.sendFile(fileToLoad.getFile(), mt, null, response, logger);
+                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
+                return;
+            }
+
+            // if possible, send the image without actually having to transform it
+            if (! jobTicket.isTransformRequired()) {
+                logger.debug("Sending File as is.");
+                ServletOps.sendFile(fileToLoad.getFile(), null, null, response, logger);
+                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
+                return;
+            }
+
+            // check load of workers
+            if (imageJobCenter.isBusy()) {
+                logger.error("Servlet overloaded!");
+                response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+                return;
+            }
+            // create job
+            ImageWorker job = new ImageWorker(dlConfig, jobTicket);
+            // submit job
+            Future<DocuImage> jobResult = imageJobCenter.submit(job);
+            // wait for result
+            DocuImage img = jobResult.get();
+            // forced destination image type
+            String mt = null;
+            if (jobTicket.hasOption("jpg")) {
+            	mt = "image/jpeg";
+            } else if (jobTicket.hasOption("png")) {
+            	mt = "image/png";
+            }
+            // send image
+            ServletOps.sendImage(img, mt, response, logger);
+            logger.debug("Job Processing Time: "
+                    + (System.currentTimeMillis() - startTime) + "ms");
+
+        } catch (ImageOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.IMAGE, null, response);
+        } catch (IOException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.FILE, null, response);
+        } catch (AuthOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.AUTH, null, response);
+        } catch (InterruptedException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+        } catch (ExecutionException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            String causeMsg = e.getCause().getMessage();
+            logger.error("caused by: " + causeMsg);
+            digilibError(errMsgType, Error.IMAGE, causeMsg, response);
+        }
+
+    }
+
+    /**
+     * Sends an error to the client as text or image.
+     * 
+     * @param type
+     * @param error
+     * @param msg
+     * @param response
+     */
+    public static void digilibError(ErrMsg type, Error error, String msg,
+            HttpServletResponse response) {
+        try {
+            File img = null;
+            int status = 0;
+            if (error == Error.AUTH) {
+                if (msg == null) {
+                    msg = "ERROR: Unauthorized access!";
+                }
+                img = denyImgFile;
+                status = HttpServletResponse.SC_FORBIDDEN;
+            } else if (error == Error.FILE) {
+                if (msg == null) {
+                    msg = "ERROR: Image file not found!";
+                }
+                img = notfoundImgFile;
+                status = HttpServletResponse.SC_NOT_FOUND;
+            } else {
+                if (msg == null) {
+                    msg = "ERROR: Other image error!";
+                }
+                img = errorImgFile;
+                status = HttpServletResponse.SC_BAD_REQUEST;
+            }
+            if (response.isCommitted()) {
+                // response already committed
+                logger.error("Unable to send error: " + msg);
+                return;
+            }
+            if (type == ErrMsg.TEXT) {
+                ServletOps.htmlMessage(msg, response);
+            } else if (type == ErrMsg.CODE) {
+                response.sendError(status, msg);
+            } else if (img != null) {
+                // default: image
+                ServletOps.sendFile(img, null, null, response, logger);
+            }
+        } catch (Exception e) {
+            logger.error("Error sending error!", e);
+        }
+
+    }
+
+    public static String getVersion() {
+        return version;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/ScalerNoThread.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,321 @@
+package digilib.servlet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.auth.AuthOpException;
+import digilib.auth.AuthOps;
+import digilib.image.DocuImage;
+import digilib.image.ImageJobDescription;
+import digilib.image.ImageOpException;
+import digilib.image.ImageWorker;
+import digilib.io.DocuDirCache;
+import digilib.io.DocuDirectory;
+import digilib.io.ImageInput;
+
+/**
+ * Version of Scaler servlet that doesn't use a thread pool.
+ */
+public class ScalerNoThread extends HttpServlet {
+
+    private static final long serialVersionUID = 1450947819851623306L;
+
+    /** digilib servlet version (for all components) */
+    public static final String version = "1.9.0a5 nothread";
+
+    /** servlet error codes */
+    public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
+    
+    /** type of error message */
+    public static enum ErrMsg {IMAGE, TEXT, CODE};
+    
+    /** logger for accounting requests */
+    protected static Logger accountlog = Logger.getLogger("account.request");
+
+    /** gengeral logger for this class */
+    protected static Logger logger = Logger.getLogger("digilib.scaler");
+
+    /** logger for authentication related */
+    protected static Logger authlog = Logger.getLogger("digilib.auth");
+
+    /** DocuDirCache instance */
+    protected DocuDirCache dirCache;
+
+    /** authentication error image file */
+    public static File denyImgFile;
+
+    /** image error image file */
+    public static File errorImgFile;
+
+    /** not found error image file */
+    public static File notfoundImgFile;
+
+    /** send files as is? */
+    protected boolean sendFileAllowed = true;
+
+    /** DigilibConfiguration instance */
+    protected DigilibConfiguration dlConfig;
+
+    /** use authorization database */
+    protected boolean useAuthorization = true;
+
+    /** AuthOps instance */
+    protected AuthOps authOp;
+
+    /**
+     * Initialisation on first run.
+     * 
+     * @throws ServletException
+     * 
+     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+     */
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+
+        System.out
+                .println("***** Digital Image Library Image Scaler Servlet (version "
+                        + version + ") *****");
+        // say hello in the log file
+        logger.info("***** Digital Image Library Image Scaler Servlet (version "
+                + version + ") *****");
+
+        // get our ServletContext
+        ServletContext context = config.getServletContext();
+        // see if there is a Configuration instance
+        dlConfig = (DigilibConfiguration) context
+                .getAttribute("digilib.servlet.configuration");
+        if (dlConfig == null) {
+            // no Configuration
+            throw new ServletException("No Configuration!");
+        }
+        // set our AuthOps
+        useAuthorization = dlConfig.getAsBoolean("use-authorization");
+        authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
+
+        // DocuDirCache instance
+        dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+
+        denyImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("denied-image"), context);
+        errorImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("error-image"), context);
+        notfoundImgFile = ServletOps.getFile(
+                (File) dlConfig.getValue("notfound-image"), context);
+        sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
+    }
+
+    /** Returns modification time relevant to the request for caching.
+     * 
+     * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest)
+     */
+    public long getLastModified(HttpServletRequest request) {
+        accountlog.debug("GetLastModified from " + request.getRemoteAddr()
+                + " for " + request.getQueryString());
+        long mtime = -1;
+        // create new request
+        DigilibRequest dlReq = new DigilibRequest(request);
+        DocuDirectory dd = dirCache.getDirectory(dlReq.getFilePath());
+        if (dd != null) {
+            mtime = dd.getDirMTime() / 1000 * 1000;
+        }
+        logger.debug("  returns "+mtime);
+        return mtime;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("GET from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+        accountlog.info("POST from " + request.getRemoteAddr());
+        this.processRequest(request, response);
+    }
+    
+
+	protected void doHead(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		logger.debug("HEAD from "+req.getRemoteAddr());
+		super.doHead(req, resp);
+	}
+
+	protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		logger.debug("OPTIONS from "+req.getRemoteAddr());
+		super.doOptions(req, resp);
+	}
+
+	/** Service this request using the response.
+     * @param request
+     * @param response
+     * @throws ServletException 
+     */
+    public void processRequest(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException {
+
+        if (dlConfig == null) {
+            logger.error("ERROR: No Configuration!");
+            throw new ServletException("NO VALID digilib CONFIGURATION!");
+        }
+
+        accountlog.debug("request: " + request.getQueryString());
+        logger.debug("request: " + request.getQueryString());
+        long startTime = System.currentTimeMillis();
+
+        // parse request
+        DigilibRequest dlRequest = new DigilibRequest(request);
+        // extract the job information
+        ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
+
+        // type of error reporting
+        ErrMsg errMsgType = ErrMsg.IMAGE;
+        if (dlRequest.hasOption("errtxt")) {
+        	errMsgType = ErrMsg.TEXT;
+        } else if (dlRequest.hasOption("errcode")) {
+        	errMsgType = ErrMsg.CODE;
+        }
+        
+        try {
+        	/*
+        	 *  check if we can fast-track without scaling
+        	 */
+            ImageInput fileToLoad = (ImageInput) jobTicket.getInput();
+
+            // check permissions
+            if (useAuthorization) {
+                // get a list of required roles (empty if no restrictions)
+                List<String> rolesRequired = authOp.rolesForPath(
+                        jobTicket.getFilePath(), request);
+                if (rolesRequired != null) {
+                    authlog.debug("Role required: " + rolesRequired);
+                    authlog.debug("User: " + request.getRemoteUser());
+                    // is the current request/user authorized?
+                    if (!authOp.isRoleAuthorized(rolesRequired, request)) {
+                        // send deny answer and abort
+                        throw new AuthOpException();
+                    }
+                }
+            }
+
+            // if requested, send image as a file
+            if (sendFileAllowed && jobTicket.getSendAsFile()) {
+                String mt = null;
+                if (jobTicket.hasOption("rawfile")) {
+                    mt = "application/octet-stream";
+                }
+                logger.debug("Sending RAW File as is.");
+                ServletOps.sendFile(fileToLoad.getFile(), mt, null, response, logger);
+                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
+                return;
+            }
+
+            // if possible, send the image without actually having to transform it
+            if (! jobTicket.isTransformRequired()) {
+                logger.debug("Sending File as is.");
+                ServletOps.sendFile(fileToLoad.getFile(), null, null, response, logger);
+                logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
+                return;
+            }
+
+            // create job
+            ImageWorker job = new ImageWorker(dlConfig, jobTicket);
+            // get result immediately
+            DocuImage img = job.call();
+            // forced destination image type
+            String mt = null;
+            if (jobTicket.hasOption("jpg")) {
+            	mt = "image/jpeg";
+            } else if (jobTicket.hasOption("png")) {
+            	mt = "image/png";
+            }
+            // send image
+            ServletOps.sendImage(img, mt, response, logger);
+            logger.debug("Job Processing Time: "
+                    + (System.currentTimeMillis() - startTime) + "ms");
+
+        } catch (ImageOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.IMAGE, null, response);
+        } catch (IOException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.FILE, null, response);
+        } catch (AuthOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.AUTH, null, response);
+        }
+
+    }
+
+    /**
+     * Sends an error to the client as text or image.
+     * 
+     * @param type
+     * @param error
+     * @param msg
+     * @param response
+     */
+    public static void digilibError(ErrMsg type, Error error, String msg,
+            HttpServletResponse response) {
+        try {
+            File img = null;
+            int status = 0;
+            if (error == Error.AUTH) {
+                if (msg == null) {
+                    msg = "ERROR: Unauthorized access!";
+                }
+                img = denyImgFile;
+                status = HttpServletResponse.SC_FORBIDDEN;
+            } else if (error == Error.FILE) {
+                if (msg == null) {
+                    msg = "ERROR: Image file not found!";
+                }
+                img = notfoundImgFile;
+                status = HttpServletResponse.SC_NOT_FOUND;
+            } else {
+                if (msg == null) {
+                    msg = "ERROR: Other image error!";
+                }
+                img = errorImgFile;
+                status = HttpServletResponse.SC_BAD_REQUEST;
+            }
+            if (response.isCommitted()) {
+                // response already committed
+                logger.error("Unable to send error: " + msg);
+                return;
+            }
+            if (type == ErrMsg.TEXT) {
+                ServletOps.htmlMessage(msg, response);
+            } else if (type == ErrMsg.CODE) {
+                response.sendError(status, msg);
+            } else if (img != null) {
+                // default: image
+                ServletOps.sendFile(img, null, null, response, logger);
+            }
+        } catch (Exception e) {
+            logger.error("Error sending error!", e);
+        }
+
+    }
+
+    public static String getVersion() {
+        return version;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/ServletOps.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,362 @@
+/*
+ * ServletOps -- Servlet utility class
+ * 
+ * Digital Image Library servlet components
+ * 
+ * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * Please read license.txt for the full details. A copy of the GPL may be found
+ * at http://www.gnu.org/copyleft/lgpl.html
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ *  
+ */
+
+package digilib.servlet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.StringTokenizer;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.image.DocuImage;
+import digilib.image.ImageOpException;
+import digilib.io.FileOps;
+
+public class ServletOps {
+
+    private static Logger logger = Logger.getLogger("servlet.op");
+
+    /**
+     * convert a string with a list of pathnames into an array of strings using
+     * the system's path seperator string
+     */
+    public static String[] getPathArray(String paths) {
+        // split list into directories
+        StringTokenizer dirs = new StringTokenizer(paths,
+                java.io.File.pathSeparator);
+        int n = dirs.countTokens();
+        if (n < 1) {
+            return null;
+        }
+        // add directories into array
+        String[] pathArray = new String[n];
+        for (int i = 0; i < n; i++) {
+            pathArray[i] = dirs.nextToken();
+        }
+        return pathArray;
+    }
+
+    /**
+     * get a real File for a web app File.
+     * 
+     * If the File is not absolute the path is appended to the base directory of
+     * the web-app.
+     * 
+     * @param file
+     * @param sc
+     * @return
+     */
+    public static File getFile(File f, ServletContext sc) {
+        // is the filename absolute?
+        if (!f.isAbsolute()) {
+            // relative path -> use getRealPath to resolve in WEB-INF
+            String fn = sc.getRealPath(f.getPath());
+            f = new File(fn);
+        }
+        return f;
+    }
+
+    /**
+     * get a real file name for a web app file pathname.
+     * 
+     * If filename starts with "/" its treated as absolute else the path is
+     * appended to the base directory of the web-app.
+     * 
+     * @param filename
+     * @param sc
+     * @return
+     */
+    public static String getFile(String filename, ServletContext sc) {
+        File f = new File(filename);
+        // is the filename absolute?
+        if (!f.isAbsolute()) {
+            // relative path -> use getRealPath to resolve in WEB-INF
+            filename = sc.getRealPath(filename);
+        }
+        return filename;
+    }
+
+    /**
+     * get a real File for a config File.
+     * 
+     * If the File is not absolute the path is appended to the WEB-INF directory
+     * of the web-app.
+     * 
+     * @param file
+     * @param sc
+     * @return
+     */
+    public static File getConfigFile(File f, ServletContext sc) {
+        String fn = f.getPath();
+        // is the filename absolute?
+        if (f.isAbsolute()) {
+            // does it exist?
+            if (f.canRead()) {
+                // fine
+                return f;
+            } else {
+                // try just the filename as relative
+                fn = f.getName();
+            }
+        }
+        // relative path -> use getRealPath to resolve in WEB-INF
+        String newfn = sc.getRealPath("WEB-INF/" + fn);
+        f = new File(newfn);
+        return f;
+    }
+
+    /**
+     * get a real file name for a config file pathname.
+     * 
+     * If filename starts with "/" its treated as absolute else the path is
+     * appended to the WEB-INF directory of the web-app.
+     * 
+     * @param filename
+     * @param sc
+     * @return
+     */
+    public static String getConfigFile(String filename, ServletContext sc) {
+        File f = new File(filename);
+        // is the filename absolute?
+        if (!f.isAbsolute()) {
+            // relative path -> use getRealPath to resolve in WEB-INF
+            filename = sc.getRealPath("WEB-INF/" + filename);
+        }
+        return filename;
+    }
+
+    /**
+     * print a servlet response
+     */
+    public static void htmlMessage(String msg, HttpServletResponse response)
+            throws IOException {
+        htmlMessage("Scaler", msg, response);
+    }
+
+    /**
+     * print a servlet response
+     */
+    public static void htmlMessage(String title, String msg,
+            HttpServletResponse response) throws IOException {
+        response.setContentType("text/html; charset=iso-8859-1");
+        PrintWriter out = response.getWriter();
+        out.println("<html>");
+        out.println("<head><title>" + title + "</title></head>");
+        out.println("<body>");
+        out.println("<p>" + msg + "</p>");
+        out.println("</body></html>");
+    }
+
+    /**
+     * Transfers an image file as-is with the mime type mt.
+     * 
+     * The local file is copied to the <code>OutputStream</code> of the
+     * <code>ServletResponse</code>. If mt is null then the mime-type is
+     * auto-detected with mimeForFile.
+     * 
+     * @param f
+     *            Image file to be sent.
+     * @param mt
+     *            mime-type of the file.
+     * @param name
+     *            name of the download file (for application/x)
+     * @param res
+     *            ServletResponse where the image file will be sent.
+     * @throws ImageOpException
+     * @throws ServletException
+     *             Exception on sending data.
+     * @throws IOException
+     */
+    public static void sendFile(File f, String mt, String name,
+            HttpServletResponse response) throws ImageOpException, IOException {
+        // use default logger
+        ServletOps.sendFile(f, mt, name, response, ServletOps.logger);
+    }
+
+    /**
+     * Transfers an image file as-is with the mime type mt.
+     * 
+     * The local file is copied to the <code>OutputStream</code> of the
+     * <code>ServletResponse</code>. If mt is null then the mime-type is
+     * auto-detected with mimeForFile.
+     * @param f
+     *            Image file to be sent.
+     * @param mt
+     *            mime-type of the file.
+     * @param name 
+     *            name of the download file (for application/x)
+     * @param res
+     *            ServletResponse where the image file will be sent.
+     * @param logger
+     *            Logger to use
+     * @throws ImageOpException
+     * @throws ServletException Exception on sending data.
+     * @throws IOException 
+     */
+    public static void sendFile(File f, String mt, String name, HttpServletResponse response, Logger logger)
+            throws ImageOpException, IOException {
+        logger.debug("sendRawFile(" + mt + ", " + f + ")");
+    	if (response == null) {
+    		logger.error("No response!");
+    		return;
+    	}
+        if (mt == null) {
+            // auto-detect mime-type
+            mt = FileOps.mimeForFile(f);
+            if (mt == null) {
+                throw new ImageOpException("Unknown file type.");
+            }
+        }
+        response.setContentType(mt);
+        // open file
+        if (mt.startsWith("application")) {
+            if (name == null) {
+                // no download name -- use filename
+                name = f.getName();
+            }
+            response.addHeader("Content-Disposition", "attachment; filename=\""+name+"\"");
+        }
+        FileInputStream inFile = null;
+        try {
+            inFile = new FileInputStream(f);
+            OutputStream outStream = response.getOutputStream();
+            // TODO: should we set content length? 
+            // see http://www.prozesse-und-systeme.de/servletFlush.html
+            response.setContentLength( (int) f.length());
+            byte dataBuffer[] = new byte[4096];
+            int len;
+            while ((len = inFile.read(dataBuffer)) != -1) {
+                // copy out file
+                outStream.write(dataBuffer, 0, len);
+            }
+        } finally {
+            try {
+                if (inFile != null) {
+                    inFile.close();
+                }
+            } catch (IOException e) {
+                // nothing to do
+            }
+        }
+    }
+
+    /**
+     * Write image img to ServletResponse response.
+     * 
+     * @param img
+     * @param mimeType
+     * @param response
+     * @throws ImageOpException
+     * @throws ServletException Exception on sending data.
+     */
+    public static void sendImage(DocuImage img, String mimeType,
+            HttpServletResponse response) throws ImageOpException,
+            ServletException {
+        ServletOps.sendImage(img, mimeType, response, ServletOps.logger);
+    }
+
+    /**
+     * Write image img to ServletResponse response.
+     * 
+     * @param img
+     * @param mimeType
+     * @param response
+     * @param logger
+     * @throws ImageOpException
+     * @throws ServletException Exception on sending data.
+     */
+    public static void sendImage(DocuImage img, String mimeType,
+            HttpServletResponse response, Logger logger) throws ImageOpException,
+            ServletException {
+    	if (response == null) {
+    		logger.error("No response!");
+    		return;
+    	}
+        //logger.debug("sending to response: ("+ headersToString(response) + ") committed=" + response.isCommitted());
+        logger.debug("sending to response. committed=" + response.isCommitted());
+        // TODO: should we erase or replace old last-modified header?
+        try {
+            OutputStream outstream = response.getOutputStream();
+            // setup output -- if mime type is set use that otherwise
+            // if source is JPG then dest will be JPG else it's PNG
+            if (mimeType == null) {
+                mimeType = img.getMimetype();
+                if (mimeType == null) {
+                    // still no mime-type
+                    logger.warn("sendImage without mime-type! using image/jpeg.");
+                    mimeType = "image/jpeg";
+                }
+            }
+            if ((mimeType.equals("image/jpeg") || mimeType.equals("image/jp2") || 
+                    mimeType.equals("image/fpx"))) {
+                mimeType = "image/jpeg";
+            } else {
+                mimeType = "image/png";
+            }
+            // write the image
+            response.setContentType(mimeType);
+            img.writeImage(mimeType, outstream);
+        } catch (IOException e) {
+            throw new ServletException("Error sending image:", e);
+        }
+        // TODO: should we: finally { img.dispose(); }
+    }
+
+    /** Returns text representation of headers for debuggging purposes.
+     * @param req
+     * @return
+     */
+    public static String headersToString(HttpServletRequest req) {
+        String s = "";
+        Enumeration<String> hns = req.getHeaderNames();
+        while (hns.hasMoreElements()) {
+            String hn = hns.nextElement();
+            s += hn + "=" + req.getHeader(hn) + "; ";
+        }
+        return s;
+    }
+    
+    /** Returns text representation of headers for debuggging purposes.
+     * Works only with Servlet spec 3.0!
+     * @param resp
+     * @return
+     */
+    public static String headersToString(HttpServletResponse resp) {
+        String s = "";
+        Collection<String> hns = resp.getHeaderNames();
+        for (String hn : hns) {
+            s += hn + "=" + resp.getHeader(hn) + "; ";
+        }
+        return s;
+    }
+    
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/servlet/Texter.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,189 @@
+/* Texter.java -- Servlet for displaying text  
+ * Digital Image Library servlet components  
+ * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+ *  
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.  Please read license.txt for the full details. A copy of
+ * the GPL may be found at http://www.gnu.org/copyleft/lgpl.html  
+ * You should have received a copy of the GNU General Public License along with this
+ * program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA  
+ * 
+ * Created on 15.09.2003 by casties  
+ */
+
+package digilib.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
+import digilib.auth.AuthOps;
+import digilib.image.ImageOpException;
+import digilib.io.DocuDirCache;
+import digilib.io.FileOps;
+import digilib.io.FileOps.FileClass;
+import digilib.io.TextFile;
+
+/**
+ * Servlet for displaying text
+ * 
+ * 
+ * @author casties
+ *  
+ */
+public class Texter extends HttpServlet {
+
+    private static final long serialVersionUID = 6678666342141409867L;
+
+    /** Servlet version */
+	public static String tlVersion = "0.1b3";
+
+	/** DigilibConfiguration instance */
+	DigilibConfiguration dlConfig = null;
+
+	/** general logger */
+	Logger logger = Logger.getLogger("digilib.texter");
+
+    /** logger for accounting requests */
+    protected static Logger accountlog = Logger.getLogger("account.texter.request");
+
+	/** FileOps instance */
+	FileOps fileOp;
+
+	/** AuthOps instance */
+	AuthOps authOp;
+
+	/** ServletOps instance */
+	ServletOps servletOp;
+
+	/** DocuDirCache instance */
+	DocuDirCache dirCache;
+
+	/** use authentication */
+	boolean useAuthentication = false;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+	 */
+	public void init(ServletConfig config) throws ServletException {
+		super.init(config);
+
+		System.out.println("***** Digital Image Library Text Servlet (version "
+				+ tlVersion + ") *****");
+
+		// get our ServletContext
+		ServletContext context = config.getServletContext();
+		// see if there is a Configuration instance
+		dlConfig = (DigilibConfiguration) context
+				.getAttribute("digilib.servlet.configuration");
+		if (dlConfig == null) {
+			// no Configuration
+			throw new ServletException("No Configuration!");
+		}
+		// say hello in the log file
+		logger.info("***** Digital Image Library Text Servlet (version "
+				+ tlVersion + ") *****");
+
+		// set our AuthOps
+		useAuthentication = dlConfig.getAsBoolean("use-authorization");
+		authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
+		// DocuDirCache instance
+		dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest,
+	 *      javax.servlet.http.HttpServletResponse)
+	 */
+	protected void doGet(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+        accountlog.info("GET from " + request.getRemoteAddr());
+		// do the processing
+		processRequest(request, response);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest,
+	 *      javax.servlet.http.HttpServletResponse)
+	 */
+	protected void doPost(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+        accountlog.info("POST from " + request.getRemoteAddr());
+		// do the processing
+		processRequest(request, response);
+	}
+
+	protected void processRequest(HttpServletRequest request,
+			HttpServletResponse response) {
+		
+		/*
+		 * request parameters
+		 */
+        // create new request with defaults
+        DigilibRequest dlRequest = new DigilibRequest(request);
+		try {
+			
+			/*
+			 * find the file to load/send
+			 */
+			TextFile f = getTextFile(dlRequest, "/txt");
+			if (f != null) {
+				ServletOps.sendFile(f.getFile(), null, null, response, logger);
+			} else {
+				f = getTextFile(dlRequest, "");
+				if (f != null) {
+					ServletOps.sendFile(f.getFile(), null, null, response, logger);
+				} else {
+					response.sendError(HttpServletResponse.SC_NOT_FOUND, "Text-File not found!");
+					//ServletOps.htmlMessage("No Text-File!", response);
+				}
+			}
+			
+		} catch (ImageOpException e) {
+            // most likely wrong file format...
+            logger.error("ERROR sending text file: ", e);
+            try {
+                response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+            } catch (IOException e1) {
+                logger.error("ERROR sending error: ", e1);
+            }
+        } catch (IOException e) {
+            logger.error("ERROR sending text file: ", e);
+        }
+    }
+	
+
+	/**
+	 * Looks for a file in the given subDirectory.
+	 * 
+	 * @param dlRequest
+	 *            The received request which has the file path.
+	 * @param subDirectory
+	 *            The subDirectory of the file path where the file should
+	 *            be found.
+	 * @return The wanted Textfile or null if there wasn't a file.
+	 */
+
+	private TextFile getTextFile(DigilibRequest dlRequest, String subDirectory) {
+		String loadPathName = dlRequest.getFilePath() + subDirectory;
+		// find the file(set)
+		return (TextFile) dirCache.getFile(loadPathName, dlRequest.getAsInt("pn"), 
+		        FileClass.TEXT);
+	}
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/DigilibJobCenter.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,124 @@
+/** Wrapper around ExecutionService.
+ * 
+ */
+package digilib.util;
+
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+
+import org.apache.log4j.Logger;
+
+/** Wrapper around ExecutionService.
+ * 
+ * @author casties
+ *
+ */
+public class DigilibJobCenter<V> {
+    /** general logger for this class */
+    private static Logger logger = Logger.getLogger("digilib.jobcenter");
+    /** ExecutorService */
+    private ExecutorService executor;
+    /** max number of running threads */
+    private int maxThreads = 1;
+    /** max number of waiting threads */
+    private int maxQueueLen = 50;
+    /** label for this job center */
+    private String label = "";
+    
+    /** Create a DigilibJobcenter with the given number of threads and queue length.
+     * If prestart=true it starts the threads in the thread pool.
+     * 
+     * @param maxThreads
+     * @param maxQueueLen
+     * @param prestart
+     * @param label
+     */
+    public DigilibJobCenter(int maxThreads, int maxQueueLen, boolean prestart, String label) {
+        super();
+        this.label = (label != null) ? label : "";
+        this.maxThreads = maxThreads;
+        this.maxQueueLen = maxQueueLen;
+        executor = Executors.newFixedThreadPool(maxThreads);
+        if (prestart) {
+            // prestart threads so Tomcat's leak protection doesn't complain
+            int st = ((ThreadPoolExecutor)executor).prestartAllCoreThreads();
+            logger.debug(label+" prestarting threads: "+st);
+        }
+    }
+    
+    /** Submit Callable job that returns a Value to execute.
+     * 
+     * @param job
+     * @return Future to control the job
+     */
+    public Future<V> submit(Callable<V> job) {
+        return executor.submit(job);
+    }
+
+    /** Submit Runnable job to execute.
+     * 
+     * @param job
+     * @return Future to control the job
+     */
+    public Future<?> submit(Runnable job) {
+        return executor.submit(job);
+    }
+
+    /** Returns if the service is overloaded.
+     *  
+     * @return
+     */
+    public boolean isBusy() {
+        int jql = getWaitingJobs();
+        int jrl = getRunningJobs();
+        logger.debug(label+" isBusy: waiting jobs="+jql+" running jobs="+jrl);
+        return (jql > maxQueueLen);
+    }
+    
+    /** Returns the number of currently running jobs.
+     * @return
+     */
+    public int getRunningJobs() {
+        return ((ThreadPoolExecutor)executor).getActiveCount();
+    }
+    
+    /** Returns the number of currently waiting jobs.
+     * @return
+     */
+    public int getWaitingJobs() {
+        BlockingQueue<Runnable> jq = ((ThreadPoolExecutor)executor).getQueue();
+        int jql = jq.size();
+        return jql;
+    }
+
+    public void setMaxThreads(int maxThreads) {
+        this.maxThreads = maxThreads;
+    }
+
+    public int getMaxThreads() {
+        return maxThreads;
+    }
+
+    public void setMaxQueueLen(int maxQueueLen) {
+        this.maxQueueLen = maxQueueLen;
+    }
+
+    public int getMaxQueueLen() {
+        return maxQueueLen;
+    }
+
+    /** Shuts down the Executor. 
+     * Tries to stop running threads and returns a list of waiting threads.
+     * 
+     * @return
+     */
+    public List<Runnable> shutdownNow() {
+        return executor.shutdownNow();
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/HashTree.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,113 @@
+/*  HashTree -- Tree in a Hashtable
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ */
+
+package digilib.util;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+/**
+ * Tree representation wrapper for a HashMap.
+ * 
+ * The HashTree is constructed from a HashMap filled with 'branches' with
+ * 'leaves'. The branches are stored as String keys in the HashMap. The String
+ * values are leaves.
+ * 
+ * Branches are matched in 'twigs' separated by 'twig separator' Strings. The
+ * return values for a match are leaf values separated by 'leaf separator'
+ * Strings.
+ * 
+ * @author casties
+ */
+public class HashTree {
+
+    private Map<String, String> table;
+
+    private String twigSep = "/";
+
+    private String leafSep = ",";
+
+    /**
+     * Constructor of a HashTree.
+     * 
+     * Creates a HashTree wrapper around a given HashMap, using the given twig
+     * separator and leaf separator.
+     * 
+     * @param t
+     * @param twig_separator
+     * @param leaf_separator
+     */
+    public HashTree(Map<String, String> t, String twig_separator, String leaf_separator) {
+        table = t;
+        twigSep = twig_separator;
+        leafSep = leaf_separator;
+        optimizeTable();
+    }
+
+    private void optimizeTable() {
+    }
+
+    /**
+     * Matches the given branch against the HashTree.
+     * 
+     * Returns a LinkedList of all leaves on all matching branches in the tree.
+     * Branches in the tree match if they are substrings starting at the same
+     * root.
+     * 
+     * @param branch
+     * @return
+     */
+    public List<String> match(String branch) {
+        String b = "";
+        String m;
+        LinkedList<String> matches = new LinkedList<String>();
+
+        // split branch
+        StringTokenizer twig = new StringTokenizer(branch, twigSep);
+        // walk branch and check with tree
+        while (twig.hasMoreTokens()) {
+            if (b.length() == 0) {
+                b = twig.nextToken();
+            } else {
+                b += twigSep + twig.nextToken();
+            }
+            m = table.get(b);
+            if (m != null) {
+                if (m.indexOf(leafSep) < 0) {
+                    // single leaf
+                    matches.add(m);
+                } else {
+                    // split leaves
+                    StringTokenizer leaf = new StringTokenizer(m, leafSep);
+                    while (leaf.hasMoreTokens()) {
+                        matches.add(leaf.nextToken());
+                    }
+                }
+            }
+        }
+        if (matches.size() > 0) {
+            return matches;
+        } else {
+            return null;
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/ImageSize.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,230 @@
+/*
+ * ImageSize.java -- digilib image size class. 
+ * Digital Image Library servlet components 
+ * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de) 
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version. Please read license.txt for the full details. A copy of the GPL may
+ * be found at http://www.gnu.org/copyleft/lgpl.html You should have received a
+ * copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA Created on 26.08.2003
+ */
+
+package digilib.util;
+
+/** Class for image size (width, height).
+ * 
+ * A width or height of 0 is treated as a 'wildcard' that matches any size.
+ * 
+ * @author casties
+ *          
+ */
+public class ImageSize {
+	public int width;
+	public int height;
+
+	public ImageSize() {
+		super();
+	}
+
+	public ImageSize(int width, int height) {
+		this.width = width;
+		this.height = height;
+	}
+
+	public ImageSize(ImageSize i) {
+		this.width = i.width;
+		this.height = i.height;
+	}
+
+	public void setSize(int width, int height) {
+		this.width = width;
+		this.height = height;
+	}
+
+	/**
+	 * Returns if the size of this image is smaller in every dimension than the
+	 * other image.
+	 * 
+	 * 
+	 * 
+	 * @param is
+	 * @return
+	 */
+	public boolean isTotallySmallerThan(ImageSize is) {
+		if ((this.width == 0)||(is.width == 0)) {
+			// width wildcard
+			return (this.height <= is.height);
+		}
+		if ((this.height == 0)||(is.height == 0)) {
+			// height wildcard
+			return (this.width <= is.width);
+		}
+		return ((this.width <= is.width)&&(this.height <= is.height));
+	}
+
+	/**
+	 * Returns if the size of this image is smaller in at least one dimension
+	 * than the other image.
+	 * 
+	 * @param is
+	 * @return
+	 */
+	public boolean isSmallerThan(ImageSize is) {
+		if ((this.width == 0)||(is.width == 0)) {
+			// width wildcard
+			return (this.height <= is.height);
+		}
+		if ((this.height == 0)||(is.height == 0)) {
+			// height wildcard
+			return (this.width <= is.width);
+		}
+		return ((this.width <= is.width) || (this.height <= is.height));
+	}
+
+	/**
+	 * Returns if the size of this image is bigger in every dimension than the
+	 * other image.
+	 * 
+	 * 
+	 * 
+	 * @param is
+	 * @return
+	 */
+	public boolean isTotallyBiggerThan(ImageSize is) {
+		if ((this.width == 0)||(is.width == 0)) {
+			// width wildcard
+			return (this.height >= is.height);
+		}
+		if ((this.height == 0)||(is.height == 0)) {
+			// height wildcard
+			return (this.width >= is.width);
+		}
+		return ((this.width >= is.width) && (this.height >= is.height));
+	}
+
+	/**
+	 * Returns if the size of this image is bigger in at least one dimension
+	 * than the other image.
+	 * 
+	 * 
+	 * 
+	 * @param is
+	 * @return
+	 */
+	public boolean isBiggerThan(ImageSize is) {
+		if ((this.width == 0)||(is.width == 0)) {
+			// width wildcard
+			return (this.height >= is.height);
+		}
+		if ((this.height == 0)||(is.height == 0)) {
+			// height wildcard
+			return (this.width >= is.width);
+		}
+		return ((this.width >= is.width) || (this.height >= is.height));
+	}
+
+	/**
+	 * Returns if this image has the same size or height as the other image.
+	 * 
+	 * 
+	 * 
+	 * @param is
+	 * @return
+	 */
+	public boolean fitsIn(ImageSize is) {
+		if ((this.width == 0)||(is.width == 0)) {
+			// width wildcard
+			return (this.height == is.height);
+		}
+		if ((this.height == 0)||(is.height == 0)) {
+			// height wildcard
+			return (this.width == is.width);
+		}
+		return (
+			(this.width == is.width)
+				&& (this.height <= is.height)
+				|| (this.width <= is.width)
+				&& (this.height == is.height));
+	}
+
+	/**
+	 * Returns if the size of this image is the same as the other image.
+	 * 
+	 * 
+	 * 
+	 * @param is
+	 * @return
+	 */
+	public boolean equals(ImageSize is) {
+		if ((this.width == 0)||(is.width == 0)) {
+			// width wildcard
+			return (this.height == is.height);
+		}
+		if ((this.height == 0)||(is.height == 0)) {
+			// height wildcard
+			return (this.width == is.width);
+		}
+		return ((this.width == is.width) && (this.height == is.height));
+	}
+
+	/**
+	 * @return
+	 */
+	public int getHeight() {
+		return height;
+	}
+
+	/**
+	 * @param height
+	 */
+	public void setHeight(int height) {
+		this.height = height;
+	}
+
+	/**
+	 * @return
+	 */
+	public int getWidth() {
+		return width;
+	}
+
+	/**
+	 * @param width
+	 */
+	public void setWidth(int width) {
+		this.width = width;
+	}
+
+	/**
+	 * Returns the aspect ratio.
+	 * 
+	 * Aspect ratio is (width/height). So it's <1 for portrait and  >1 for
+	 * landscape.
+	 * 
+	 * @return
+	 */
+	public float getAspect() {
+		return (height > 0) ? ((float) width / (float) height) : 0;
+	}
+	
+	/**
+	 * Returns a scaled copy of this image size. 
+	 * 
+	 * @param scale
+	 * @return
+	 */
+	public ImageSize getScaled(float scale) {
+		return new ImageSize((int) (width * scale), (int) (height * scale));
+	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		String s = "[" + width + "x" + height + "]";
+		return s;
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/NumRange.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,175 @@
+/**
+ * 
+ */
+package digilib.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author casties
+ * 
+ */
+public class NumRange implements Iterable<Integer> {
+
+    private Integer start = 1;
+    private Integer end = Integer.MAX_VALUE;
+    private List<Integer> list = null;
+    private Integer maxnum = null;
+
+    /**
+     * @param start
+     * @param end
+     */
+    public NumRange(Integer start, Integer end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    /**
+     * @param range
+     */
+    public NumRange(String range) {
+        parseString(range);
+    }
+
+    /**
+     * @param range
+     */
+    public NumRange(String range, Integer max) {
+        this.maxnum = max;
+        parseString(range);
+    }
+
+
+    public void parseString(String pages) {
+
+        ArrayList<Integer> pgs = new ArrayList<Integer>();
+
+        String intervals[] = pages.split(",");
+
+        // convert the page-interval-strings into a list containing every single
+        // page
+        for (String interval : intervals) {
+            if (interval.contains("-")) {
+                String nums[] = interval.split("-");
+                int start = Integer.valueOf(nums[0]);
+                if (nums.length > 1) {
+                    // second number is end of range
+                    int end = Integer.valueOf(nums[1]);
+                    if (intervals.length == 1) {
+                        // optimized case of just one interval
+                        this.start = start;
+                        this.end = end;
+                        this.list = null;
+                        return;
+                    }
+                    for (int i = start; i <= end; i++) {
+                        // add all numbers to list
+                        pgs.add(i);
+                    }
+                } else {
+                    // second number missing: range to infinity
+                    pgs.add(start);
+                    pgs.add(Integer.MAX_VALUE);
+                }
+            } else {
+                // single number
+                pgs.add(Integer.valueOf(interval));
+            }
+        }
+        if (intervals.length > 1) {
+            Collections.sort(pgs);
+        }
+        list = pgs;
+    }
+
+    public int getStart() {
+        if (list == null) {
+            return start;
+        } else {
+            return list.get(0);
+        }
+    }
+
+    public int getEnd() {
+        Integer last;
+        if (list == null) {
+            last = end;
+        } else {
+            last = list.get(list.size() - 1);
+        }
+        if (maxnum == null) {
+            return last;
+        } else {
+            return Math.min(last, maxnum);
+        }
+    }
+
+    public Iterator<Integer> iterator() {
+        if (list == null) {
+            // return count-based iterator
+            return new Iterator<Integer>() {
+                // anonymous inner Iterator class
+                private int num = getStart();
+                private int end = getEnd();
+
+                public boolean hasNext() {
+                    return (num <= end);
+                }
+
+                public Integer next() {
+                    return num++;
+                }
+
+                public void remove() {
+                    // don't do this
+                }
+            };
+        } else {
+            // return list-based iterator
+            return new Iterator<Integer>() {
+                // anonymous inner Iterator class
+                private int listidx = 0;
+                private int listend = list.size();
+                private int num = getStart();
+                private int end = getEnd();
+
+                public boolean hasNext() {
+                    return (num <= end);
+                }
+
+                public Integer next() {
+                    if (listidx < listend - 1) {
+                        num = list.get(listidx++);
+                        return num;
+                    } else if (listidx == listend - 1) {
+                        // last element in list
+                        int n = list.get(listidx++);
+                        if (n == Integer.MAX_VALUE) {
+                            // open end -- continue
+                            num++;
+                            return num++;
+                        } else {
+                            num = n;
+                            return num++;
+                        }
+                    } else {
+                        return num++;
+                    }
+                }
+
+                public void remove() {
+                    // don't do this
+                }
+            };
+        }
+    }
+
+    public void setMaxnum(Integer maxnum) {
+        this.maxnum = maxnum;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/OptionsSet.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,67 @@
+/**
+ * 
+ */
+package digilib.util;
+
+import java.util.HashSet;
+import java.util.StringTokenizer;
+
+/**
+ * @author casties
+ *
+ */
+@SuppressWarnings("serial")
+public class OptionsSet extends HashSet<String> {
+
+	protected String optionSep = ",";
+	
+	public OptionsSet() {
+		super();
+	}
+
+	/** Constructor with String of options.
+	 * @param s
+	 */
+	public OptionsSet(String s) {
+		super();
+		parseString(s);
+	}
+
+	/** Adds all options from String to Set.
+	 * @param s
+	 */
+	public void parseString(String s) {
+		if (s != null) {
+			StringTokenizer i = new StringTokenizer(s, optionSep);
+			while (i.hasMoreTokens()) {
+				String opt = i.nextToken();
+				this.add(opt);
+			}
+		}
+	}
+	
+	public boolean hasOption(String opt) {
+		return this.contains(opt);
+	}
+
+	public String toString() {
+		StringBuffer b = new StringBuffer();
+		for (String s: this) {
+			if (b.length() > 0) {
+				b.append(optionSep);
+			}
+			b.append(s);			
+		}
+		return b.toString();
+	}
+	
+	
+	public String getOptionSep() {
+		return optionSep;
+	}
+
+	public void setOptionSep(String optionSep) {
+		this.optionSep = optionSep;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/Parameter.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,284 @@
+/* Parameter -- General digilib parameter class.
+
+ Digital Image Library servlet components
+
+ Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+ This program is free software; you can redistribute  it and/or modify it
+ under  the terms of  the GNU General  Public License as published by the
+ Free Software Foundation;  either version 2 of the  License, or (at your
+ option) any later version.
+ 
+ Please read license.txt for the full details. A copy of the GPL
+ may be found at http://www.gnu.org/copyleft/lgpl.html
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ *
+ * Created on 02.09.2003 by casties
+ * 
+ */
+package digilib.util;
+
+import java.io.File;
+import java.io.IOException;
+
+
+/**
+ * General digilib parameter class.
+ * 
+ * @author casties
+ *  
+ */
+public class Parameter {
+	/** real value */
+	protected Object value = null;
+
+	/** default value */
+	protected Object defval = null;
+
+	/** parameter name (e.g. in config file) */
+	protected String name = null;
+
+	/** parameter type */
+	protected int type = 0;
+
+	/**
+	 * Default constructor.
+	 *  
+	 */
+	public Parameter() {
+		super();
+	}
+
+	/**
+	 * Constructor with name, default, and value.
+	 * 
+	 * @param value
+	 * @param defval
+	 */
+	public Parameter(String name, Object defval, Object value) {
+		this.name = name;
+		this.value = value;
+		this.defval = defval;
+	}
+
+	/**
+	 * Constructor with name, default, value, and type.
+	 * 
+	 * @param value
+	 * @param defval
+	 */
+	public Parameter(String name, Object defval, Object value, int type) {
+		this.name = name;
+		this.value = value;
+		this.defval = defval;
+		this.type = type;
+	}
+
+	/**
+	 * Is the value valid.
+	 * 
+	 * @return
+	 */
+	public boolean hasValue() {
+		return (value != null);
+	}
+
+	/**
+	 * Try to set the value from a String.
+	 * 
+	 * Tries to convert the String to the same type as the default value. Sets
+	 * the value anyway if the default is null. Returns if the value could be
+	 * set.
+	 * 
+	 * @param val
+	 * @return
+	 */
+	public boolean setValueFromString(String val) {
+		if (val == null) {
+			val = "";
+		}
+		// no default matches all
+		if (defval == null) {
+			this.value = val;
+			return true;
+		}
+		Class<? extends Object> c = defval.getClass();
+		// take String as is
+		if (c == String.class) {
+			this.value = val;
+			return true;
+		}
+		// set File
+		if (c == File.class) {
+			this.value = new File(val);
+			return true;
+		}
+		// set Options
+		if (c == OptionsSet.class) {
+			this.value = new OptionsSet(val);
+			return true;
+		}
+		// set Boolean if string == "true"
+		if (c == Boolean.class) {
+			this.value = new Boolean(val.compareToIgnoreCase("true") == 0);
+			return true;
+		}
+		try {
+			// set Integer
+			if (c == Integer.class) {
+				this.value = new Integer(Integer.parseInt(val));
+				return true;
+			}
+			// set Float
+			if (c == Float.class) {
+				this.value = new Float(Float.parseFloat(val));
+				return true;
+			}
+		} catch (NumberFormatException e) {
+		}
+		// then it's unknown
+		return false;
+	}
+
+	/**
+	 * Get the default as Object.
+	 * 
+	 * @return
+	 */
+	public Object getDefault() {
+		return defval;
+	}
+
+	/**
+	 * Set the default.
+	 * 
+	 * @param defval
+	 */
+	public void setDefault(Object defval) {
+		this.defval = defval;
+	}
+
+	/**
+	 * Get the value as Object.
+	 * 
+	 * Returns the default if the value is not set.
+	 * 
+	 * @return
+	 */
+	public Object getValue() {
+		return (value != null) ? value : defval;
+	}
+
+	public int getAsInt() {
+		Integer i = (Integer) getValue();
+		return (i != null) ? i.intValue() : 0;
+	}
+
+	public float getAsFloat() {
+		Float f = (Float) getValue();
+		return (f != null) ? f.floatValue() : 0f;
+	}
+
+	public String getAsString() {
+		Object s = getValue();
+		if (s == null) {
+			return "";
+		}
+		if (s.getClass() == File.class) {
+			try {
+				return ((File) s).getCanonicalPath();
+			} catch (IOException e) {
+				return "ERR: " + s.toString();
+			}
+		}
+		return s.toString();
+	}
+
+	public boolean getAsBoolean() {
+		Boolean b = (Boolean) getValue();
+		return (b != null) ? b.booleanValue() : false;
+	}
+
+	public String[] parseAsArray(String separator) {
+		String s = getAsString();
+		String[] sa = s.split(separator);
+		return sa;
+	}
+
+	public float[] parseAsFloatArray(String separator) {
+		String s = getAsString();
+		String[] sa = s.split(separator);
+		float[] fa = null;
+		try {
+			int n = sa.length;
+			fa = new float[n];
+			for (int i = 0; i < n; i++) {
+				float f = Float.parseFloat(sa[i]);
+				fa[i] = f;
+			}
+		} catch (Exception e) {
+		}
+
+		return fa;
+	}
+
+	/**
+	 * Set the value.
+	 * 
+	 * @param value
+	 */
+	public void setValue(Object value) {
+		this.value = value;
+	}
+
+	/**
+	 * Set the value.
+	 * 
+	 * @param value
+	 */
+	public void setValue(int value) {
+		this.value = new Integer(value);
+	}
+
+	/**
+	 * Set the value.
+	 * 
+	 * @param value
+	 */
+	public void setValue(float value) {
+		this.value = new Float(value);
+	}
+
+	/**
+	 * @return
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return
+	 */
+	public int getType() {
+		return type;
+	}
+
+	/**
+	 * @param type
+	 */
+	public void setType(int type) {
+		this.type = type;
+	}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/ParameterMap.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,322 @@
+/* ParameterMap.java -- HashMap of Parameters.
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ * Created on 02.09.2003 by casties
+ *
+ */
+package digilib.util;
+
+import java.util.HashMap;
+
+
+/** HashMap of digilib.servlet.Parameter's.
+ * 
+ * Keys are Strings. Values are Parameters.
+ * 
+ * @author casties
+ *
+ */
+public class ParameterMap {
+
+	protected HashMap<String, Parameter> params;
+	
+	protected OptionsSet options;
+	
+	/** Default constructor.
+	 * 
+	 */
+	public ParameterMap() {
+		params = new HashMap<String, Parameter>();
+		options = new OptionsSet();
+		initParams();
+	}
+
+	/** Constructor with initial size.
+	 * @param size
+	 */
+	public ParameterMap(int size) {
+		params = new HashMap<String, Parameter>(size);
+		options = new OptionsSet();
+		initParams();
+	}
+
+	/** Shallow copy constructor.
+	 * Be warned that the maps are only cloned i.e. keys and values are shared!
+	 * @param pm
+	 */
+	@SuppressWarnings("unchecked")
+	public static ParameterMap cloneInstance(ParameterMap pm) {
+		ParameterMap newPm = new ParameterMap();
+		// clone params to this map
+		newPm.params = (HashMap<String, Parameter>) pm.params.clone();
+		newPm.options = (OptionsSet) pm.options.clone();
+		return newPm;
+	}
+
+	
+	/** Creates new ParameterMap by merging Parameters from another ParameterMap.
+	 * @param pm
+	 * @return
+	 */
+	public static ParameterMap getInstance(ParameterMap pm) {
+		ParameterMap newPm = new ParameterMap();
+		// add all params to this map
+		newPm.params.putAll(pm.params);
+		newPm.initOptions();
+		return newPm;
+	}
+	
+	/** set up parameters
+	 * 
+	 */
+	protected void initParams() {
+		// no default parameters
+	}
+	
+	/** set up options
+	 * 
+	 */
+	protected void initOptions() {
+		// no default options
+	}
+	
+	/** Get the Parameter with the corresponding key.
+	 * 
+	 * Returns null if no element is associated with key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public Parameter get(String key) {
+		return params.get(key);
+	}
+
+	/** Get the Parameter with the corresponding key.
+	 * 
+	 * Returns null if no element is associated with key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public Object getValue(String key) {
+		Parameter p = params.get(key);
+		return (p != null) ? p.getValue() : null;
+	}
+	
+	/** Get the Parameter with the corresponding key.
+	 * 
+	 * Returns null if no element is associated with key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public String getAsString(String key) {
+		Parameter p = params.get(key);
+		return (p != null) ? p.getAsString() : "";
+	}
+
+	/** Get the Parameter with the corresponding key.
+	 * 
+	 * Returns null if no element is associated with key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public int getAsInt(String key) {
+		Parameter p = params.get(key);
+		return (p != null) ? p.getAsInt() : 0;
+	}
+
+	/** Get the Parameter with the corresponding key.
+	 * 
+	 * Returns null if no element is associated with key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public float getAsFloat(String key) {
+		Parameter p = params.get(key);
+		return (p != null) ? p.getAsFloat() : 0f;
+	}
+
+	/** Get the Parameter with the corresponding key.
+	 * 
+	 * Returns null if no element is associated with key.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public boolean getAsBoolean(String key) {
+		Parameter p = params.get(key);
+		return (p != null) ? p.getAsBoolean() : false;
+	}
+
+	/** Returns if the Parameter's value has been set.
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public boolean hasValue(String key) {
+		Parameter p = params.get(key);
+		return (p != null) ? p.hasValue() : false;
+	}
+	
+	/** Add the Parameter to the map with a certain key.
+	 * 
+	 * Returns the value that was previously associated with key. 
+	 * 
+	 * @param key
+	 * @param val
+	 * @return
+	 */
+	public Parameter put(String key, Parameter val) {
+		return params.put(key, val);
+	}
+
+	/** Add the Parameter val to the map, using val's name.
+	 * 
+	 * Returns the value that was previously associated with val's name. 
+	 * 
+	 * @param val
+	 * @return
+	 */
+	public Parameter put(Parameter val) {
+		return params.put(val.getName(), val);
+	}
+	
+	/** Add a new Parameter with name, default and value.
+	 * 
+	 * Returns the key that was previously associated with name. 
+	 * 
+	 * @param name
+	 * @param def
+	 * @param val
+	 * @return
+	 */
+	public Parameter newParameter(String name, Object def, Object val) {
+		Parameter p = new Parameter(name, def, val);
+		return params.put(name, p);
+	}
+
+	/** Add a new Parameter with name, default, value and type.
+	 * 
+	 * Returns the key that was previously associated with name. 
+	 * 
+	 * @param name
+	 * @param def
+	 * @param val
+	 * @param type
+	 * @return
+	 */
+	public Parameter newParameter(String name, Object def, Object val, int type) {
+		Parameter p = new Parameter(name, def, val, type);
+		return params.put(name, p);
+	}
+
+	/** Set the value of an existing parameter.
+	 * 
+	 * Sets the value and returns true if the parameter exists.
+	 * 
+	 * @param key
+	 * @param val
+	 * @return
+	 */
+	public boolean setValue(String key, Object val) {
+		Parameter p = params.get(key);
+		if (p != null) {
+			p.setValue(val);
+			return true;
+		}
+		return false;
+	}
+
+	/** Set the value of an existing parameter.
+	 * 
+	 * Sets the value and returns true if the parameter exists.
+	 * 
+	 * @param key
+	 * @param val
+	 * @return
+	 */
+	public boolean setValue(String key, int val) {
+		Parameter p = params.get(key);
+		if (p != null) {
+			p.setValue(val);
+			return true;
+		}
+		return false;
+	}
+
+	/** Set the value of an existing parameter.
+	 * 
+	 * Sets the value and returns true if the parameter exists.
+	 * 
+	 * @param key
+	 * @param val
+	 * @return
+	 */
+	public boolean setValue(String key, float val) {
+		Parameter p = params.get(key);
+		if (p != null) {
+			p.setValue(val);
+			return true;
+		}
+		return false;
+	}
+
+	/** Set the value of an existing parameter.
+	 * 
+	 * Sets the value and returns true if the parameter exists.
+	 * 
+	 * @param key
+	 * @param val
+	 * @return
+	 */
+	public boolean setValueFromString(String key, String val) {
+		Parameter p = params.get(key);
+		if (p != null) {
+			p.setValueFromString(val);
+			return true;
+		}
+		return false;
+	}
+	
+	/** Returns of the option has been set.
+	 * @param opt
+	 * @return
+	 */
+	public boolean hasOption(String opt) {
+		return options.hasOption(opt);
+	}
+
+	public HashMap<String, Parameter> getParams() {
+		return params;
+	}
+
+	public void setParams(HashMap<String, Parameter> params) {
+		this.params = params;
+	}
+
+	public OptionsSet getOptions() {
+		return options;
+	}
+
+	public void setOptions(OptionsSet options) {
+		this.options = options;
+	}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/servlet/src/main/java/digilib/util/XMLListLoader.java	Tue Apr 26 11:38:11 2011 +0200
@@ -0,0 +1,178 @@
+/* XMLListLoader -- Load an XML list into a Hashtable
+
+  Digital Image Library servlet components
+
+  Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de)
+
+  This program is free software; you can redistribute  it and/or modify it
+  under  the terms of  the GNU General  Public License as published by the
+  Free Software Foundation;  either version 2 of the  License, or (at your
+  option) any later version.
+   
+  Please read license.txt for the full details. A copy of the GPL
+  may be found at http://www.gnu.org/copyleft/lgpl.html
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+package digilib.util;
+
+// JAXP packages
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.log4j.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/** Loads a simple XML list into a HashMap.
+ * 
+ * The XML file has an outer <code>list_tag</code>. Every entry is an 
+ * <code>entry_tag</code> with two attributes: the <code>key_att</code>
+ * key and the <code>value_att</code> value.
+ * 
+ * The file is read by the <code>loadURL</code> method, that returns a
+ * HashMap with the key-value pairs.
+ * 
+ * @author casties
+ */
+public class XMLListLoader {
+
+	private Logger logger = Logger.getLogger(this.getClass());
+	private String listTag = "list";
+	private String entryTag = "entry";
+	private String keyAtt = "key";
+	private String valueAtt = "value";
+
+	public XMLListLoader() {
+	}
+
+	public XMLListLoader(
+		String list_tag,
+		String entry_tag,
+		String key_att,
+		String value_att) {
+		logger.debug("xmlListLoader("+list_tag+","+entry_tag+","+key_att+","+value_att+")");
+		listTag = list_tag;
+		entryTag = entry_tag;
+		keyAtt = key_att;
+		valueAtt = value_att;
+	}
+
+	/**
+	 *  inner class XMLListParser to be called by the parser
+	 */
+	private class XMLListParser extends DefaultHandler {
+
+		private Map<String, String> listData;
+		private LinkedList<String> tagSpace;
+
+		public Map<String, String> getData() {
+			return listData;
+		}
+
+		// Parser calls this once at the beginning of a document
+		public void startDocument() throws SAXException {
+			listData = new HashMap<String, String>();
+			tagSpace = new LinkedList<String>();
+		}
+
+		// Parser calls this for each element in a document
+		public void startElement(
+			String namespaceURI,
+			String localName,
+			String qName,
+			Attributes atts)
+			throws SAXException {
+			//System.out.println("<"+qName);
+			// open a new namespace
+			tagSpace.addLast(qName);
+
+			// ist it an entry tag?
+			if (qName.equals(entryTag)) {
+				// is it inside a list tag?
+				if ((listTag.length() > 0) && (!tagSpace.contains(listTag))) {
+					logger.error("BOO: Entry "
+							+ entryTag
+							+ " not inside list "
+							+ listTag);
+					throw new SAXParseException(
+						"Entry " + entryTag + " not inside list " + listTag,
+						null);
+				}
+				// get the attributes
+				String key = atts.getValue(keyAtt);
+				String val = atts.getValue(valueAtt);
+				if ((key == null) || (val == null)) {
+					logger.error("BOO: Entry "
+							+ entryTag
+							+ " does not have Attributes "
+							+ keyAtt
+							+ ", "
+							+ valueAtt);
+					throw new SAXParseException(
+						"Entry "
+							+ entryTag
+							+ " does not have Attributes "
+							+ keyAtt
+							+ ", "
+							+ valueAtt,
+						null);
+				}
+				// add the values
+				//System.out.println("DATA: "+key+" = "+val);
+				listData.put(key, val);
+			}
+		}
+
+		public void endElement(
+			String namespaceURI,
+			String localName,
+			String qName)
+			throws SAXException {
+			// exit the namespace
+			tagSpace.removeLast();
+		}
+
+	}
+
+	/**
+	 *  load and parse a file (as URL)
+	 *    returns HashMap with list data
+	 */
+	public Map<String, String> loadURL(String path) throws SAXException, IOException {
+		//System.out.println("loadurl ("+path+")");
+		// Create a JAXP SAXParserFactory and configure it
+		SAXParserFactory spf = SAXParserFactory.newInstance();
+		spf.setNamespaceAware(true);
+
+		SAXParser parser = null;
+		try {
+			// Create a JAXP SAXParser
+			parser = spf.newSAXParser();
+
+		} catch (ParserConfigurationException e) {
+			throw new SAXException(e);
+		}
+
+		// create a list parser (keeps the data!)
+		XMLListParser listParser = new XMLListParser();
+
+		// Tell the SAXParser to parse the XML document
+		parser.parse(path, listParser);
+
+		return listParser.getData();
+	}
+
+}