Fixed: updated build

DDMAL · Sep 19, 2014 · 4b0d9b1 · 4b0d9b1
1 parent c174eb2
commit 4b0d9b1
Show file tree

Hide file tree

Showing 14 changed files with 808 additions and 605 deletions.
diff --git a/build/css/diva.css b/build/css/diva.css
@@ -38,8 +38,10 @@
   background-position: center;
   border: 1px solid #99bbe8;
 }
-.button:hover {
-  background-color: #fdfdfd;
+@media screen and (min-device-width: 769px) {
+  .button:hover {
+    background-color: #fdfdfd;
+  }
 }
 .diva-title {
   text-align: center;
@@ -56,11 +58,13 @@
   display: none;
   padding: 8px;
   float: left;
+  clear: left;
 }
 .diva-tools .diva-tools-left .diva-zoom-buttons-label {
   display: none;
   padding: 8px;
   float: left;
+  clear: left;
 }
 .diva-tools .diva-tools-left .diva-zoom-out-button {
   display: none;
@@ -88,6 +92,7 @@
   display: none;
   padding: 8px;
   float: left;
+  clear: left;
 }
 .diva-tools .diva-tools-left.in-fullscreen {
   float: left;
@@ -174,6 +179,7 @@
 .diva-outer .diva-inner {
   position: relative;
   overflow: hidden;
+  margin: 0 auto;
 }
 .diva-outer .diva-inner .diva-page {
   -webkit-box-shadow: 2px 2px 6px 0 rgba(0, 0, 0, 0.5);
@@ -277,11 +283,23 @@
   position: relative;
   top: 0.6em;
   display: none;
+  float: left;
+}
+@media (max-width: 480px) {
+  .zoom-slider {
+    width: 100px;
+  }
 }
 .grid-slider {
   position: relative;
   top: 0.6em;
   display: none;
+  float: left;
+}
+@media (max-width: 480px) {
+  .grid-slider {
+    width: 100px;
+  }
 }
 .diva-throbber {
   display: none;

diff --git a/build/css/diva.min.css b/build/css/diva.min.css
diff --git a/build/demo/highlight.html b/build/demo/highlight.html
@@ -9,18 +9,17 @@
             <![endif]-->
             <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js" type="text/javascript"></script>
             <script src="/js/diva.min.js" type="text/javascript"></script>
-            <script src="/js/utils.js" type="text/javascript"></script>
-            <script src="/js/plugins/highlight.js" type="text/javascript"></script>
 
             <script type="text/javascript">
                 $(document).ready(function() {
                     $('#diva-wrapper').diva({
-                        contained: true,
                         enableAutoHeight: true,
-                        fixedHeightGrid: false,
-                        iipServerURL: "http://coltrane.music.mcgill.ca/fcgi-bin/iipsrv.fcgi",
+                        fixedHeightGrid: true,
+                        iipServerURL: "http://diva.simssa.ca/fcgi-bin/iipsrv.fcgi",
                         objectData: "/demo/beromunster.json",
-                        imageDir: "/mnt/images/beromunster",
+                        imageDir: "/srv/images/beromunster",
+                        enableCanvas: true,
+                        enableDownload: true,
                         enableHighlight: true
                     });
 
@@ -39,7 +38,6 @@
                         */
                         while (j--)
                         {
-                            console.log("Page " + j);
                             var maxZoomLevel = dv.getMaxZoomLevelForPage(j);
                             var pageDims = dv.getPageDimensionsAtZoomLevel(j, maxZoomLevel);
 

diff --git a/build/demo/horizontal_scrolling.html b/build/demo/horizontal_scrolling.html
@@ -15,10 +15,11 @@
                     $('#diva-wrapper').diva({
                         enableAutoHeight: true,
                         fixedHeightGrid: false,
-                        iipServerURL: "http://coltrane.music.mcgill.ca/fcgi-bin/iipsrv.fcgi",
+                        iipServerURL: "http://diva.simssa.ca/fcgi-bin/iipsrv.fcgi",
                         objectData: "/demo/beromunster.json",
-                        imageDir: "/mnt/images/beromunster",
-                        enableHighlight: true,
+                        imageDir: "/srv/images/beromunster",
+                        enableCanvas: true,
+                        enableDownload: true,
                         verticallyOriented: false
                     });
                 });

diff --git a/build/demo/image_manipulation.html b/build/demo/image_manipulation.html
diff --git a/build/demo/single.html b/build/demo/single.html
@@ -8,17 +8,29 @@
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <![endif]-->
             <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js" type="text/javascript"></script>
-            <script src="/js/diva.min.js" type="text/javascript"></script>
-
+            <script src="/js/diva.js" type="text/javascript"></script>
+            <script src="/js/utils.js" type="text/javascript"></script>
+            <style>
+            body, html{
+                height:90%;
+            }
+            #diva-wrapper{
+                height:100%;
+            }
+            .diva-outer{
+                height:100%;
+            }
+            </style>
             <script type="text/javascript">
                 $(document).ready(function() {
                     $('#diva-wrapper').diva({
                         enableAutoHeight: true,
                         fixedHeightGrid: false,
-                        iipServerURL: "http://coltrane.music.mcgill.ca/fcgi-bin/iipsrv.fcgi",
+                        iipServerURL: "http://diva.simssa.ca/fcgi-bin/iipsrv.fcgi",
                         objectData: "/demo/beromunster.json",
-                        imageDir: "/mnt/images/beromunster",
-                        enableHighlight: true
+                        imageDir: "/srv/images/beromunster",
+                        enableCanvas: true,
+                        enableDownload: true
                     });
                 });
             </script>

diff --git a/build/index.html b/build/index.html
@@ -13,9 +13,6 @@
                 <li><a href="/demo/single.html">A basic Diva instance. </a></li>
                 <li><a href="/demo/horizontal_scrolling.html">A demonstration of horizontal scrolling.</a></li>
                 <li><a href="/demo/highlight.html">A demonstration of the highlight plugin.</a></li>
-                <li><a href="/demo/image_manipulation.html">A demonstration of the image manipulation tools. </a><sup><a href="#one">[1]</a></sup></li>
             </ul>
-            <hr />
-            <p id="one">[1] You will need to <a href="https://www.google.ca/search?q=disable+same+origin+policy">disable your browser's Same-origin policy</a> for this demo to work.</p>
         </body>
     </html>