Mercurial > hg > ismi-richfaces

changeset 206:111fc1d17019

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update publicWitness and publicCodex for new Diva viewer.
author casties
date Mon, 05 Aug 2019 19:45:39 +0200
parents f719d73383db
children 91f177641ec7
files src/main/webapp/public/publicCodex.jsp src/main/webapp/public/publicWitness.jsp
diffstat 2 files changed, 31 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/webapp/public/publicCodex.jsp	Mon Jul 08 17:55:14 2019 +0200
+++ b/src/main/webapp/public/publicCodex.jsp	Mon Aug 05 19:45:39 2019 +0200
@@ -16,7 +16,8 @@
 		
 		
 		<script type="text/javascript" src="../imageServer/resources/js/jquery.min.js"></script>
-		<script type="text/javascript" src="../imageServer/resources/js/diva.min.js"></script>
+		<script type="text/javascript" src="../imageServer/resources/js/diva.js"></script>
+        <script type="text/javascript" src="../imageServer/resources/js/plugins/simple-auth.js"></script>
 		<script type="text/javascript" src="../imageServer/resources/js/bootstrap.min.js"></script>
 		<script type="text/javascript" src="../imageServer/resources/js/typeahead.js"></script>
 		<script type="text/javascript" src="../imageServer/resources/js/ismiUtils.js"></script>
@@ -54,11 +55,11 @@
 	    }
 	    
 	    $('#table-titles-in-codex').on('click', '.show-title-details', function(ev){
-	    	var dv = $('#diva-wrapper').data('diva');
+	    	var dv = window.divaInstance;
 	        var start_page = $(this).data('start');
 	        
 	        if(start_page){
-	        	dv.gotoPageByNumber(start_page);
+	        	dv.gotoPageByIndex(start_page);
 		        ev.preventDefault();	
 	        }else{
 	        	alert("No page assigned to this title.");	
@@ -129,9 +130,9 @@
 	    {
 	        if (ev.which == '13')
 	        {
-	            var dv = $('#diva-wrapper').data('diva');
+	            var dv = window.divaInstance;
 	            var value = $(this).val();
-	            var success = dv.gotoPageByNumber(value);
+	            var success = dv.gotoPageByIndex(value);
 
 	            if (!success)
 	            {
@@ -154,7 +155,7 @@
 	    });
 
 	    $('.go-to-witness-link').on('click', function(ev) {
-	        var dv = $('#diva-wrapper').data('diva');
+	        var dv = window.divaInstance;
 	        var start_page = $(this).data('start');
 	        
 	        if(start_page){
@@ -199,25 +200,15 @@
 	        }
 	    }			
 		
-		$("#diva-wrapper").diva(
+        window.divaInstance = new Diva('diva-wrapper', 
 		{
-			enableAutoHeight: true,
-	        enableAutoTitle: false,
-	        enableGotoPage: false,
-	        fixedHeightGrid: false,
-	        contained: true,
-	        iipServerURL: divaGlobal.iipServerURL,
-	        digiId: "<%=codexPage.getDigiId()%>",
-	        objectData: divaGlobal.rest_url + "/rest/diva/proxy/json/<%=codexPage.getDigiLabel()%>",
-	        imageDir: "/data7/srv/images/<%=codexPage.getDigiLabel()%>",
-			onSetCurrentPage : handlePageSwitch,
-			onDocumentLoaded : handleDocumentLoaded,
-			goDirectlyTo: <%=codexPage.getStartPage()%>,
-			inFullscreen: <%=codexPage.getImageFullscreen()%>,
-			zoomLevel: 1,
-            canvasPlugin: {
-                proxyURL: divaGlobal.rest_url + "/rest/diva/proxy/image"
-            }			
+            objectData: "https://ismi-imageserver-cc.mpiwg-berlin.mpg.de/iiif/manifests/<%=codexPage.getDigiLabel()%>.json",
+            plugins: [Diva.SimpleAuthPlugin],
+            simpleAuthTokenUrl: divaGlobal.auth_token_url,
+            simpleAuthLoginUrl: divaGlobal.auth_login_url,
+            enableAutoTitle: false,
+            enableGotoPage: false,
+            zoomLevel: 1
 		});
 		
 	});
@@ -237,16 +228,6 @@
 	<div class="magnifiedAttributePanel">
 	</div>
 	 -->
-	<c:set var="digiLabel" value="${codexPage.getDigiLabel()}"/>
-	<c:if test="${!(digiLabel eq 'Landberg_221')
-				and !(digiLabel eq 'Landberg_493')
-				and !(digiLabel eq 'Ms_or_fol_256')
-				and !(digiLabel eq 'Ms_or_oct_275')
-				and !(digiLabel eq 'Ms_or_quart_559')}">
-		<form method="GET" action='https://images.rasi.mcgill.ca/pdfs/${digiLabel}.pdf'>
-			<button type="submit" style="font-size: 12; float: right; width: 100px; margin-right: 33px; margin-top: -10px;">Download PDF</button>
-		</form>
-	</c:if>
 
 	<div class="custom-container">
 
--- a/src/main/webapp/public/publicWitness.jsp	Mon Jul 08 17:55:14 2019 +0200
+++ b/src/main/webapp/public/publicWitness.jsp	Mon Aug 05 19:45:39 2019 +0200
@@ -16,7 +16,8 @@
 		
 		
 		<script type="text/javascript" src="../imageServer/resources/js/jquery.min.js"></script>
-		<script type="text/javascript" src="../imageServer/resources/js/diva.min.js"></script>
+		<script type="text/javascript" src="../imageServer/resources/js/diva.js"></script>
+        <script type="text/javascript" src="../imageServer/resources/js/plugins/simple-auth.js"></script>
 		<script type="text/javascript" src="../imageServer/resources/js/bootstrap.min.js"></script>
 		<script type="text/javascript" src="../imageServer/resources/js/typeahead.js"></script>
 		<script type="text/javascript" src="../imageServer/resources/js/ismiUtils.js"></script>
@@ -54,11 +55,11 @@
 	    }
 	    
 	    $('#table-titles-in-codex').on('click', '.show-title-details', function(ev){
-	    	var dv = $('#diva-wrapper').data('diva');
+	    	var dv = window.divaInstance;
 	        var start_page = $(this).data('start');
 	        
 	        if(start_page){
-	        	dv.gotoPageByNumber(start_page);
+	        	dv.gotoPageByIndex(start_page);
 		        ev.preventDefault();	
 	        }else{
 	        	alert("No page assigned to this title.");	
@@ -129,9 +130,9 @@
 	    {
 	        if (ev.which == '13')
 	        {
-	            var dv = $('#diva-wrapper').data('diva');
+	            var dv = window.divaInstance;
 	            var value = $(this).val();
-	            var success = dv.gotoPageByNumber(value);
+	            var success = dv.gotoPageByIndex(value);
 
 	            if (!success)
 	            {
@@ -154,7 +155,7 @@
 	    });
 
 	    $('.go-to-witness-link').on('click', function(ev) {
-	        var dv = $('#diva-wrapper').data('diva');
+	        var dv = window.divaInstance;
 	        var start_page = $(this).data('start');
 	        
 	        if(start_page){
@@ -199,25 +200,15 @@
 	        }
 	    }			
 		
-		$("#diva-wrapper").diva(
+        window.divaInstance = new Diva('diva-wrapper', 
 		{
-			enableAutoHeight: true,
-	        enableAutoTitle: false,
-	        enableGotoPage: false,
-	        fixedHeightGrid: false,
-	        contained: true,
-	        iipServerURL: divaGlobal.iipServerURL,
-	        digiId: "<%=witnessPage0.getDigiId()%>",
-	        objectData: divaGlobal.rest_url + "/rest/diva/proxy/json/<%=witnessPage0.getDigiLabel()%>",
-	        imageDir: "/data7/srv/images/<%=witnessPage0.getDigiLabel()%>",
-			onSetCurrentPage : handlePageSwitch,
-			onDocumentLoaded : handleDocumentLoaded,
-			goDirectlyTo: <%=witnessPage0.getStartPage()%>,
-			inFullscreen: <%=witnessPage0.getImageFullscreen()%>,
-			zoomLevel: 1,
-            canvasPlugin: {
-                proxyURL: divaGlobal.rest_url + "/rest/diva/proxy/image"
-            }			
+            objectData: "https://ismi-imageserver-cc.mpiwg-berlin.mpg.de/iiif/manifests/<%=witnessPage0.getDigiLabel()%>.json",
+            plugins: [Diva.SimpleAuthPlugin],
+            simpleAuthTokenUrl: divaGlobal.auth_token_url,
+            simpleAuthLoginUrl: divaGlobal.auth_login_url,
+            enableAutoTitle: false,
+            enableGotoPage: false,
+            zoomLevel: 1
 		});
 		
 
@@ -371,7 +362,7 @@
 			</div>
 			<div class="span8">
 				<input type='hidden' name='csrfmiddlewaretoken' value='psDBHsF5a1mttLSKeUgoUUVN3HL6f8Re' />
-				<div id="diva-wrapper" style="width: 600px;"></div>
+				<div id="diva-wrapper"></div>
 			</div>
 		</div>
 	</div>