changeset 34:9087a4623a08

Temporary Fix: Minor layout issues with info box on left of codex pages. Previously: - Choosing "view more" under Witness Information would make the information spill out over the rest of the page (outside the info box on the left). Fixed: - Now when "view more" is selected the overflow for Witness Information is contained within the page division. Suitable for laptop use but likely a little more difficult with a keyboard and mouse. - Also made slight adjustment to let diva viewer and info box have similar heights. - Vertically scrolling through info box now works well. To-Do: *The data under "view more" in Witness Info is being taken in an odd way from the database (tables within tables forming, etc)* Signed-off-by: Alistair-Russell <russell.alistair@gmail.com>
author arussell
date Thu, 21 May 2015 22:27:14 +0000
parents 7f18b34ec7ec
children 3e8493684729
files src/main/webapp/imageServer/displayDigi.jsp src/main/webapp/public/publicCodex.jsp
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/webapp/imageServer/displayDigi.jsp	Thu May 21 16:36:53 2015 +0000
+++ b/src/main/webapp/imageServer/displayDigi.jsp	Thu May 21 22:27:14 2015 +0000
@@ -214,7 +214,7 @@
 			<div id="attributesPanel" class="span4 page" style="min-height: 700px;">
 				<a class="ismi-fullscreen-icon" href="#" data-in-fullscreen-mode="true"></a>
 
-				<div class="attPanel" style="height: 800px; overflow: scroll;">
+				<div class="attPanel" style="height: 700px; overflow: auto;">
 				
             		<input type='hidden' name='csrfmiddlewaretoken' value='psDBHsF5a1mttLSKeUgoUUVN3HL6f8Re' />
             
--- a/src/main/webapp/public/publicCodex.jsp	Thu May 21 16:36:53 2015 +0000
+++ b/src/main/webapp/public/publicCodex.jsp	Thu May 21 22:27:14 2015 +0000
@@ -246,14 +246,14 @@
 				
 				<a class="ismi-fullscreen-icon" href="#" data-in-fullscreen-mode="true"></a>
 				
-				<div class="attPanel" style="height: 800px; overflow: scroll;">
-	        
+				<div class="attPanel" style="height: 700px; overflow: auto;">
+
 					<c:if test="${codexPage.getDigi() != null}">
 					
 						<input type="hidden" id="digi_id" value="${codexPage.getDigi().getId()}">
-						
-						<div class="divaBackgroud">
-							
+
+						<div class="divaBackgroud" style="overflow: auto;">
+
 							<!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->
 							
 							<h4><%=codexPage.getDigiLabel()%></h4>
@@ -311,10 +311,10 @@
 							</c:if>
 							
 						
-							<div id="additional-information">
+							<div id="additional-information" style="overflow-x: auto;">
 							</div>
 							
-							<div id="additional-information2">
+							<div id="additional-information2" style="overflow-x: auto;">
 							</div>
 							
 							<span class="titlePanel">Codex Information</span>