comparison src/main/webapp/public/publicCodex.jsp @ 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 672301480990
children a3bf915b62fe
comparison
equal deleted inserted replaced
33:7f18b34ec7ec 34:9087a4623a08
244 <div class="row-fluid"> 244 <div class="row-fluid">
245 <div id="attributesPanel" class="span4 page" style="min-height: 700px;"> 245 <div id="attributesPanel" class="span4 page" style="min-height: 700px;">
246 246
247 <a class="ismi-fullscreen-icon" href="#" data-in-fullscreen-mode="true"></a> 247 <a class="ismi-fullscreen-icon" href="#" data-in-fullscreen-mode="true"></a>
248 248
249 <div class="attPanel" style="height: 800px; overflow: scroll;"> 249 <div class="attPanel" style="height: 700px; overflow: auto;">
250 250
251 <c:if test="${codexPage.getDigi() != null}"> 251 <c:if test="${codexPage.getDigi() != null}">
252 252
253 <input type="hidden" id="digi_id" value="${codexPage.getDigi().getId()}"> 253 <input type="hidden" id="digi_id" value="${codexPage.getDigi().getId()}">
254 254
255 <div class="divaBackgroud"> 255 <div class="divaBackgroud" style="overflow: auto;">
256 256
257 <!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --> 257 <!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->
258 258
259 <h4><%=codexPage.getDigiLabel()%></h4> 259 <h4><%=codexPage.getDigiLabel()%></h4>
260 260
261 <c:if test="${codexPage.getWitnessList().size() > 0}"> 261 <c:if test="${codexPage.getWitnessList().size() > 0}">
309 </c:forEach> 309 </c:forEach>
310 <br> 310 <br>
311 </c:if> 311 </c:if>
312 312
313 313
314 <div id="additional-information"> 314 <div id="additional-information" style="overflow-x: auto;">
315 </div> 315 </div>
316 316
317 <div id="additional-information2"> 317 <div id="additional-information2" style="overflow-x: auto;">
318 </div> 318 </div>
319 319
320 <span class="titlePanel">Codex Information</span> 320 <span class="titlePanel">Codex Information</span>
321 <table class="table table-bordered table-condensed divaPanel"> 321 <table class="table table-bordered table-condensed divaPanel">
322 <tbody> 322 <tbody>