Mercurial > hg > LGServices

comparison src/main/webapp/pages/branchPage.jsp @ 58:b8ad346e39a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new: modify based on doc 'Improving LGServices interface.docx': user workflow improvement, functions like adding task into a topic and search suggestions.
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Mon, 02 May 2016 12:03:30 +0200
parents a00efd5d9e77
children bc0219c2600b
comparison
equal deleted inserted replaced
57:5cbe567a9c52 58:b8ad346e39a0
1 <%@page import="de.mpiwg.gazetteer.dataverse.bo.VDCUser"%> 1 <%@page import="de.mpiwg.gazetteer.dataverse.bo.VDCUser"%>
2 <%@page import="de.mpiwg.gazetteer.bo.LGBranch"%>
2 <%@page import="de.mpiwg.gazetteer.bo.LGFile"%> 3 <%@page import="de.mpiwg.gazetteer.bo.LGFile"%>
3 <%@page import="org.apache.commons.lang.StringUtils"%> 4 <%@page import="org.apache.commons.lang.StringUtils"%>
4 <%@page import="de.mpiwg.gazetteer.db.DBSection"%> 5 <%@page import="de.mpiwg.gazetteer.db.DBSection"%>
5 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> 6 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
6 <jsp:useBean id="sessionBean" class="de.mpiwg.web.jsp.SessionBean" scope="session" /> 7 <jsp:useBean id="sessionBean" class="de.mpiwg.web.jsp.SessionBean" scope="session" />
182 </tr> 183 </tr>
183 <tr> 184 <tr>
184 <td><label>Pages</label></td> 185 <td><label>Pages</label></td>
185 <td><label><%=sessionBean.getBranchPage().getBranch().getSection().getPages()%></label></td> 186 <td><label><%=sessionBean.getBranchPage().getBranch().getSection().getPages()%></label></td>
186 </tr> 187 </tr>
187
188
189
190
191
192
193 188
194 189
195 <tr> 190 <tr>
196 <td><label>Created</label></td> 191 <td><label>Created</label></td>
197 <td><label><%=sessionBean.getBranchPage().getBranch().getFomattedCreation() %></label></td> 192 <td><label><%=sessionBean.getBranchPage().getBranch().getFomattedCreation() %></label></td>
256 <tr> 251 <tr>
257 <td><label>Created</label></td> 252 <td><label>Created</label></td>
258 <td><label><%=sessionBean.getBranchPage().getLastFile().getFomattedCreation() %></label></td> 253 <td><label><%=sessionBean.getBranchPage().getLastFile().getFomattedCreation() %></label></td>
259 </tr> 254 </tr>
260 <tr> 255 <tr>
261 <td><label>Text</label></td> 256 <td><label>Tagged Text</label>
257 <% LGBranch branch = sessionBean.getBranchPage().getBranch(); %>
258 <a onclick="branchInExtractionInterface('<%=branch.getId() %>', '<%=branch.getCurrentLastFileId() %>', '<%=branch.getSectionId() %>', '<%=branch.getSection().getName() %>', '<%=branch.getBook().getId() %>', '<%=branch.getBook().getName() %>', '<%=sessionBean.getUser().getId() %>', '<%=sessionBean.getApplicationBean().getExtractionInterfaceUrl()%>');">
259 <img title="Show Task in Extraction Interface" src="<%=sessionBean.getApplicationBean().getEditImage()%>"/>
260 </a>
261
262 </td>
263
262 <td> 264 <td>
263 <textarea rows=20" cols="70"> 265 <textarea rows=20" cols="70">
264 <%=sessionBean.getBranchPage().getText() %> 266 <%=sessionBean.getBranchPage().getText() %>
265 </textarea> 267 </textarea>
268 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/downloadFileText?fileId=<%=branch.getCurrentLastFileId() %>"
269 target="_blank">
270 <img title="Download text (XML)" src="<%=sessionBean.getApplicationBean().getDownloadImage()%>"/>
271 </a>
266 </td> 272 </td>
267 </tr> 273 </tr>
268 </table> 274 </table>
269 </td> 275 </td>
270 </tr> 276 </tr>
281 <tr> 287 <tr>
282 <th><label class="tableTitle">File Id</label></th> 288 <th><label class="tableTitle">File Id</label></th>
283 <th><label class="tableTitle">Version</label></th> 289 <th><label class="tableTitle">Version</label></th>
284 <th><label class="tableTitle">User</label></th> 290 <th><label class="tableTitle">User</label></th>
285 <th><label class="tableTitle">Created</label></th> 291 <th><label class="tableTitle">Created</label></th>
286 <th><label class="tableTitle">Text</label></th> 292 <th><label class="tableTitle">Tagged text (XML)</label></th>
287 <th><label class="tableTitle">View in table</label></th> 293 <th><label class="tableTitle">View table</label></th>
288 <th><label class="tableTitle">Text(to be published)</label></th> 294 <th><label class="tableTitle">Table in CSV (tab-delimited)</label></th>
289 <th><label class="tableTitle">Upload to LGDataverse</label><br> 295 <th><label class="tableTitle">Upload to LGDataverse</label><br>
290 296
291 <% LGFile lastFile = sessionBean.getBranchPage().getLastFile(); 297 <% LGFile lastFile = sessionBean.getBranchPage().getLastFile();
292 if(lastFile.getDvId() == null) {%> 298 if(lastFile.getDvId() == null) {%>
293 <button type="button" class="get-studies" data-file-id="<%=lastFile.getId()%>">Upload it</button> 299 <button type="button" class="get-studies" data-file-id="<%=lastFile.getId()%>">Upload the latest version</button>
294 <% } else if (lastFile.getFileIdInDv() == null) { %> 300 <% } 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> 301 <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> 302 <button type="button" class="get-studies" data-file-id="<%=lastFile.getId()%>">Re-upload it</button>
297 303
298 <% } else { %> 304 <% } else { %>
310 <td><label><%= file.getId() %></label></td> 316 <td><label><%= file.getId() %></label></td>
311 <td><label><%= file.getVersion() %></label></td> 317 <td><label><%= file.getVersion() %></label></td>
312 <td><label><%= file.getUsername() %></label></td> 318 <td><label><%= file.getUsername() %></label></td>
313 <td><label><%= file.getFomattedCreation() %></label></td> 319 <td><label><%= file.getFomattedCreation() %></label></td>
314 <td> 320 <td>
321 <!-- action change to download the file, instead of open file in a new tab -->
322
323 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/downloadFileText?fileId=<%=file.getId() %>"
324 target="_blank">
325 <img title="Download XML file" src="<%=sessionBean.getApplicationBean().getDownloadImage()%>"/>
326 </a>
327 <!--
315 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getFileText?fileId=<%=file.getId() %>" 328 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getFileText?fileId=<%=file.getId() %>"
316 target="_blank"> 329 target="_blank">
317 <img title="Show text" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/> 330 <img title="Show text" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>
318 </a> 331 </a>
332 -->
319 </td> 333 </td>
320 <td> 334 <td>
321 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getTable4File?fileId=<%=file.getId() %>" 335 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getTable4File?fileId=<%=file.getId() %>"
322 target="_blank"> 336 target="_blank">
323 <img title="Show table" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/> 337 <img title="Show table (html)" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>
324 </a> 338 </a>
325 </td> 339 </td>
326 340
327 <!-- add to get tab-delimited file --> 341 <!-- add to get tab-delimited file -->
328 <td> 342 <!-- Taction change to download the csv file, instead of open file in a new tab -->
343 <td>
344 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/downloadTabDelimited4File?fileId=<%=file.getId() %>"
345 target="_blank">
346 <img title="Download CSV file (tab-delimited)" src="<%=sessionBean.getApplicationBean().getDownloadImage()%>"/>
347 </a>
348 <!--
329 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getTabDelimited4File?fileId=<%=file.getId() %>" 349 <a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getTabDelimited4File?fileId=<%=file.getId() %>"
330 target="_blank"> 350 target="_blank">
331 <img title="Show text" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/> 351 <img title="Show text" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>
332 </a> 352 </a>
353 -->
333 </td> 354 </td>
334 355
335 <td> 356 <td>
336 <% if(file.getDvId() == null) {%> 357 <% if(file.getDvId() == null) {%>
337 358