Merge branch 'release2.1' into annotation-work

# Conflicts: # css/mirador.css
sirmaenterprise · Aug 3, 2016 · 5f020fc · 5f020fc
2 parents 0e39245 + c03cc14
commit 5f020fc
Show file tree

Hide file tree

Showing 13 changed files with 123 additions and 80 deletions.
diff --git a/css/mirador.css b/css/mirador.css
@@ -1,8 +1,3 @@
-body {
-  padding: 0;
-  margin: 0;
-  overflow: hidden;
-}
 a {
   color: inherit; /* blue colors for links too */
   text-decoration: inherit; /* no underline */
@@ -2016,4 +2011,3 @@ canvas {
   outline: none;
   -webkit-tap-highlight-color: rgba(255, 255, 255, 0); /* mobile webkit */
 }
-
diff --git a/examples/embedded-multiple-instances/config-1.js b/examples/embedded-multiple-instances/config-1.js
@@ -1,16 +1,13 @@
 (function ($) {
-  
+
   $.config_1 = {
     "id" : "mirador_viewer_1",
     "saveSession" : false,
     "layout" : "1x1",
     "data" : [
       { "manifestUri": "http://dms-data.stanford.edu/data/manifests/Walters/qm670kv1873/manifest.json", "location": "Stanford University" }
     ],
-    "buildPath" : "/",
-    "i18nPath" : "mirador/locales/",
-    "imagesPath" : "mirador/images/",
-    "logosPath" : "mirador/images/logos/",
+    "buildPath" : "/build/mirador/",
     "mainMenuSettings" : {
       "show" : true,
       "buttons" : {
@@ -25,12 +22,10 @@
         "attributes" : { "id" : "logo", "href" : "http://iiif.io", "target" : "_blank" }
       }
     },
-    "windowObjects" : [],
-    "annotationLayer" : true,
-    "annotationEndpoint" : { 
-      "name": "Local Storage", 
+    "annotationEndpoint" : {
+      "name": "Local Storage",
       "module": "LocalStorageEndpoint"
     }
   };
-  
+
 })(MiradorExample);
diff --git a/examples/embedded-multiple-instances/config-2.js b/examples/embedded-multiple-instances/config-2.js
@@ -1,16 +1,13 @@
 (function ($) {
-  
+
   $.config_2 = {
     "id" : "mirador_viewer_2",
     "saveSession" : false,
     "layout" : "1x1",
     "data" : [
       { "manifestUri": "http://iiif.biblissima.fr/manifests/ark:/12148/btv1b10500687r/manifest.json", "location": 'BnF' }
     ],
-    "buildPath" : "/",
-    "i18nPath" : "mirador/locales/",
-    "imagesPath" : "mirador/images/",
-    "logosPath" : "mirador/images/logos/",
+    "buildPath" : "/build/mirador/",
     "mainMenuSettings" : {
       "show" : true,
       "buttons" : {
@@ -25,21 +22,10 @@
         "attributes" : { "id" : "logo", "href" : "http://iiif.io", "target" : "_blank" }
       }
     },
-    "windowObjects" : [
-      {
-        "loadedManifest" : null,
-        "viewType" : "ImageView",
-        "displayLayout" : true,
-        "bottomPanel" : true,
-        "sidePanel" : true,
-        "annotationLayer" : true
-      }
-    ],
-    "annotationLayer" : true,
     "annotationEndpoint" : {
-      "name": "Local Storage", 
+      "name": "Local Storage",
       "module": "LocalStorageEndpoint"
     }
   };
-  
+
 })(MiradorExample);
diff --git a/examples/embedded-multiple-instances/embedded.css b/examples/embedded-multiple-instances/embedded.css
@@ -8,13 +8,12 @@
 }
 
 .mirador_viewer {
-  display: block !important;
-  position: absolute !important;
+  position: absolute;
   width: 100%;
   top: 0;
   bottom: 0;
 }
 
 h1 {
   margin-left: 10px;
-}
+}
diff --git a/examples/embedded-multiple-instances/embedded.js b/examples/embedded-multiple-instances/embedded.js
@@ -1,10 +1,10 @@
 window.MiradorExample = {};
 
 (function ($) {
-  
+
   jQuery(document).ready(function () {
     Mirador($.config_1);
     Mirador($.config_2);
   });
-  
+
 })(MiradorExample);
diff --git a/examples/embedded-multiple-instances/index.html b/examples/embedded-multiple-instances/index.html
@@ -12,10 +12,39 @@
 </head>
 <body>
   <h1>Mirador Embedded</h1>
-  
+
   <div class="mirador_container">
     <div id="mirador_viewer_1" class="mirador_viewer"></div>
   </div>
+
+  <h1>HTML Ipsum Presents</h1>
+
+  <p><strong>Pellentesque habitant morbi tristique</strong> senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. <a href="#">Donec non enim</a> in turpis pulvinar facilisis. Ut felis.</p>
+
+  <h2>Header Level 2</h2>
+
+  <ol>
+     <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li>
+     <li>Aliquam tincidunt mauris eu risus.</li>
+  </ol>
+
+  <blockquote><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est.</p></blockquote>
+
+  <h3>Header Level 3</h3>
+
+  <ul>
+     <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li>
+     <li>Aliquam tincidunt mauris eu risus.</li>
+  </ul>
+
+  <pre><code>
+  #header h1 a {
+  	display: block;
+  	width: 300px;
+  	height: 80px;
+  }
+  </code></pre>
+
   <div class="mirador_container">
     <div id="mirador_viewer_2" class="mirador_viewer"></div>
   </div>

diff --git a/index.html b/index.html
@@ -6,7 +6,11 @@
     <link rel="stylesheet" type="text/css" href="build/mirador/css/mirador-combined.css">
     <title>Mirador Viewer</title>
     <style type="text/css">
-     #viewer {  width: 100%; height: 100%; }
+     #viewer {
+       width: 100%;
+       height: 100%;
+       position: fixed;
+     }
     </style>
   </head>
   <body>
@@ -49,6 +53,9 @@
            { "manifestUri": "http://iiif.biblissima.fr/manifests/ark:/12148/btv1b10500687r/manifest.json", "location": 'BnF'},
            { "manifestUri": "http://www.e-codices.unifr.ch/metadata/iiif/sl-0002/manifest.json", "location": 'e-codices'},
            { "manifestUri": "http://www.e-codices.unifr.ch/metadata/iiif/bge-cl0015/manifest.json", "location": 'e-codices'},
+           { "manifestUri": "https://data.ucd.ie/api/img/manifests/ucdlib:33064", "location": "University College Dublin"},
+           { "manifestUri": "https://data.ucd.ie/api/img/manifests/ucdlib:40851", "location": "University College Dublin"},
+           { "manifestUri": "https://data.ucd.ie/api/img/manifests/ucdlib:30708", "location": "University College Dublin"},
            { "manifestUri": "http://dzkimgs.l.u-tokyo.ac.jp/iiif/zuzoubu/12b02/manifest.json", "location": "University of Tokyo"},
            { "manifestUri": "http://www2.dhii.jp/nijl/NIJL0018/099-0014/manifest_tags.json", "location": "NIJL"}
          ],

diff --git a/js/src/settings.js b/js/src/settings.js
@@ -66,8 +66,15 @@
           "annotationRefresh" : false, //whether or not to display the refresh icon for annotations
         },
         "imageManipulation" : {
-          "manipulationLayer" : true
-          //TODO: settings for individual image manipulation controls
+          "manipulationLayer" : true,
+          "controls" : {
+            "rotate" : true,
+            "brightness" : true,
+            "contrast" : true,
+            "saturate" : true,
+            "grayscale" : true,
+            "invert" : true
+          }
         }
       },
       "fullScreen" : true, //whether or not to make the window's fullScreen button visible to user
@@ -140,7 +147,7 @@
     'mainMenuSettings': {
       'show': true,
       'buttons' : {
-        'bookmark' : true,
+        'bookmark' : false,
         'layout' : true,
         'options' : false,
         'fullScreenViewer': true
@@ -183,7 +190,7 @@
      *  }
      **/
     'annotationEndpoint': {},
-    
+
     'annotationBodyEditor': {
       'module': 'TinyMCEAnnotationBodyEditor',
       'options': {}

diff --git a/js/src/viewer.js b/js/src/viewer.js
@@ -59,7 +59,7 @@
       //add background and positioning information on the root element that is provided in config
       var backgroundImage = _this.state.getStateProperty('buildPath') + _this.state.getStateProperty('imagesPath') + 'debut_dark.png';
       this.element.css('background-color', '#333').css('background-image','url('+backgroundImage+')').css('background-position','left top')
-      .css('background-repeat','repeat').css('position','fixed');
+      .css('background-repeat','repeat');
 
       //register Handlebars helper
       Handlebars.registerHelper('t', function(i18n_key) {
@@ -295,7 +295,7 @@
       var windowConfig = jQuery.extend(true, {}, options);
       //delete this old set of options (because they will be replaced by the actions from ADD_WINDOW)
       _this.eventEmitter.publish('DELETE_FROM_CONFIG', options);
-      
+
       _this.eventEmitter.publish('ADD_WINDOW', windowConfig);
     }
   };

diff --git a/js/src/widgets/contextControls.js b/js/src/widgets/contextControls.js
@@ -44,6 +44,12 @@
 
       if (this.canvasControls.imageManipulation.manipulationLayer) {
         this.manipulationElement = jQuery(this.manipulationTemplate({
+          showRotate: this.canvasControls.imageManipulation.controls.rotate,
+          showBrightness: this.canvasControls.imageManipulation.controls.brightness,
+          showContrast: this.canvasControls.imageManipulation.controls.contrast,
+          showSaturate: this.canvasControls.imageManipulation.controls.saturate,
+          showGrayscale: this.canvasControls.imageManipulation.controls.grayscale,
+          showInvert: this.canvasControls.imageManipulation.controls.invert
         })).appendTo(this.container.find('.mirador-manipulation-controls'));
         this.setQtips(this.manipulationElement);
         this.manipulationElement.hide();
@@ -236,33 +242,45 @@
     ].join('')),
 
     manipulationTemplate: Handlebars.compile([
+                                   '{{#if showRotate}}',
                                    '<a class="hud-control mirador-osd-rotate-right" title="{{t "rotateRightTooltip"}}">',
                                    '<i class="fa fa-lg fa-rotate-right"></i>',
                                    '</a>',
                                    '<a class="hud-control mirador-osd-rotate-left" title="{{t "rotateLeftTooltip"}}">',
                                    '<i class="fa fa-lg fa-rotate-left"></i>',
                                    '</a>',
+                                   '{{/if}}',
+                                   '{{#if showBrightness}}',
                                    '<a class="hud-control mirador-osd-brightness" title="{{t "brightnessTooltip"}}">',
                                    '<i class="material-icons">wb_sunny</i>',
                                    '<i class="fa fa-caret-down"></i>',
                                    '<div class="mirador-osd-brightness-slider mirador-slider"/>',
                                    '</a>',
+                                   '{{/if}}',
+                                   '{{#if showContrast}}',
                                    '<a class="hud-control mirador-osd-contrast" title="{{t "contrastTooltip"}}">',
                                    '<i class="material-icons">brightness_6</i>',
                                    '<i class="fa fa-caret-down"></i>',
                                    '<div class="mirador-osd-contrast-slider mirador-slider"/>',
                                    '</a>',
+                                   '{{/if}}',
+                                   '{{#if showSaturate}}',
                                    '<a class="hud-control mirador-osd-saturation" title="{{t "saturationTooltip"}}">',
                                    '<i class="material-icons">gradient</i>',
                                    '<i class="fa fa-caret-down"></i>',
                                    '<div class="mirador-osd-saturation-slider mirador-slider"/>',
                                    '</a>',
+                                   '{{/if}}',
+                                   '{{#if showGrayscale}}',
                                    '<a class="hud-control mirador-osd-grayscale" title="{{t "grayscaleTooltip"}}">',
                                    '<i class="material-icons">filter_b_and_w</i>',
                                    '</a>',
+                                   '{{/if}}',
+                                   '{{#if showInvert}}',
                                    '<a class="hud-control mirador-osd-invert" title="{{t "invertTooltip"}}">',
                                    '<i class="material-icons">invert_colors</i>',
                                    '</a>',
+                                   '{{/if}}',
                                    '<a class="hud-control mirador-osd-reset" title="{{t "resetTooltip"}}">',
                                    '<i class="fa fa-lg fa-refresh"></i>',
                                    '</a>'