comparison 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
comparison
equal deleted inserted replaced
47:ef113c53629b 48:13555aff1f88
284 <th><label class="tableTitle">User</label></th> 284 <th><label class="tableTitle">User</label></th>
285 <th><label class="tableTitle">Created</label></th> 285 <th><label class="tableTitle">Created</label></th>
286 <th><label class="tableTitle">Text</label></th> 286 <th><label class="tableTitle">Text</label></th>
287 <th><label class="tableTitle">View in table</label></th> 287 <th><label class="tableTitle">View in table</label></th>
288 <th><label class="tableTitle">Text(to be published)</label></th> 288 <th><label class="tableTitle">Text(to be published)</label></th>
289 <th><label class="tableTitle">Uploaded in LGDataverse?</label></th> 289 <th><label class="tableTitle">Upload to LGDataverse</label><br>
290
291 <% LGFile lastFile = sessionBean.getBranchPage().getLastFile();
292 if(lastFile.getDvId() == null) {%>
293 <button type="button" class="get-studies" data-file-id="<%=lastFile.getId()%>">Upload it</button>
294 <% } else if (lastFile.getFileIdInDv() == null) { %>
295 <label><i>Uploaded, but it's been deleted from <a href="<%=lastFile.getDatasetUrl() %>" target="_blank"><%= lastFile.getDatasetTitle() %></a></i></label>
296 <button type="button" class="get-studies" data-file-id="<%=lastFile.getId()%>">Re-upload it</button>
297
298 <% } else { %>
299 <label>Already uploaded in <a href="<%=lastFile.getDatasetUrl() %>" target="_blank"><%= lastFile.getDatasetTitle() %></a></label>
300
301 <% } %>
302
303 </th>
290 304
291 <th><label class="tableTitle">Delete</label></th> 305 <th><label class="tableTitle">Delete</label></th>
292 </tr> 306 </tr>
293 307
294 <% for(LGFile file : sessionBean.getBranchPage().getAllFiles()) { %> 308 <% for(LGFile file : sessionBean.getBranchPage().getAllFiles()) { %>
315 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getTabDelimited4File?fileId=<%=file.getId() %>" 329 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getTabDelimited4File?fileId=<%=file.getId() %>"
316 target="_blank"> 330 target="_blank">
317 <img alt="Show text" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/> 331 <img alt="Show text" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>
318 </a> 332 </a>
319 </td> 333 </td>
320 334
321
322
323 <td> 335 <td>
324 <% if(file.getDvId() == null) {%> 336 <% if(file.getDvId() == null) {%>
325 <button type="button" class="get-studies" data-file-id="<%=file.getId()%>">Upload it</button> 337
326 <% } else if (file.getFileIdInDv() == null) { %> 338 <% } else if (file.getFileIdInDv() == null) { %>
327 <label><i>Yes, but it's been deleted from <a href="<%=file.getDatasetUrl() %>" target="_blank"><%= file.getDatasetTitle() %></a></i></label> 339 <label><i>(uploaded, then deleted)</i></label>
328 <button type="button" class="get-studies" data-file-id="<%=file.getId()%>">Upload it</button> 340
329
330 <% } else { %> 341 <% } else { %>
331 <label>Yes! in <a href="<%=file.getDatasetUrl() %>" target="_blank"><%= file.getDatasetTitle() %></a></label> 342 <label>uploaded in <a href="<%=file.getDatasetUrl() %>" target="_blank"><%= file.getDatasetTitle() %></a></label>
332 343
333 <% } %> 344 <% } %>
334 </td> 345 </td>
335 <td> 346 <td>
336 <input type="image" 347 <input type="image"