Cleanup of webapp context root. Removing many unused jsp files and some unused controllers. NIHVIVO-1000
This commit is contained in:
bdc34
parent
ef3988022f
commit
f4409580b4
23 changed files with 10 additions and 980 deletions
250
webapp/web/templates/edit/fetch/horizontal.jsp
Normal file
250
webapp/web/templates/edit/fetch/horizontal.jsp
Normal file
|
|
@ -0,0 +1,250 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<%@ page import="java.util.*, java.lang.String.*"%>
|
||||
<%@ page import="edu.cornell.mannlib.vedit.beans.ButtonForm" %>
|
||||
|
||||
<%
|
||||
if (request.getAttribute("title") != null) { %>
|
||||
<h2><%=request.getAttribute("title")%></h2><%
|
||||
}
|
||||
%>
|
||||
|
||||
<table style="margin-bottom:1.5ex;">
|
||||
<tr>
|
||||
<td style="width:0;padding:0;margin:0;"/>
|
||||
|
||||
|
||||
<%if (request.getAttribute("horizontalJspAddButtonUrl") != null) {%>
|
||||
<td>
|
||||
<form action="<%=request.getAttribute("horizontalJspAddButtonUrl")%>" method="get"><input type="submit" class="form-button" value="<%=request.getAttribute("horizontalJspAddButtonText")%>"/>
|
||||
<% if (request.getAttribute("horizontalJspAddButtonControllerParam") != null) {%>
|
||||
<input type="hidden" name="controller" value="<%=request.getAttribute("horizontalJspAddButtonControllerParam")%>"/>
|
||||
<% }
|
||||
if (request.getAttribute("home") != null) {%>
|
||||
<input type="hidden" name="home" value="<%=request.getAttribute("home")%>"/>
|
||||
<% }%>
|
||||
</form>
|
||||
</td>
|
||||
<%
|
||||
}
|
||||
List <ButtonForm> topButtons = (List)request.getAttribute("topButtons");
|
||||
if (topButtons!=null) {
|
||||
Iterator iter = topButtons.iterator();
|
||||
while (iter.hasNext()){
|
||||
ButtonForm b = (ButtonForm)iter.next();%>
|
||||
<td>
|
||||
<form <%=b.getCssClass()%> action="<%=b.getAction()%>" method="get">
|
||||
<% HashMap<String,String> params=b.getParams();
|
||||
if (params!=null) {
|
||||
for (String key : b.getParams().keySet()) {%>
|
||||
<input type="hidden" name="<%=key%>" value="<%=params.get(key)%>"/>
|
||||
<% }
|
||||
}%>
|
||||
<input type="submit" class="form-button" value="<%=b.getLabel()%>"/>
|
||||
</form>
|
||||
</td>
|
||||
<% }
|
||||
}%>
|
||||
|
||||
</tr></table>
|
||||
|
||||
<div class="editingForm">
|
||||
|
||||
<jsp:useBean id="results" class="java.util.ArrayList" scope="request" />
|
||||
|
||||
<% int columns = 0;
|
||||
boolean havePostQueryData = false;
|
||||
|
||||
String editFormStr = (String)request.getAttribute("editform");
|
||||
String minEditRoleStr = (String)request.getAttribute("min_edit_role");
|
||||
|
||||
String firstValue = "null", secondValue = "null";
|
||||
Integer columnCount = (Integer)request.getAttribute("columncount");
|
||||
columns = columnCount.intValue();
|
||||
|
||||
String clickSortStr = (String)request.getAttribute("clicksort");
|
||||
|
||||
if ( columns > 0 && results.size() > 0) { // avoid divide by zero error in next statement
|
||||
/* start enclosing table cell that holds all results */
|
||||
%>
|
||||
|
||||
<% String suppressStr = null;
|
||||
boolean isPostQHeaderRow = false;
|
||||
|
||||
if ( ( suppressStr = (String)request.getAttribute("suppressquery")) == null ) { // only inserted into request if true
|
||||
%>
|
||||
<i><b><%=(results.size() - columns) / columns %></b> rows of results were retrieved in <b><%= columns %></b> columns for query "<%=request.getAttribute("querystring")%>".</i>
|
||||
<br/>
|
||||
<% }
|
||||
Iterator iter = results.iterator();
|
||||
int resultCount = 0, primaryRowNumber=0, pageRowNumber=0;
|
||||
while (iter.hasNext()) {
|
||||
String classString;
|
||||
|
||||
String thisResult = (String)iter.next();
|
||||
if ( "+".equals(thisResult) ) {
|
||||
havePostQueryData = true;
|
||||
classString = "database_postheader";
|
||||
isPostQHeaderRow = true;
|
||||
thisResult = " ";
|
||||
} else if ( thisResult != null && thisResult.indexOf("@@")== 0) {
|
||||
classString=thisResult.substring(2);
|
||||
thisResult =" "; //leave as follows for diagnostics: thisResult.substring(2);
|
||||
isPostQHeaderRow = false;
|
||||
} else {
|
||||
classString = isPostQHeaderRow ? "database_postheader" : "row";
|
||||
if ( thisResult == null || "".equals(thisResult) )
|
||||
thisResult = " ";
|
||||
}
|
||||
if ( resultCount == 0 ) { // first pass : column names
|
||||
%>
|
||||
|
||||
<table border="0" cellpadding="2" cellspacing="0" width = "100%">
|
||||
<% if ( clickSortStr != null && "true".equals(clickSortStr) ) {
|
||||
if ( (results.size() - columns) / columns > 2 ) {
|
||||
%>
|
||||
<tr>
|
||||
<td class="database_upperleftcorner" colspan="<%=columns%>">
|
||||
<i>Click on the column header to sort rows by that column.</i>
|
||||
</td>
|
||||
</tr>
|
||||
<% }
|
||||
}
|
||||
%>
|
||||
|
||||
<tr>
|
||||
<td class="rownumheader">#</td>
|
||||
<% if ( !("XX".equals(thisResult) )) {
|
||||
%>
|
||||
<td class="database_header">
|
||||
<% }
|
||||
} else if ( resultCount == columns ) { // end column names and start numbered list
|
||||
++ primaryRowNumber;
|
||||
++ pageRowNumber;
|
||||
firstValue = thisResult;
|
||||
%>
|
||||
|
||||
</tr>
|
||||
<tr valign="top" class="row">
|
||||
<td class="rownum">1</td>
|
||||
<% if ( !("XX".equals(thisResult) )) { %>
|
||||
<td class="row">
|
||||
<% }
|
||||
} else if ( resultCount % columns == 0 ) { // end row and start next row with calculated row number
|
||||
++ pageRowNumber;
|
||||
%>
|
||||
</tr>
|
||||
<!-- <tr valign="top" class="<%=classString%>" > -->
|
||||
<% if ( "row".equals(classString) ) {
|
||||
if ( havePostQueryData ) {
|
||||
%>
|
||||
<tr><td> </td></tr>
|
||||
<% havePostQueryData = false;
|
||||
}
|
||||
++ primaryRowNumber;
|
||||
%>
|
||||
<tr valign="top" class="row">
|
||||
<td class="rownum"><%= primaryRowNumber /*resultCount / columns*/%></td>
|
||||
<% } else { // classString does not equal "row"
|
||||
%>
|
||||
<tr valign="top" class="<%=classString%>" >
|
||||
<% }
|
||||
if ( !("XX".equals(thisResult) )) {
|
||||
%>
|
||||
<td class="<%=classString%>">
|
||||
<% }
|
||||
} else { // not the end of a row
|
||||
if ( resultCount <= columns ) { // header rows
|
||||
if ( !("XX".equals(thisResult) )) {
|
||||
%>
|
||||
<td class="database_header">
|
||||
<%
|
||||
}
|
||||
} else if ( resultCount == columns + 1 ) {
|
||||
secondValue=thisResult;
|
||||
if ( !( "XX".equals(thisResult) )) {
|
||||
%>
|
||||
<td class="row">
|
||||
<%
|
||||
}
|
||||
} else { // cells in later rows
|
||||
if ( !( "XX".equals(thisResult) )) {
|
||||
if ( "row".equals(classString) ) {
|
||||
if ( primaryRowNumber % 2 == 0 ) {
|
||||
if ( pageRowNumber % 2 == 0 ) {
|
||||
%>
|
||||
<td class="rowalternate">
|
||||
<% } else {
|
||||
%>
|
||||
<td class="row">
|
||||
<% }
|
||||
} else if ( pageRowNumber % 2 == 0 ) {
|
||||
%>
|
||||
<td class="rowalternate">
|
||||
<% } else {
|
||||
%>
|
||||
<td class="row">
|
||||
<% }
|
||||
} else {
|
||||
%>
|
||||
<td class="<%=classString%>" >
|
||||
<% }
|
||||
}
|
||||
}
|
||||
}
|
||||
if ( !( "XX".equals(thisResult) )) {
|
||||
%>
|
||||
<%= thisResult %>
|
||||
</td>
|
||||
<%
|
||||
}
|
||||
++ resultCount;
|
||||
}
|
||||
%>
|
||||
</tr>
|
||||
</table>
|
||||
<%
|
||||
} else { /* results not > 0 */
|
||||
Iterator errorIter = results.iterator();
|
||||
while ( errorIter.hasNext()) {
|
||||
String errorResult = (String)errorIter.next();
|
||||
%>
|
||||
<p>Error returned: <%= errorResult%></p>
|
||||
<%
|
||||
}
|
||||
}
|
||||
%>
|
||||
<%
|
||||
if ( editFormStr != null && minEditRoleStr != null ) {
|
||||
String loginStatus =(String)session.getAttribute("loginStatus");
|
||||
if ( loginStatus != null && "authenticated".equals(loginStatus) ) {
|
||||
String currentRemoteAddrStr = request.getRemoteAddr();
|
||||
String storedRemoteAddr = (String)session.getAttribute("loginRemoteAddr");
|
||||
if ( storedRemoteAddr != null && currentRemoteAddrStr.equals( storedRemoteAddr ) ) {
|
||||
int minEditRole = Integer.parseInt( minEditRoleStr );
|
||||
String authorizedRoleStr = (String)session.getAttribute("loginRole");
|
||||
if ( authorizedRoleStr != null ) {
|
||||
int authorizedRole = Integer.parseInt( authorizedRoleStr );
|
||||
if ( authorizedRole >= minEditRole ) { %>
|
||||
<jsp:include page="<%=editFormStr%>" flush="true">
|
||||
<jsp:param name="firstvalue" value="<%=firstValue%>" />
|
||||
<jsp:param name="secondvalue" value="<%=secondValue%>" />
|
||||
</jsp:include>
|
||||
<% } else { %>
|
||||
|
||||
<% }
|
||||
} else { %>
|
||||
|
||||
<% }
|
||||
} else { %>
|
||||
|
||||
<% }
|
||||
} else { %>
|
||||
|
||||
<% }
|
||||
} else { %>
|
||||
|
||||
<%
|
||||
} %>
|
||||
|
||||
</div>
|
||||
42
webapp/web/templates/parts/emailUsers.jsp
Normal file
42
webapp/web/templates/parts/emailUsers.jsp
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
|
||||
|
||||
<div id="content" class="staticPageBackground">
|
||||
|
||||
<div class="feedbackForm">
|
||||
|
||||
<h2>${siteName} Email Users Form </h2>
|
||||
|
||||
|
||||
|
||||
<hr/>
|
||||
|
||||
<form name = "contact_form" action="mailusers" method="post">
|
||||
<input type="hidden" name="home" value="${portalId}"/>
|
||||
<input type="hidden" name="RequiredFields" value="comments"/>
|
||||
<input type="hidden" name="RequiredFieldsNames" value="Comments"/>
|
||||
<input type="hidden" name="EmailFields" value="webuseremail"/>
|
||||
<input type="hidden" name="EmailFieldsNames" value="emailaddress"/>
|
||||
<input type="hidden" name="DeliveryType" value="comment"/>
|
||||
|
||||
<p class="normal">My email address is (e.g., userid<b>@institution.edu</b>):</p>
|
||||
<input style="width:25%;" type="text" name="webuseremail" maxlength="255"/><br/><br/>
|
||||
<p class="normal">My full name is:</p>
|
||||
<input style="width:33%;" type="text" name="webusername" maxlength="255"/><br/><br/>
|
||||
|
||||
|
||||
<h3>Enter your message below. This message will be emailed to all email addresses associated with user accounts. </h3>
|
||||
|
||||
<textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
|
||||
<div>
|
||||
<input type="submit" value="Send Mail" class="yellowbutton"/>
|
||||
<input type="reset" value="Clear Form" class="plainbutton"/>
|
||||
</div
|
||||
|
||||
<p style="font-weight: bold; margin-top: 1em">Thank you!</p>
|
||||
</form>
|
||||
|
||||
</div><!--feedbackForm-->
|
||||
|
||||
</div><!--content, staticPageBackground-->
|
||||
10
webapp/web/templates/parts/search_error.jsp
Executable file
10
webapp/web/templates/parts/search_error.jsp
Executable file
|
|
@ -0,0 +1,10 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
|
||||
<div id="content"><!-- from search_error.jsp -->
|
||||
<p><strong class="warning error">There was an error in the system; your search could not be processed. Please try again later or contact us.</strong></p>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
28
webapp/web/templates/parts/thankyou.jsp
Normal file
28
webapp/web/templates/parts/thankyou.jsp
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<%@ page language="java" %>
|
||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
|
||||
<%@ page import="java.util.*" %>
|
||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
|
||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
|
||||
|
||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
|
||||
|
||||
<%
|
||||
VitroRequest vreq = new VitroRequest(request);
|
||||
Portal portalBean=vreq.getPortal();
|
||||
%>
|
||||
|
||||
<c:set var="portal" value="${requestScope.portalBean}"/>
|
||||
<c:set var="themeDir"><c:out value="${portalBean.themeDir}"/></c:set>
|
||||
|
||||
<%-- Need to get the context --%>
|
||||
<c:url var="themeDir" value="/${themeDir}"/>
|
||||
|
||||
<div id="content">
|
||||
<h2>Feedback</h2>
|
||||
<img src="${themeDir}site_icons/mail.gif" alt="mailbox"/><br/>
|
||||
|
||||
<p>Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.</p>
|
||||
<p>Click to return to the <a href="index.jsp?home=<%=portalBean.getPortalId()%>">home page</a>.</p>
|
||||
</div><!-- content -->
|
||||
Loading…
Add table
Add a link
Reference in a new issue