Mercurial > hg > digilib-old

changeset 963:548988d9fad5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge (sorry, with digilib-config.xml)
author hertzhaft
date Wed, 25 Jan 2012 16:16:59 +0100
parents e9e50df87c9a (diff) 6d5f0c39a37f (current diff)
children 0b5fa035af30
files common/src/main/java/digilib/image/JAIDocuImage.java common/src/main/java/digilib/image/JAIImageLoaderDocuImage.java webapp/src/main/webapp/WEB-INF/digilib-config.xml
diffstat 3 files changed, 25 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/WEB-INF/digilib-config.xml	Wed Jan 25 15:23:06 2012 +0100
+++ b/webapp/src/main/webapp/WEB-INF/digilib-config.xml	Wed Jan 25 16:16:59 2012 +0100
@@ -14,7 +14,7 @@
   <!-- 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" />
+  <parameter name="basedir-list" value="Y:\scans\quellen;Y:\scaled\small;Y:\scaled\mini;Y:\thumbs" />
 
   <!-- Java class to use for image operations -->
   <parameter name="docuimage-class" value="digilib.image.ImageLoaderDocuImage" />
--- a/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js	Wed Jan 25 15:23:06 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js	Wed Jan 25 16:16:59 2012 +0100
@@ -187,7 +187,7 @@
                     }
             },
             // number of visible button groups
-            'visibleButtonSets' : 1,
+            'visibleButtonSets' : 1
     };
 
     var actions = {
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Wed Jan 25 15:23:06 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Wed Jan 25 16:16:59 2012 +0100
@@ -243,6 +243,8 @@
                 setupScalerDiv(data);
                 // about window creation - TODO: could be deferred? restrict to only one item?
                 setupAboutDiv(data);
+                // scale mode menu creation - TODO: could be deferred?
+                setupScaleModeDiv(data);
                 // arrow overlays for moving zoomed detail
                 setupZoomArrows(data);
                 // send setup event
@@ -553,7 +555,6 @@
                 redisplay(data);
             }
         }
-
     // end of actions
     };
 
@@ -1155,6 +1156,27 @@
             });
     };
 
+    /** creates HTML structure for the scale mode menu
+     * 
+     */
+    var setupScaleModeDiv = function (data) {
+        var $elem = data.$elem;
+        var settings = data.settings;
+        var $scaleModeDiv = $('<div class="scalemode" style="display:none"/>');
+        var $scaleModeSelect = $('<select class="scalemode" />');
+        var $scaleModeOptScreen = $('<option name="fit">fit to screen</option>');
+        var $scaleModeOptPixel = $('<option name="pixel">pixel by pixel</option>');
+        var $scaleModeOptOrig = $('<option name="original">original size</option>');
+        $elem.append($scaleModeDiv);
+        $scaleModeDiv.append($scaleModeSelect);
+        $scaleModeSelect.append($scaleModeOptScreen);
+        $scaleModeSelect.append($scaleModeOptPixel);
+        $scaleModeSelect.append($scaleModeOptOrig);
+        $scaleModeSelect.on('change.digilib', function () {
+            actions['setScaleMode'](data, false);
+            });
+    };
+
     /** shows some window e.g. 'about' (toggle visibility if show is null)
      * 
      */