Mercurial > hg > ismi-richfaces
changeset 12:cbc691bb756b
re-apply Jorges fix to the duplicate global bean-id :-(
| author | casties |
|---|---|
| date | Tue, 07 Apr 2015 19:36:11 +0000 |
| parents | b4f0b63ab779 |
| children | 1e3d54f9ed2b |
| files | src/main/webapp/public/publicWitness.jsp |
| diffstat | 1 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/webapp/public/publicWitness.jsp Mon Mar 30 17:02:29 2015 +0000 +++ b/src/main/webapp/public/publicWitness.jsp Tue Apr 07 19:36:11 2015 +0000 @@ -22,12 +22,12 @@ <script type="text/javascript" src="../imageServer/resources/js/ismiUtils.js"></script> <script type="text/javascript" src="../imageServer/resources/js/diva4ismi.js"></script> - <jsp:useBean id="codexPage" class="de.mpiwg.itgroup.ismi.publicView.pages.WitnessCodexDynamicPage" scope="session" /> - <jsp:setProperty name="codexPage" property="request" value="${pageContext.request}" /> - <jsp:setProperty name="codexPage" property="response" value="${pageContext.response}" /> + <jsp:useBean id="witnessPage0" class="de.mpiwg.itgroup.ismi.publicView.pages.WitnessCodexDynamicPage" scope="session" /> + <jsp:setProperty name="witnessPage0" property="request" value="${pageContext.request}" /> + <jsp:setProperty name="witnessPage0" property="response" value="${pageContext.response}" /> - <%codexPage.init(); - if(!codexPage.isErrorLoading()){ + <%witnessPage0.init(); + if(!witnessPage0.isErrorLoading()){ response.sendRedirect("../public/publicCodices.xhtml"); }else{ %> @@ -207,13 +207,13 @@ 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()%>", + digiId: "<%=witnessPage0.getDigiId()%>", + objectData: divaGlobal.rest_url + "/rest/diva/proxy/json/<%=witnessPage0.getDigiLabel()%>", + imageDir: "/data7/srv/images/<%=witnessPage0.getDigiLabel()%>", onSetCurrentPage : handlePageSwitch, onDocumentLoaded : handleDocumentLoaded, - goDirectlyTo: <%=codexPage.getStartPage()%>, - inFullscreen: <%=codexPage.getImageFullscreen()%>, + goDirectlyTo: <%=witnessPage0.getStartPage()%>, + inFullscreen: <%=witnessPage0.getImageFullscreen()%>, zoomLevel: 1, canvasPlugin: { proxyURL: divaGlobal.rest_url + "/rest/diva/proxy/image" @@ -222,7 +222,7 @@ - var witnessId = <%=codexPage.getWitnessId()%>; + var witnessId = <%=witnessPage0.getWitnessId()%>; showWitnessDetailsBig(witnessId); }); @@ -233,7 +233,7 @@ <body bgcolor=white> - <% if(codexPage.isErrorLoading()) { %> + <% if(witnessPage0.isErrorLoading()) { %> <input type='hidden' name='csrfmiddlewaretoken' value='psDBHsF5a1mttLSKeUgoUUVN3HL6f8Re' /> <jsp:include page="header.jsp" /> @@ -252,17 +252,17 @@ <div class="attPanel"> - <c:if test="${codexPage.getDigi() != null}"> + <c:if test="${witnessPage0.getDigi() != null}"> - <input type="hidden" id="digi_id" value="${codexPage.getDigi().getId()}"> + <input type="hidden" id="digi_id" value="${witnessPage0.getDigi().getId()}"> <div class="divaBackgroud"> <!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --> - <h4><%=codexPage.getDigiLabel()%></h4> + <h4><%=witnessPage0.getDigiLabel()%></h4> - <c:if test="${codexPage.getWitnessList().size() > 0}"> + <c:if test="${witnessPage0.getWitnessList().size() > 0}"> <span class="titlePanel">Titles in this Codex</span> <table id="table-titles-in-codex" class="table table-bordered table-condensed divaPanel"> @@ -273,10 +273,10 @@ </tr> </thead> <tbody> - <c:forEach var="witness" items="${codexPage.getWitnessList()}"> + <c:forEach var="witness" items="${witnessPage0.getWitnessList()}"> <tr> <td class="tdTitle"> - <!-- href="${codexPage.getAppBean().getRoot()}/public/dynamicPage.xhtml?eid=${witness.titleId}" --> + <!-- href="${witnessPage0.getAppBean().getRoot()}/public/dynamicPage.xhtml?eid=${witness.titleId}" --> <a class="show-title-details" data-title-id="${witness.titleId}" data-witness-id="${witness.id}" @@ -288,7 +288,7 @@ <td class="columnCentered"> <c:if test="${witness.startPage != null}"> <a class="witness-new-window" data-witness-id="${witness.id}" data-start="${witness.startPage}" - href="${codexPage.getAppBean().getRoot()}/public/publicCodex.jsp?eid=${codexPage.getCurrentEntId()}&startPage=${witness.startPage}&imgFullscreen=true" + href="${witnessPage0.getAppBean().getRoot()}/public/publicCodex.jsp?eid=${witnessPage0.getCurrentEntId()}&startPage=${witness.startPage}&imgFullscreen=true" target="_blank"> <img src="../resources/images/new_window-16.png"> </a> @@ -304,9 +304,9 @@ </table> </c:if> - <c:if test="${codexPage.getUnknownList().size() > 0}"> + <c:if test="${witnessPage0.getUnknownList().size() > 0}"> <h4>Unknown titles in this Codex</h4> - <c:forEach var="witness" items="${codexPage.getUnknownList()}"> + <c:forEach var="witness" items="${witnessPage0.getUnknownList()}"> <a class="go-to-witness-link" data-witness-id="${witness.id}" data-start="${witness.startPage}" href="#"> <c:out value="${witness.folios}"/> </a> @@ -324,7 +324,7 @@ <span class="titlePanel">Codex Information</span> <table class="table table-bordered table-condensed divaPanel"> <tbody> - <c:forEach var="attLabel" items="${codexPage.getLabels()}"> + <c:forEach var="attLabel" items="${witnessPage0.getLabels()}"> <tr> <td class="tdTitle"> <c:out value="${attLabel}"/> @@ -332,9 +332,9 @@ <td > <table class="tableContent"> <tbody> - <c:forEach var="attValue" items="${codexPage.getAttMap().get(attLabel)}"> + <c:forEach var="attValue" items="${witnessPage0.getAttMap().get(attLabel)}"> <tr> - <td style="text-align: ${codexPage.getAttMapTextAlign().get(attLabel)};"> + <td style="text-align: ${witnessPage0.getAttMapTextAlign().get(attLabel)};"> <c:out value="${attValue}"/> </td> </tr>