Merge r6025 from nihvivo-rel-1.1-maint branch. Moved footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. Updated include paths for all templates that include these 3 files.
This commit is contained in:
nac26
parent
c6679d1e4e
commit
ae449f9f2c
8 changed files with 174 additions and 132 deletions
|
|
@ -34,9 +34,9 @@ if( request.getParameter("uri") != null ){
|
||||||
<% /* BJL23 put this is in a catch block because it seems to fail ungracefully for
|
<% /* BJL23 put this is in a catch block because it seems to fail ungracefully for
|
||||||
some clones */ %>
|
some clones */ %>
|
||||||
<c:catch>
|
<c:catch>
|
||||||
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/>
|
<jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
|
||||||
<div id="contentwrap">
|
<div id="contentwrap">
|
||||||
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/>
|
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
|
||||||
<!-- end of formPrefix.jsp -->
|
<!-- end of formPrefix.jsp -->
|
||||||
</c:catch>
|
</c:catch>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,63 +8,62 @@
|
||||||
<c:set var='themeDir'><c:out value='${portalBean.themeDir}'/></c:set>
|
<c:set var='themeDir'><c:out value='${portalBean.themeDir}'/></c:set>
|
||||||
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||||
<head> <!-- formPrefix.jsp -->
|
<head> <!-- formPrefix.jsp -->
|
||||||
<%
|
<%
|
||||||
String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false";
|
String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false";
|
||||||
if (useTinyMCE.equalsIgnoreCase("true")) {
|
if (useTinyMCE.equalsIgnoreCase("true")) {
|
||||||
String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200";
|
String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200";
|
||||||
String width = (width=request.getParameter("width")) != null && !(width.equals("")) ? width : "75%";
|
String width = (width=request.getParameter("width")) != null && !(width.equals("")) ? width : "75%";
|
||||||
String defaultButtons="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code";
|
String defaultButtons="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code";
|
||||||
String buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons;
|
String buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons;
|
||||||
String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top";
|
String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top";
|
||||||
%>
|
%>
|
||||||
<script language="javascript" type="text/javascript" src="../js/tiny_mce/tiny_mce.js"></script>
|
<script language="javascript" type="text/javascript" src="../js/tiny_mce/tiny_mce.js"></script>
|
||||||
<script language="javascript" type="text/javascript">
|
<script language="javascript" type="text/javascript">
|
||||||
tinyMCE.init({
|
tinyMCE.init({
|
||||||
theme : "advanced",
|
theme : "advanced",
|
||||||
mode : "textareas",
|
mode : "textareas",
|
||||||
theme_advanced_buttons1 : "<%=buttons%>",
|
theme_advanced_buttons1 : "<%=buttons%>",
|
||||||
theme_advanced_buttons2 : "",
|
theme_advanced_buttons2 : "",
|
||||||
theme_advanced_buttons3 : "",
|
theme_advanced_buttons3 : "",
|
||||||
theme_advanced_toolbar_location : "<%=tbLocation%>",
|
theme_advanced_toolbar_location : "<%=tbLocation%>",
|
||||||
theme_advanced_toolbar_align : "left",
|
theme_advanced_toolbar_align : "left",
|
||||||
theme_advanced_statusbar_location : "bottom",
|
theme_advanced_statusbar_location : "bottom",
|
||||||
theme_advanced_path : false,
|
theme_advanced_path : false,
|
||||||
theme_advanced_resizing : true,
|
theme_advanced_resizing : true,
|
||||||
height : "<%=height%>",
|
height : "<%=height%>",
|
||||||
width : "<%=width%>",
|
width : "<%=width%>",
|
||||||
valid_elements : "a[href|name|title],br,p,i,em,cite,strong/b,u,sub,sup,ul,ol,li",
|
valid_elements : "a[href|name|title],br,p,i,em,cite,strong/b,u,sub,sup,ul,ol,li",
|
||||||
fix_list_elements : true,
|
fix_list_elements : true,
|
||||||
fix_nesting : true,
|
fix_nesting : true,
|
||||||
cleanup_on_startup : true,
|
cleanup_on_startup : true,
|
||||||
gecko_spellcheck : true,
|
gecko_spellcheck : true,
|
||||||
forced_root_block: false
|
forced_root_block: false
|
||||||
//forced_root_block : 'p',
|
//forced_root_block : 'p',
|
||||||
// plugins: "paste",
|
// plugins: "paste",
|
||||||
// theme_advanced_buttons1_add : "pastetext,pasteword,selectall",
|
// theme_advanced_buttons1_add : "pastetext,pasteword,selectall",
|
||||||
// paste_create_paragraphs: false,
|
// paste_create_paragraphs: false,
|
||||||
// paste_create_linebreaks: false,
|
// paste_create_linebreaks: false,
|
||||||
// paste_use_dialog : true,
|
// paste_use_dialog : true,
|
||||||
// paste_auto_cleanup_on_paste: true,
|
// paste_auto_cleanup_on_paste: true,
|
||||||
// paste_convert_headers_to_strong : true
|
// paste_convert_headers_to_strong : true
|
||||||
// save_callback : "customSave",
|
// save_callback : "customSave",
|
||||||
// content_css : "example_advanced.css",
|
// content_css : "example_advanced.css",
|
||||||
// extended_valid_elements : "a[href|target|name]",
|
// extended_valid_elements : "a[href|target|name]",
|
||||||
// plugins : "table",
|
// plugins : "table",
|
||||||
// theme_advanced_buttons3_add_before : "tablecontrols,separator",
|
// theme_advanced_buttons3_add_before : "tablecontrols,separator",
|
||||||
// invalid_elements : "li",
|
// invalid_elements : "li",
|
||||||
// theme_advanced_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1", // Theme specific setting CSS classes
|
// theme_advanced_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1", // Theme specific setting CSS classes
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false";
|
<% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false";
|
||||||
if (useAutoComplete.equalsIgnoreCase("true")) { %>
|
if (useAutoComplete.equalsIgnoreCase("true")) { %>
|
||||||
<link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css"/>" />
|
<link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css"/>" />
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -73,15 +72,15 @@
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/thickbox/thickbox.css"/>" />
|
<link rel="stylesheet" type="text/css" href="<c:url value="/js/jquery_plugins/thickbox/thickbox.css"/>" />
|
||||||
<link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/screen.css"/>" media="screen"/>
|
<link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/screen.css"/>" media="screen"/>
|
||||||
<link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/formedit.css" />" media="screen"/>
|
<link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/formedit.css" />" media="screen"/>
|
||||||
|
|
||||||
<title>Edit</title>
|
<title>Edit</title>
|
||||||
</head>
|
</head>
|
||||||
<body class="formsEdit">
|
<body class="formsEdit">
|
||||||
<div id="wrap" class="container">
|
<div id="wrap" class="container">
|
||||||
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/>
|
<jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
|
||||||
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/>
|
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
|
||||||
<div id="contentwrap">
|
<div id="contentwrap">
|
||||||
<div id="content" class="form">
|
<div id="content" class="form">
|
||||||
<!-- end of formPrefix.jsp -->
|
<!-- end of formPrefix.jsp -->
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="push"></div>
|
<div class="push"></div>
|
||||||
|
|
||||||
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/>
|
<jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
|
||||||
|
|
||||||
</div><!-- end wrap -->
|
</div><!-- end wrap -->
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,44 +22,39 @@
|
||||||
request.setAttribute("themeDir", themeDir);
|
request.setAttribute("themeDir", themeDir);
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<jsp:include page="/templates/page/doctype.jsp"/>
|
|
||||||
<head>
|
|
||||||
<jsp:include page="/templates/page/headContent.jsp"/>
|
|
||||||
</head>
|
|
||||||
<body> <!-- generated by error.jsp -->
|
|
||||||
<div id="wrap">
|
|
||||||
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/>
|
|
||||||
|
|
||||||
<div id="contentwrap">
|
<jsp:include page="/templates/page/doctype.jsp"/>
|
||||||
|
<head>
|
||||||
|
<jsp:include page="/templates/page/headContent.jsp"/>
|
||||||
|
</head>
|
||||||
|
<body> <!-- generated by error.jsp -->
|
||||||
|
<div id="wrap">
|
||||||
|
<jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
|
||||||
|
|
||||||
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/>
|
<div id="contentwrap">
|
||||||
|
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
|
||||||
|
<p>There was an error in the system; please try again later.</p>
|
||||||
|
<div>
|
||||||
|
<h3>Exception: </h3><%= exception %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<% try{ %>
|
||||||
|
<h3>Trace:</h3><pre><%= ServletUtils.getStackTraceAsString(exception) %></pre>
|
||||||
|
<% }catch (Exception e){ %>
|
||||||
|
No trace is available.
|
||||||
|
<% } %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<p>There was an error in the system; please try again later.</p>
|
<div>
|
||||||
|
<% try{ %>
|
||||||
<div>
|
<h3>Request Info:</h3><%= MiscWebUtils.getReqInfo(request) %>
|
||||||
<h3>Exception: </h3><%= exception %>
|
<% }catch (Exception e){ %>
|
||||||
</div>
|
No request information is available.
|
||||||
|
<% } %>
|
||||||
<div>
|
</div>
|
||||||
<% try{ %>
|
</div> <!-- contentwrap -->
|
||||||
<h3>Trace:</h3><pre><%= ServletUtils.getStackTraceAsString(exception) %></pre>
|
<jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
|
||||||
<% }catch (Exception e){ %>
|
</div> <!-- wrap -->
|
||||||
No trace is available.
|
</body>
|
||||||
<% } %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<% try{ %>
|
|
||||||
<h3>Request Info:</h3><%= MiscWebUtils.getReqInfo(request) %>
|
|
||||||
<% }catch (Exception e){ %>
|
|
||||||
No request information is available.
|
|
||||||
<% } %>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div> <!-- contentwrap -->
|
|
||||||
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/>
|
|
||||||
</div> <!-- wrap -->
|
|
||||||
</body>
|
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -56,21 +56,20 @@
|
||||||
<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
|
<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
|
||||||
|
|
||||||
<jsp:include page="doctype.jsp"/>
|
<jsp:include page="doctype.jsp"/>
|
||||||
<head>
|
<head>
|
||||||
<jsp:include page="headContent.jsp"/>
|
<jsp:include page="headContent.jsp"/>
|
||||||
</head>
|
</head>
|
||||||
<body ${requestScope.bodyAttr}>
|
<body ${requestScope.bodyAttr}>
|
||||||
<div id="wrap" class="container">
|
<div id="wrap" class="container">
|
||||||
<div id="header">
|
<div id="header">
|
||||||
<jsp:include page="/${themeDir}jsp/identity.jsp" flush="true"/>
|
<jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
|
||||||
<jsp:include page="/${themeDir}jsp/menu.jsp" flush="true"/>
|
<jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
|
||||||
</div><!--header-->
|
</div><!-- #header -->
|
||||||
<hr class="hidden" />
|
<hr class="hidden" />
|
||||||
<div id="contentwrap">
|
<div id="contentwrap">
|
||||||
|
<c:import url="${bodyJsp}"/>
|
||||||
<c:import url="${bodyJsp}"/>
|
</div> <!-- #contentwrap -->
|
||||||
</div> <!-- contentwrap -->
|
<jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
|
||||||
<jsp:include page="/${themeDir}jsp/footer.jsp" flush="true"/>
|
</div> <!-- #wrap -->
|
||||||
</div> <!-- wrap -->
|
</body>
|
||||||
</body>
|
|
||||||
</html>
|
</html>
|
||||||
16
webapp/web/templates/page/freemarkerTransition/footer.jsp
Normal file
16
webapp/web/templates/page/freemarkerTransition/footer.jsp
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||||
|
|
||||||
|
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
|
||||||
|
|
||||||
|
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
|
||||||
|
<%
|
||||||
|
// This is here as a safety net. We should have gotten the values in identity.jsp,
|
||||||
|
// since it's the first jsp we hit.
|
||||||
|
String footer = (String) request.getAttribute("ftl_footer");
|
||||||
|
if (footer == null) {
|
||||||
|
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
|
||||||
|
}
|
||||||
|
%>
|
||||||
|
|
||||||
|
${ftl_footer}
|
||||||
|
${ftl_googleAnalytics}
|
||||||
11
webapp/web/templates/page/freemarkerTransition/identity.jsp
Normal file
11
webapp/web/templates/page/freemarkerTransition/identity.jsp
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||||
|
|
||||||
|
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
|
||||||
|
|
||||||
|
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
|
||||||
|
<%
|
||||||
|
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
|
||||||
|
%>
|
||||||
|
|
||||||
|
${ftl_identity}
|
||||||
|
|
||||||
22
webapp/web/templates/page/freemarkerTransition/menu.jsp
Normal file
22
webapp/web/templates/page/freemarkerTransition/menu.jsp
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||||
|
|
||||||
|
<%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
|
||||||
|
|
||||||
|
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil" %>
|
||||||
|
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
|
||||||
|
<%
|
||||||
|
// This is here as a safety net. We should have gotten the values in identity.jsp,
|
||||||
|
// since it's the first jsp we hit.
|
||||||
|
String menu = (String) request.getAttribute("ftl_menu");
|
||||||
|
if (menu == null) {
|
||||||
|
FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
|
||||||
|
}
|
||||||
|
%>
|
||||||
|
|
||||||
|
<div id="navAndSearch" class="block">
|
||||||
|
${ftl_menu}
|
||||||
|
${ftl_search}
|
||||||
|
</div> <!-- end navAndSearch -->
|
||||||
|
|
||||||
|
<div id="breadcrumbs" class="small"><%=BreadCrumbsUtil.getBreadCrumbsDiv(request)%></div>
|
||||||
|
|
||||||
Loading…
Add table
Reference in a new issue