Mercurial > hg > ismi-richfaces

changeset 30:672301480990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed: Layout issues and discrepancies on "public codices" + "image server" pages Previously: - The image in the top right was not consistent throughout all pages. - No fullscreen icon for data on image server page. - Diva viewer size fixed on public codices page. - Data box on left of public codices page not a fixed height. Fixed: - image in top right consistent - Fullscreen icon present on image server page but *not functioning* - Diva viewer fluid with page size - Data box height fixed and overflow is scrollable. To-do: *Fix fullscreen view function on data box of image server page" Signed-off-by: Alistair-Russell <russell.alistair@gmail.com>
author arussell
date Tue, 19 May 2015 16:01:55 +0000
parents 620b58e5c69b
children 8c31ab1129e1
files src/main/webapp/imageServer/displayDigi.jsp src/main/webapp/imageServer/header.jsp src/main/webapp/public/header.jsp src/main/webapp/public/publicCodex.jsp
diffstat 4 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/webapp/imageServer/displayDigi.jsp	Tue May 19 12:57:44 2015 +0000
+++ b/src/main/webapp/imageServer/displayDigi.jsp	Tue May 19 16:01:55 2015 +0000
@@ -211,11 +211,12 @@
 	<div class="custom-container">
 
 		<div class="row-fluid">
-			<div class="span4 page">
-				<div style="height: 800px; overflow: scroll;">
+			<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;">
 				
-				
-            <input type='hidden' name='csrfmiddlewaretoken' value='psDBHsF5a1mttLSKeUgoUUVN3HL6f8Re' />
+            		<input type='hidden' name='csrfmiddlewaretoken' value='psDBHsF5a1mttLSKeUgoUUVN3HL6f8Re' />
             
 					<c:if test="${digiBean.getDigi() != null}">
 					
--- a/src/main/webapp/imageServer/header.jsp	Tue May 19 12:57:44 2015 +0000
+++ b/src/main/webapp/imageServer/header.jsp	Tue May 19 16:01:55 2015 +0000
@@ -11,7 +11,7 @@
 
 			<div id="icon">
 				<div id="iconContent">
-					<img src="//www.mpiwg-berlin.mpg.de/en/images/logo.png"></img>
+					<img src="/ismi-richfaces/resources/images/ismi_icon.png" width="90"></img>
 				</div>
 			</div>
 			<div id="headerContent">
--- a/src/main/webapp/public/header.jsp	Tue May 19 12:57:44 2015 +0000
+++ b/src/main/webapp/public/header.jsp	Tue May 19 16:01:55 2015 +0000
@@ -11,7 +11,7 @@
 
 			<div id="icon">
 				<div id="iconContent">
-					<img src="//www.mpiwg-berlin.mpg.de/en/images/logo.png"></img>
+					<img src="/ismi-richfaces/resources/images/ismi_icon.png" width="90"></img>
 				</div>
 			</div>
 			<div id="headerContent">
--- a/src/main/webapp/public/publicCodex.jsp	Tue May 19 12:57:44 2015 +0000
+++ b/src/main/webapp/public/publicCodex.jsp	Tue May 19 16:01:55 2015 +0000
@@ -246,7 +246,7 @@
 				
 				<a class="ismi-fullscreen-icon" href="#" data-in-fullscreen-mode="true"></a>
 				
-				<div class="attPanel">
+				<div class="attPanel" style="height: 800px; overflow: scroll;">
 	        
 					<c:if test="${codexPage.getDigi() != null}">
 					
@@ -368,7 +368,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>