Mercurial > hg > ismi-richfaces
changeset 39:ec638eda0d68
fix display issues with codex (#49 #17).
author | casties |
---|---|
date | Mon, 29 Jun 2015 16:22:06 +0000 |
parents | d3c2ef4eaf6a |
children | d52657711e61 |
files | src/main/webapp/imageServer/resources/css/diva4ismi.css src/main/webapp/imageServer/resources/js/diva4ismi.js src/main/webapp/public/publicCodex.jsp |
diffstat | 3 files changed, 45 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/webapp/imageServer/resources/css/diva4ismi.css Fri Jun 12 23:13:12 2015 +0000 +++ b/src/main/webapp/imageServer/resources/css/diva4ismi.css Mon Jun 29 16:22:06 2015 +0000 @@ -1,70 +1,50 @@ #witness-table-contents table tr td { text-align:right; color: #3b4186; - font-size: 10px; + /* font-size: 10px;*/ } #witness-date-copyist table tr th { color: #3b4186; - font-size: 10px; + /* font-size: 10px; */ } #title-date-composition table tr th { color: #3b4186; - font-size: 10px; + /* font-size: 10px; */ } -#title-incipit { - text-align:right; -} - -#title-explicit { - text-align:right; -} - -#title-colophon { - text-align:right; -} - +#title-incipit, +#title-explicit, +#title-colophon, #title-table-contents { - text-align:right; -} - - -#witness-incipit { - text-align:right; -} - -#witness-explicit { - text-align:right; -} - -#witness-colophon { - text-align:right; -} - -#witness-table-contents { text-align:right; } +#witness-incipit, +#witness-explicit, +#witness-explicit, +#witness-colophon, +#witness-table-contents, +#witness-title-written-in-witness, +#witness-author-written-in-witness { + text-align:right; +} + .ismi-fullscreen-icon { - z-index: 100; position: absolute; - top: 5px; left: 5px; - height: 26px; width: 26px; - background: url("../img/fullscreen.png") no-repeat } @@ -73,10 +53,6 @@ } -.attPanel{ - margin-top: 40px; -} - .divaBackgroud { background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #C4C0B9; @@ -127,26 +103,36 @@ margin-right: auto; } -.divaPanel td{ +.divaPanel td { background-color: #E8E8E8; text-align: left; } +.attPanel { + margin-top: 40px; + font-size: 11px; +} + +.attPanel table, +.attPanel a { + font-size: 11px; +} + a{ color: #3B4186 !important; font-family: Arial,Verdana,sans-serif; - font-size: 11px; + /* font-size: 11px; */ } a:hover{ - //color: blue !important; + /* color: blue !important; */ } .tdTitle{ color: #3B4186; font-family: Arial,Verdana,sans-serif; font-weight: normal; - font-size: 10px; + /* font-size: 10px; */ width: 170px; text-align: left; padding: 5px 5px 5px 5px; @@ -158,12 +144,12 @@ } .tableContent td{ - //background-color: red; + /* background-color: red; */ width: 200px; color: #3B4186; font-family: Arial,Verdana,sans-serif; - font-size: 10px; + /* font-size: 10px; */ font-weight: normal; text-align: left;
--- a/src/main/webapp/imageServer/resources/js/diva4ismi.js Fri Jun 12 23:13:12 2015 +0000 +++ b/src/main/webapp/imageServer/resources/js/diva4ismi.js Mon Jun 29 16:22:06 2015 +0000 @@ -255,7 +255,9 @@ var bibInf=json.data.references[refKey]; showBibliographyEntryFormatted(refKey,bibInf,loc); } - referencesContent += "</table>"; + if ((json.data.references == null)||(json.data.references.keys().length == 0)) { + $('#witness-refs').parent().hide(); + }; } @@ -401,7 +403,9 @@ var bibInf=json.data.references[refKey]; showBibliographyEntryFormatted(refKey,bibInf,loc); } - referencesContent += "</table>"; + if ((json.data.references == null)||(json.data.references.keys().length == 0)) { + $('#title-bib').parent().hide(); + };
--- a/src/main/webapp/public/publicCodex.jsp Fri Jun 12 23:13:12 2015 +0000 +++ b/src/main/webapp/public/publicCodex.jsp Mon Jun 29 16:22:06 2015 +0000 @@ -350,7 +350,10 @@ <td> </tr> </c:forEach> - <tr><td class="tdTitle">References</td><td></td><td><table class="tableContent"> + <c:if test="${codexPage.getReferenceList().size() > 0}"> + <tr> + <td class="tdTitle">References</td><td></td><td> + <table class="tableContent"> <tbody> <c:forEach var="ref" items="${codexPage.getReferenceList().keySet()}" varStatus="loop"> <tr> @@ -367,8 +370,9 @@ </c:forEach> </tbody> </table> - - </td></tr> + </td> + </tr> + </c:if> </tbody> </table>