From ae449f9f2c69dd77830604dd2dfa3a8ea933c24a Mon Sep 17 00:00:00 2001 From: nac26 Date: Tue, 5 Oct 2010 03:13:14 +0000 Subject: [PATCH] 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. --- webapp/web/admin/gotoIndividual.jsp | 6 +- webapp/web/edit/formPrefix.jsp | 115 +++++++++--------- webapp/web/edit/formSuffix.jsp | 2 +- webapp/web/error.jsp | 79 ++++++------ webapp/web/templates/page/basicPage.jsp | 55 ++++----- .../page/freemarkerTransition/footer.jsp | 16 +++ .../page/freemarkerTransition/identity.jsp | 11 ++ .../page/freemarkerTransition/menu.jsp | 22 ++++ 8 files changed, 174 insertions(+), 132 deletions(-) create mode 100644 webapp/web/templates/page/freemarkerTransition/footer.jsp create mode 100644 webapp/web/templates/page/freemarkerTransition/identity.jsp create mode 100644 webapp/web/templates/page/freemarkerTransition/menu.jsp diff --git a/webapp/web/admin/gotoIndividual.jsp b/webapp/web/admin/gotoIndividual.jsp index 2ccb59b14..8cba7ef06 100644 --- a/webapp/web/admin/gotoIndividual.jsp +++ b/webapp/web/admin/gotoIndividual.jsp @@ -34,13 +34,13 @@ if( request.getParameter("uri") != null ){ <% /* BJL23 put this is in a catch block because it seems to fail ungracefully for some clones */ %> - +
- +
-
+ \ No newline at end of file diff --git a/webapp/web/edit/formPrefix.jsp b/webapp/web/edit/formPrefix.jsp index 9cee407d8..788abbd94 100644 --- a/webapp/web/edit/formPrefix.jsp +++ b/webapp/web/edit/formPrefix.jsp @@ -8,80 +8,79 @@ + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<% - String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; - if (useTinyMCE.equalsIgnoreCase("true")) { - String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200"; - 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 buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons; - String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top"; +<% + String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; + if (useTinyMCE.equalsIgnoreCase("true")) { + String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200"; + 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 buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons; + String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top"; %> - - + + // plugins: "paste", + // theme_advanced_buttons1_add : "pastetext,pasteword,selectall", + // paste_create_paragraphs: false, + // paste_create_linebreaks: false, + // paste_use_dialog : true, + // paste_auto_cleanup_on_paste: true, + // paste_convert_headers_to_strong : true + // save_callback : "customSave", + // content_css : "example_advanced.css", + // extended_valid_elements : "a[href|target|name]", + // plugins : "table", + // theme_advanced_buttons3_add_before : "tablecontrols,separator", + // invalid_elements : "li", + // theme_advanced_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1", // Theme specific setting CSS classes + }); + <% } %> - <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; - if (useAutoComplete.equalsIgnoreCase("true")) { %> - " /> + if (useAutoComplete.equalsIgnoreCase("true")) { %> + " /> <% } %> - + " media="screen"/> - - " /> - " media="screen"/> - " media="screen"/> + + " /> + " media="screen"/> + " media="screen"/> Edit
- - + +
-
- +
+ \ No newline at end of file diff --git a/webapp/web/edit/formSuffix.jsp b/webapp/web/edit/formSuffix.jsp index ac6f5ab6e..d15ed3936 100644 --- a/webapp/web/edit/formSuffix.jsp +++ b/webapp/web/edit/formSuffix.jsp @@ -9,7 +9,7 @@
- +
diff --git a/webapp/web/error.jsp b/webapp/web/error.jsp index 3c769f2ac..50c6392db 100755 --- a/webapp/web/error.jsp +++ b/webapp/web/error.jsp @@ -12,54 +12,49 @@ Portal portal = vreq.getPortal(); String themeDir = portal!=null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; - + request.setAttribute("bodyJsp", "/errorbody.jsp"); request.setAttribute("title", "Error"); request.setAttribute("css", ""); request.setAttribute("portalBean", portal); - request.setAttribute("appBean", appBean); - request.setAttribute("themeDir", themeDir); + request.setAttribute("appBean", appBean); + request.setAttribute("themeDir", themeDir); %> - - - - - - -
- - -
- - - - -

There was an error in the system; please try again later.

- -
-

Exception:

<%= exception %> -
-
- <% try{ %> -

Trace:

<%= ServletUtils.getStackTraceAsString(exception) %>
- <% }catch (Exception e){ %> - No trace is available. - <% } %> -
-
- <% try{ %> -

Request Info:

<%= MiscWebUtils.getReqInfo(request) %> - <% }catch (Exception e){ %> - No request information is available. - <% } %> -
+ + + + + +
+ - -
- -
- - +
+ +

There was an error in the system; please try again later.

+
+

Exception:

<%= exception %> +
+ +
+ <% try{ %> +

Trace:

<%= ServletUtils.getStackTraceAsString(exception) %>
+ <% }catch (Exception e){ %> + No trace is available. + <% } %> +
+ +
+ <% try{ %> +

Request Info:

<%= MiscWebUtils.getReqInfo(request) %> + <% }catch (Exception e){ %> + No request information is available. + <% } %> +
+
+ +
+ + \ No newline at end of file diff --git a/webapp/web/templates/page/basicPage.jsp b/webapp/web/templates/page/basicPage.jsp index 08e5cb14f..9dd34d60e 100644 --- a/webapp/web/templates/page/basicPage.jsp +++ b/webapp/web/templates/page/basicPage.jsp @@ -21,28 +21,28 @@ "scripts" - optional name of file containing