Mercurial > hg > ismi-richfaces

changeset 21:176a21acd008

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed merge errors in WitnessTemplate. fixed non-resolved reference in codex info in publicCodex and publicWitness.
author casties
date Mon, 13 Apr 2015 20:28:30 +0000
parents 7edb4ff2590b
children 32d1933e0673
files src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java src/main/webapp/public/publicCodex.jsp src/main/webapp/public/publicWitness.jsp
diffstat 3 files changed, 18 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java	Mon Apr 13 13:47:54 2015 +0000
+++ b/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/WitnessTemplate.java	Mon Apr 13 20:28:30 2015 +0000
@@ -61,11 +61,7 @@
 	public String authorAsWrittenInWitness;
 	public String copyist;
 	public String placeOfCopying;
-<<<<<<< .mine
-        public Map<String,String> referenceEndnoteIdList;
-=======
-        public List<String>referenceEndnoteIdList;
->>>>>>> .r4754
+    public Map<String,String> referenceEndnoteIdList;
 	public String page_dimensions;
 	public String written_area_dimensions;
 	public String lines_per_page;
@@ -274,25 +270,11 @@
 			}
 
 			this.loadRefernces();
-<<<<<<< .mine
-		       	this.referenceEndnoteIdList = new HashMap<String,String>();
-
-			
-		
+			this.referenceEndnoteIdList = new HashMap<String,String>();
 
 			for  (ReferenceTemplate refTempl : this.getReferenceList()){
-			 
 			    this.referenceEndnoteIdList.put(refTempl.getEndnoteId(),refTempl.getAdditionalInf());
-			   
-		}
-
-=======
-		       	this.referenceEndnoteIdList = new ArrayList();
-			for  (ReferenceTemplate refTempl : this.getReferenceList()){
-			    this.referenceEndnoteIdList.add(refTempl.getEndnoteId());
-		}
-
->>>>>>> .r4754
+			}
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
--- a/src/main/webapp/public/publicCodex.jsp	Mon Apr 13 13:47:54 2015 +0000
+++ b/src/main/webapp/public/publicCodex.jsp	Mon Apr 13 20:28:30 2015 +0000
@@ -342,16 +342,18 @@
 									</c:forEach>
 									<tr><td class="tdTitle">References</td><td></td><td><table class="tableContent">
 									<tbody>
-										<c:forEach var="ref" items="${codexPage.getReferenceList().keySet()}">
+										<c:forEach var="ref" items="${codexPage.getReferenceList().keySet()}" varStatus="loop">
 										<tr>
-										<td  style="text-align">	<c:out value="${ref}"/>
-										</td>
+										  <td id="bibl-entry-codex-${loop.index}">
+										    <c:out value="${ref}"/>
+										    <script>showBibliographyEntryFormatted("${ref}", null, "#bibl-entry-codex-${loop.index}")</script>
+										  </td>
 										</tr>
 										<tr>
-										<td  style="text-align">	<c:out value="${codexPage.getReferenceList()[ref]}"/>
-										</td>
+										  <td>
+										    <c:out value="${codexPage.getReferenceList()[ref]}"/>
+										  </td>
 										</tr>
-
 										</c:forEach>
 									</tbody>
 									</table>
--- a/src/main/webapp/public/publicWitness.jsp	Mon Apr 13 13:47:54 2015 +0000
+++ b/src/main/webapp/public/publicWitness.jsp	Mon Apr 13 20:28:30 2015 +0000
@@ -346,11 +346,13 @@
 									</c:forEach>
 									<tr><td class="tdTitle">References</td><td></td><td><table class="tableContent">
 									<tbody>
-										<c:forEach var="ref" items="${witnessPage0.getReferenceList().keySet()}">
-										<tr>
-										<td  style="text-align">	<c:out value="${ref}"/>
-										</td>
-										</tr>
+                                        <c:forEach var="ref" items="${witnessPage0.getReferenceList().keySet()}" varStatus="loop">
+                                        <tr>
+                                          <td id="bibl-entry-codex-${loop.index}">
+                                            <c:out value="${ref}"/>
+                                            <script>showBibliographyEntryFormatted("${ref}", null, "#bibl-entry-codex-${loop.index}")</script>
+                                          </td>
+                                        </tr>
 										<tr>
 										<td  style="text-align">	<c:out value="${witnessPage0.getReferenceList()[ref]}"/>
 										</td>