Mercurial > hg > digilib-old

--- a/.hgignore	Wed May 30 14:37:05 2012 +0200
+++ b/.hgignore	Wed May 30 15:26:49 2012 +0200
@@ -89,4 +89,6 @@
 syntax: regexp
 ^common-bioformats/target$
 syntax: regexp
-^common-bioformats/\.settings$
\ No newline at end of file
+^common-bioformats/\.settings$
+syntax: regexp
+^webapp/src/main/webapp/jquery/img/fullscreen/svg_gen$
\ No newline at end of file
Binary file webapp/src/main/webapp/jquery/img/embedded/Thumbs.db has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/addregion.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/back.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/bg.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/birds-eye.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/brightness.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/buttons-less.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/buttons-more.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/calibration.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/cat.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/contrast.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/corona.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/delallregions.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/delmark.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/delregion.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/down.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/first.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/fwd.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/help.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/info.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/last.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/left.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/mark.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/mirror-horizontal.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/mirror-vertical.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/options.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/original-size.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/page.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/pagewidth.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/quality.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/reference.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/regioninfo.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/regions.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/reset.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/rgb.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/right.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/rotate.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/size-bigger.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/size-smaller.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/up.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/whitedisc.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/zoom-area.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/zoom-full.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/zoom-in.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/zoom-out.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/addregion.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/back.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/bg.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/birds-eye.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/blue.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/brightness-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/brightness.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/calibration-x.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/calibration-y.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/calibration.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/cat.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/contrast-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/contrast.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/delallregions.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/delmark.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/delregion.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/down.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/first.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/fwd.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/help.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/info.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/last.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/left.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mark-bg-16.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mark-bg.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mark.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mirror-horizontal.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/mirror-vertical.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/blue.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/brightness-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/calibration-x.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/calibration-y.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/contrast-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/mark-bg-16.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/mark-bg.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/pixel-by-pixel.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/rgb-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/rotate-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/old/size.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/options.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/original-size.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/page.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/pagewidth.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/pixel-by-pixel.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/quality.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/reference.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/regioninfo.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/regions.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/reset.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/rgb-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/rgb.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/right.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/rotate-on.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/rotate.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/size-bigger.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/size-smaller.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/size.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/up.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-area.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-full.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-in.png has changed
Binary file webapp/src/main/webapp/jquery/img/fullscreen/zoom-out.png has changed
--- a/webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.sh	Wed May 30 14:37:05 2012 +0200
+++ b/webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.sh	Wed May 30 15:26:49 2012 +0200
@@ -9,22 +9,22 @@
 PNGDIR="32"

 # run XSLT to create separate SVG files (in fullscreen/svg)
-#SAXON="java -jar /Volumes/Schlachteplatte/stuff/java/lib/saxonb9-1-0-7j/saxon9.jar"
-SAXON="java -jar /Users/casties/tmp/java/SaxonHE9-4-0-3J/saxon9he.jar"
+SAXON="java -jar /Volumes/Schlachteplatte/stuff/java/lib/saxonb9-1-0-7j/saxon9.jar"
+#SAXON="java -jar /Users/casties/tmp/java/SaxonHE9-4-0-3J/saxon9he.jar"
 echo "running Saxon to create separate SVGs"
 mkdir -p $SVGDIR
 $SAXON $SVGFILE $XSLTFILE

 # create PNGs from separate SVGs using inkscape
-#INKSCAPE=" /Volumes/Schlachteplatte/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
-INKSCAPE=" /Applications/Inkscape.app/Contents/Resources/bin/inkscape"
+INKSCAPE=" /Volumes/Schlachteplatte/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
+#INKSCAPE=" /Applications/Inkscape.app/Contents/Resources/bin/inkscape"
 echo "running Inkscape to create PNGs"
 cd $SVGDIR
 mkdir -p $PNGDIR
 ls *.svg | while read fx
 do
     f=`basename "$fx" svg`
-    $INKSCAPE --file="$fx" --export-area-drawing --export-height=32 --export-png="$PNGDIR/${f}png"
-    #$INKSCAPE --file="$fx" --export-height=32 --export-png="$PNGDIR/${f}png"
+    #$INKSCAPE --file="$fx" --export-area-drawing --export-height=32 --export-png="$PNGDIR/${f}png"
+    $INKSCAPE --file="$fx" --export-height=32 --export-png="$PNGDIR/${f}png"
 done
 echo "done."
--- a/webapp/src/main/webapp/jquery/jquery-test-svg.html	Wed May 30 14:37:05 2012 +0200
+++ b/webapp/src/main/webapp/jquery/jquery-test-svg.html	Wed May 30 15:26:49 2012 +0200
@@ -44,7 +44,7 @@
             <img src="http://digilib.berlios.de/images/digilib-logo-big.png" />
         </div>

-        <a href="javascript: DIGILIB('about')">about</a>
+        <a href="javascript: DIGILIB('test')">test</a>

         <div id="dl_svgdiv">
             <svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 1 1">
--- a/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js	Wed May 30 14:37:05 2012 +0200
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js	Wed May 30 15:26:49 2012 +0200
@@ -127,12 +127,12 @@
         moreoptions : {
             onclick : ["moreButtons", "+1"],
             tooltip : "more options",
-            icon : "options.png"
+            icon : "buttons-more.png"
             },
         lessoptions : {
             onclick : ["moreButtons", "-1"],
             tooltip : "less options",
-            icon : "options.png"
+            icon : "buttons-less.png"
             },
         SEP : {
             icon : "sep.png"
@@ -165,9 +165,9 @@
         'buttonSettings' : {
             'fullscreen' : {
                 // path to button images (must end with a slash)
-                'imagePath' : 'img/fullscreen/',
+                'imagePath' : 'img/fullscreen/32/',
                 'buttonSetWidth' : 36,
-                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","about","reset","toggleoptions"],
+                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","about","reset","moreoptions"],
                 'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","size","calibrationx","scale","lessoptions"],
                 'pageSet' : ["back","fwd","page"],
                 'buttonSets' : ['standardSet', 'specialSet']
@@ -175,7 +175,7 @@
             'embedded' : {
                 'imagePath' : 'img/embedded/16/',
                 'buttonSetWidth' : 18,
-                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","about","reset","toggleoptions"],
+                'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","about","reset","moreoptions"],
                 'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","scale","lessoptions"],
                 'pageSet' : ["back","fwd","page"],
                 'buttonSets' : ['standardSet', 'specialSet']