diff src/main/webapp/pages/branchPage.jsp @ 48:13555aff1f88

new: multiple full text searching. topics and tasks improvement.
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Thu, 21 Jan 2016 11:56:30 +0100
parents 9dbbbfd474f4
children a00efd5d9e77
line wrap: on
line diff
--- a/src/main/webapp/pages/branchPage.jsp	Mon Dec 28 12:54:55 2015 +0100
+++ b/src/main/webapp/pages/branchPage.jsp	Thu Jan 21 11:56:30 2016 +0100
@@ -286,7 +286,21 @@
 											<th><label class="tableTitle">Text</label></th>
 											<th><label class="tableTitle">View in table</label></th>
 											<th><label class="tableTitle">Text(to be published)</label></th>
-											<th><label class="tableTitle">Uploaded in LGDataverse?</label></th>
+											<th><label class="tableTitle">Upload to LGDataverse</label><br>
+												
+												<% LGFile lastFile = sessionBean.getBranchPage().getLastFile();
+													if(lastFile.getDvId() == null) {%>
+														<button type="button" class="get-studies" data-file-id="<%=lastFile.getId()%>">Upload it</button>
+													<% } else if (lastFile.getFileIdInDv() == null) { %>
+														<label><i>Uploaded, but it's been deleted from <a href="<%=lastFile.getDatasetUrl() %>" target="_blank"><%= lastFile.getDatasetTitle() %></a></i></label>	
+														<button type="button" class="get-studies" data-file-id="<%=lastFile.getId()%>">Re-upload it</button>
+													
+													<% } else { %>		
+														<label>Already uploaded in <a href="<%=lastFile.getDatasetUrl() %>" target="_blank"><%= lastFile.getDatasetTitle() %></a></label>	
+														
+													<% } %>		
+		
+											</th>
 											
 											<th><label class="tableTitle">Delete</label></th>
 										</tr>	
@@ -317,18 +331,15 @@
 														<img alt="Show text" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>
 													</a>												
 												</td>	
-																						
-																						
-													
+														
 												<td>
 													<% if(file.getDvId() == null) {%>
-														<button type="button" class="get-studies" data-file-id="<%=file.getId()%>">Upload it</button>
+														
 													<% } else if (file.getFileIdInDv() == null) { %>
-														<label><i>Yes, but it's been deleted from <a href="<%=file.getDatasetUrl() %>" target="_blank"><%= file.getDatasetTitle() %></a></i></label>	
-														<button type="button" class="get-studies" data-file-id="<%=file.getId()%>">Upload it</button>
-													
+														<label><i>(uploaded, then deleted)</i></label>	
+														
 													<% } else { %>		
-														<label>Yes! in <a href="<%=file.getDatasetUrl() %>" target="_blank"><%= file.getDatasetTitle() %></a></label>	
+														<label>uploaded in <a href="<%=file.getDatasetUrl() %>" target="_blank"><%= file.getDatasetTitle() %></a></label>	
 														
 													<% } %>		
 												</td>