Author: ips Date: 2009-08-11 13:37:33 -0400 (Tue, 11 Aug 2009) New Revision: 664 Added: trunk/core/src/main/webapp/WEB-INF/facelets/ trunk/core/src/main/webapp/WEB-INF/facelets/errorLayout.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml Removed: trunk/core/src/main/webapp/errorLayout.xhtml trunk/core/src/main/webapp/include/ trunk/core/src/main/webapp/layout.xhtml trunk/core/src/main/webapp/security_error.xhtml Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties trunk/core/src/main/webapp/WEB-INF/facelets/displayGlobalMessages.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/tabMenu.xhtml trunk/core/src/main/webapp/error.xhtml trunk/core/src/main/webapp/login.xhtml trunk/core/src/main/webapp/secure/addMap.xhtml trunk/core/src/main/webapp/secure/addSimple.xhtml trunk/core/src/main/webapp/secure/categorySummary.xhtml trunk/core/src/main/webapp/secure/editMap.xhtml trunk/core/src/main/webapp/secure/operationParameters.xhtml trunk/core/src/main/webapp/secure/repeatNav.xhtml trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml trunk/core/src/main/webapp/secure/rootSummary.xhtml trunk/core/src/main/webapp/secure/viewResultsMap.xhtml Log: move Facelets include and template xhtml files from include/ to WEB-INF/facelets/, so they can't be accessed directly by clients (https://jira.jboss.org/jira/browse/JBPAPP-2358); remove security_error.xhtml, which is no longer used Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2009-08-11 17:37:33 UTC (rev 664) @@ -215,6 +215,3 @@ debugAction.runServerScan=Run Server Scan debugAction.runServiceScan=Run Service Scan debugAction.testErrorPage=Test Error Page - -#Messages for security_error.xhtml -securityError.title=Security Error Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties 2009-08-11 17:37:33 UTC (rev 664) @@ -215,6 +215,3 @@ debugAction.runServerScan=\u30b5\u30fc\u30d0\u30b9\u30ad\u30e3\u30f3\u3092\u5b9f\u884c debugAction.runServiceScan=\u30b5\u30fc\u30d3\u30b9\u30b9\u30ad\u30e3\u30f3\u3092\u5b9f\u884c debugAction.testErrorPage=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8\u306e\u30c6\u30b9\u30c8 - -#Messages for security_error.xhtml -securityError.title=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a8\u30e9\u30fc Copied: trunk/core/src/main/webapp/WEB-INF/facelets (from rev 663, trunk/core/src/main/webapp/include) Modified: trunk/core/src/main/webapp/WEB-INF/facelets/displayGlobalMessages.xhtml =================================================================== --- trunk/core/src/main/webapp/include/displayGlobalMessages.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/displayGlobalMessages.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -33,7 +33,7 @@ <!--Displays any facesMessages that were stored globally (i.e. not assigned to a single field, like a validation error --> <!--usage:--> -<!--<ui:include src="/include/displayGlobalMessages.xhtml"/>--> +<!--<ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/>--> <ui:composition> <!--the SUCCESS / FAIL / ERROR messages--> Copied: trunk/core/src/main/webapp/WEB-INF/facelets/errorLayout.xhtml (from rev 663, trunk/core/src/main/webapp/errorLayout.xhtml) =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/errorLayout.xhtml (rev 0) +++ trunk/core/src/main/webapp/WEB-INF/facelets/errorLayout.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -0,0 +1,63 @@ +<!-- + ~ Jopr Management Platform + ~ Copyright (C) 2005-2009 Red Hat, Inc. + ~ All rights reserved. + ~ + ~ This program is free software; you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License, version 2, as + ~ published by the Free Software Foundation, and/or the GNU Lesser + ~ General Public License, version 2.1, also as published by the Free + ~ Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License and the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ and the GNU Lesser General Public License along with this program; + ~ if not, write to the Free Software Foundation, Inc., + ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + --> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<ui:remove> + <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and + other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. + We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since + including an xml prolog causes IE6 to go into the undesirable "quirks mode". + (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> +</ui:remove> +<f:view contentType="text/html; charset=UTF-8"> + + <head> + <base href="#{baseUrl}"/> + <title> + <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> + </title> + + <link href="css/console-style.css" rel="stylesheet" type="text/css"/> + <link href="css/form-style.css" rel="stylesheet" type="text/css"/> + + <link rel="icon" type="image/png" href="images/favicon.png"/> + <link rel="apple-touch-icon" href="images/favicon.png"/> + + <script type="text/javascript" src="js/embedded.js"></script> + </head> + <body> + <div class="container"> + <ui:include src="header.xhtml"/> + <ui:insert name="body">body goes here</ui:insert> + </div> + </body> +</f:view> +</html> + \ No newline at end of file Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/include/formDropDownComponent.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -43,7 +43,7 @@ <!--defaultRendered: true if the "default" property should be displayed, don't include it or mark it "false" if it should not--> <!--ex:--> -<!--<ui:include src="/include/formRadioComponent.xhtml">--> +<!--<ui:include src="/WEB-INF/facelets/formRadioComponent.xhtml">--> <!--<ui:param name="label" value="# {messages['datasource.attribute']}"/>--> <!--<ui:param name="requiredLabel" value="*"/>--> <!--<ui:param name="beanValue" value="# {someComponentBean.someAttribute"/>--> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/include/formRadioComponent.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -42,7 +42,7 @@ <!--defaultRendered: true if the "default" property should be displayed, don't include it or mark it "false" if it should not--> <!--ex:--> -<!--<ui:include src="/include/formRadioComponent.xhtml">--> +<!--<ui:include src="/WEB-INF/facelets/formRadioComponent.xhtml">--> <!--<ui:param name="label" value="# {messages['datasource.attribute']}"/>--> <!--required: the symbol to indicate a required component (only define this if the component is required)--> <!--<ui:param name="required" value="*"/>--> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/include/formSecretComponent.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -43,7 +43,7 @@ <!--defaultRendered: true if the "default" property should be displayed, don't include it or mark it "false" if it should not--> <!--ex:--> -<!--<ui:include src="/include/formTextComponent.xhtml">--> +<!--<ui:include src="/WEB-INF/facelets/formTextComponent.xhtml">--> <!--<ui:param name="label" value="# {messages['datasource.attribute']}"/>--> <!--<ui:param name="required" value="*"/>--> <!--<ui:param name="beanValue" value="# {someComponentBean.someAttribute"/>--> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/include/formTextAreaComponent.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -43,7 +43,7 @@ <!--defaultRendered: true if the "default" property should be displayed, don't include it or mark it "false" if it should not--> <!--ex:--> -<!--<ui:include src="/include/formTextAreaComponent.xhtml">--> +<!--<ui:include src="/WEB-INF/facelets/formTextAreaComponent.xhtml">--> <!--<ui:param name="label" value="# {messages['datasource.attribute']}"/>--> <!--<ui:param name="required" value="*"/>--> <!--<ui:param name="beanValue" value="# {someComponentBean.someAttribute"/>--> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/include/formTextAreaConverterComponent.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -43,7 +43,7 @@ <!--defaultRendered: true if the "default" property should be displayed, don't include it or mark it "false" if it should not--> <!--ex:--> -<!--<ui:include src="/include/formTextAreaComponent.xhtml">--> +<!--<ui:include src="/WEB-INF/facelets/formTextAreaComponent.xhtml">--> <!--<ui:param name="label" value="# {messages['datasource.attribute']}"/>--> <!--<ui:param name="required" value="*"/>--> <!--<ui:param name="beanValue" value="# {someComponentBean.someAttribute"/>--> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/include/formTextComponent.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -43,7 +43,7 @@ <!--defaultRendered: true if the "default" property should be displayed, don't include it or mark it "false" if it should not--> <!--ex:--> -<!--<ui:include src="/include/formTextComponent.xhtml">--> +<!--<ui:include src="/WEB-INF/facelets/formTextComponent.xhtml">--> <!--<ui:param name="label" value="# {messages['datasource.attribute']}"/>--> <!--<ui:param name="required" value="*"/>--> <!--<ui:param name="beanValue" value="# {someComponentBean.someAttribute"/>--> Copied: trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml (from rev 663, trunk/core/src/main/webapp/layout.xhtml) =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml (rev 0) +++ trunk/core/src/main/webapp/WEB-INF/facelets/layout.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -0,0 +1,130 @@ +<!-- + ~ Jopr Management Platform + ~ Copyright (C) 2005-2009 Red Hat, Inc. + ~ All rights reserved. + ~ + ~ This program is free software; you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License, version 2, as + ~ published by the Free Software Foundation, and/or the GNU Lesser + ~ General Public License, version 2.1, also as published by the Free + ~ Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License and the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ and the GNU Lesser General Public License along with this program; + ~ if not, write to the Free Software Foundation, Inc., + ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + --> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<ui:remove> + <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and + other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. + We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since + including an xml prolog causes IE6 to go into the undesirable "quirks mode". + (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> +</ui:remove> +<f:view contentType="text/html; charset=UTF-8"> + <head> + <base href="#{baseUrl}"/> + <title> + <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> + </title> + + <link href="css/console-style.css" rel="stylesheet" type="text/css"/> + <link href="css/form-style.css" rel="stylesheet" type="text/css"/> + + <link rel="icon" type="image/png" href="images/favicon.png"/> + <link rel="apple-touch-icon" href="images/favicon.png"/> + + <script type="text/javascript" src="js/embedded.js"></script> + + <!--[if lt IE 7]> + <style type="text/css" media="screen"> + /* let the IE expressions commence */ + /* old ghost in the box for IEs 5.01 + 5.5 */ + body + { + overflow-y: hidden; + margin: 0; + padding: 0; + } + #content + { + height: expression( document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5) ) + 'px') ; + overflow: auto; + } + /* backslashes feed the new ghost in the box to IE6 */ + h\tml + { + overflow: hidden; + } + h\tml body + { + height: 100%; + overflow: auto; + } + h\tml #content + { + height: 100%; + overflow: visible; + } + #pageheader, #footer + { + width: expression(document.body.clientWidth + 'px'); + } + #sidebar-left + { + height: expression(document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5)) + 'px'); + } + </style> + <![endif]--> + + </head> + <body> + <div id="content"> + <!--TODO: add if statement to determine if this warning should be displayed--> + <!-- Restart of server indicator --> + <!--<div id="RestartWarning">--> + <!--<h:graphicImage value="images/icoServerRestartWarning.gif"/>--> + <!--<span>Restart of server is required</span>--> + <!--( <a href="#">hide</a> | <a href="#">Learn more</a> )--> + <!--</div>--> + <!--breadcrumb--> + <div id="bread"> + <ui:repeat var="node" value="#{navigationAction.getBreadCrumbs()}"> + <ul> + <li> + <h:outputText value=" : "/> + <s:link view="/secure/summary.xhtml" propagation="end"> + <f:param name="path" value="#{node.path}"/> + #{node.name} </s:link> + </li> + </ul> + </ui:repeat> + </div> + <!-- page titling --> + <h1> + <ui:insert name="pagetitle"/> + </h1> + <!--tab menu is optional--> + <ui:insert name="tabmenu"></ui:insert> + <ui:insert name="body">body goes here</ui:insert> + </div> + <ui:include src="resourceNavigation.xhtml"/> + <ui:include src="header.xhtml"/> + <ui:include src="footer.xhtml"/> + </body> +</f:view> +</html> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/tabMenu.xhtml =================================================================== --- trunk/core/src/main/webapp/include/tabMenu.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/WEB-INF/facelets/tabMenu.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -29,7 +29,7 @@ <!-- USAGE: - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="operation"/> </ui:include> Modified: trunk/core/src/main/webapp/error.xhtml =================================================================== --- trunk/core/src/main/webapp/error.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/error.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -26,7 +26,7 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <f:view> - <ui:composition template="/errorLayout.xhtml"> + <ui:composition template="/WEB-INF/facelets/errorLayout.xhtml"> <!-- body --> <ui:define name="body"> <div id="errorbox"> Deleted: trunk/core/src/main/webapp/errorLayout.xhtml =================================================================== --- trunk/core/src/main/webapp/errorLayout.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/errorLayout.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -1,59 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<!-- - ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. - ~ All rights reserved. - ~ - ~ This program is free software; you can redistribute it and/or modify - ~ it under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this program; if not, write to the Free Software - ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:remove> - <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and - other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. - We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since - including an xml prolog causes IE6 to go into the undesirable "quirks mode". - (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> -</ui:remove> -<f:view contentType="text/html; charset=UTF-8"> - - <head> - <base href="#{baseUrl}"/> - <title> - <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> - </title> - - <link href="css/console-style.css" rel="stylesheet" type="text/css"/> - <link href="css/form-style.css" rel="stylesheet" type="text/css"/> - - <link rel="icon" type="image/png" href="images/favicon.png"/> - <link rel="apple-touch-icon" href="images/favicon.png"/> - - <script type="text/javascript" src="js/embedded.js"></script> - </head> - <body> - <div class="container"> - <ui:include src="include/header.xhtml"/> - <ui:insert name="body">body goes here</ui:insert> - </div> - </body> -</f:view> -</html> - \ No newline at end of file Deleted: trunk/core/src/main/webapp/layout.xhtml =================================================================== --- trunk/core/src/main/webapp/layout.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/layout.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -1,126 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- - ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. - ~ All rights reserved. - ~ - ~ This program is free software; you can redistribute it and/or modify - ~ it under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this program; if not, write to the Free Software - ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:remove> - <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and - other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. - We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since - including an xml prolog causes IE6 to go into the undesirable "quirks mode". - (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> -</ui:remove> -<f:view contentType="text/html; charset=UTF-8"> - <head> - <base href="#{baseUrl}"/> - <title> - <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> - </title> - - <link href="css/console-style.css" rel="stylesheet" type="text/css"/> - <link href="css/form-style.css" rel="stylesheet" type="text/css"/> - - <link rel="icon" type="image/png" href="images/favicon.png"/> - <link rel="apple-touch-icon" href="images/favicon.png"/> - - <script type="text/javascript" src="js/embedded.js"></script> - - <!--[if lt IE 7]> - <style type="text/css" media="screen"> - /* let the IE expressions commence */ - /* old ghost in the box for IEs 5.01 + 5.5 */ - body - { - overflow-y: hidden; - margin: 0; - padding: 0; - } - #content - { - height: expression( document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5) ) + 'px') ; - overflow: auto; - } - /* backslashes feed the new ghost in the box to IE6 */ - h\tml - { - overflow: hidden; - } - h\tml body - { - height: 100%; - overflow: auto; - } - h\tml #content - { - height: 100%; - overflow: visible; - } - #pageheader, #footer - { - width: expression(document.body.clientWidth + 'px'); - } - #sidebar-left - { - height: expression(document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5)) + 'px'); - } - </style> - <![endif]--> - - </head> - <body> - <div id="content"> - <!--TODO: add if statement to determine if this warning should be displayed--> - <!-- Restart of server indicator --> - <!--<div id="RestartWarning">--> - <!--<h:graphicImage value="images/icoServerRestartWarning.gif"/>--> - <!--<span>Restart of server is required</span>--> - <!--( <a href="#">hide</a> | <a href="#">Learn more</a> )--> - <!--</div>--> - <!--breadcrumb--> - <div id="bread"> - <ui:repeat var="node" value="#{navigationAction.getBreadCrumbs()}"> - <ul> - <li> - <h:outputText value=" : "/> - <s:link view="/secure/summary.xhtml" propagation="end"> - <f:param name="path" value="#{node.path}"/> - #{node.name} </s:link> - </li> - </ul> - </ui:repeat> - </div> - <!-- page titling --> - <h1> - <ui:insert name="pagetitle"/> - </h1> - <!--tab menu is optional--> - <ui:insert name="tabmenu"></ui:insert> - <ui:insert name="body">body goes here</ui:insert> - </div> - <ui:include src="include/resourceNavigation.xhtml"/> - <ui:include src="include/header.xhtml"/> - <ui:include src="include/footer.xhtml"/> - </body> -</f:view> -</html> Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/login.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -76,7 +76,7 @@ </h:form> </div> <div style="margin-top:130px;"> - <ui:include src="include/footer.xhtml"/> + <ui:include src="/WEB-INF/facelets/footer.xhtml"/> </div> </div> </body> Modified: trunk/core/src/main/webapp/secure/addMap.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/addMap.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/addMap.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -32,7 +32,7 @@ THIS TEXT WILL BE REMOVED. -<ui:composition template="/layout.xhtml"> +<ui:composition template="/WEB-INF/facelets/layout.xhtml"> THIS TEXT WILL BE REMOVED AS WELL. Modified: trunk/core/src/main/webapp/secure/addSimple.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/addSimple.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/addSimple.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -32,7 +32,7 @@ THIS TEXT WILL BE REMOVED. -<ui:composition template="/layout.xhtml"> +<ui:composition template="/WEB-INF/facelets/layout.xhtml"> THIS TEXT WILL BE REMOVED AS WELL. Modified: trunk/core/src/main/webapp/secure/categorySummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/categorySummary.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/categorySummary.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -31,11 +31,11 @@ <body> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{subCategory.subCategory.name}</ui:define> <ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="summary"/> </ui:include> </ui:define> @@ -44,7 +44,7 @@ <div class="tabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <div class="instructionalText"> #{subCategory.subCategory.description} @@ -134,7 +134,7 @@ <ui:param name="paginationDataModel" value="#{resources}"/> <ui:param name="paginationDataTableName" value="dataTable"/> - <ui:include src="../include/resourceDataScroller.xhtml"/> + <ui:include src="/WEB-INF/facelets/resourceDataScroller.xhtml"/> </h:form> </div> </ui:define> Modified: trunk/core/src/main/webapp/secure/editMap.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/editMap.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/editMap.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -32,7 +32,7 @@ THIS TEXT WILL BE REMOVED. -<ui:composition template="/layout.xhtml"> +<ui:composition template="/WEB-INF/facelets/layout.xhtml"> THIS TEXT WILL BE REMOVED AS WELL. Modified: trunk/core/src/main/webapp/secure/operationParameters.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/operationParameters.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/operationParameters.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -32,7 +32,7 @@ THIS TEXT WILL BE REMOVED. -<ui:composition template="/layout.xhtml"> +<ui:composition template="/WEB-INF/facelets/layout.xhtml"> THIS TEXT WILL BE REMOVED AS WELL. Modified: trunk/core/src/main/webapp/secure/repeatNav.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/repeatNav.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/repeatNav.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -29,13 +29,13 @@ <body> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{subCategory.subCategory.name}</ui:define> <ui:define name="body"> <div class="noborderbox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <div style="width:100%;"> #{subCategory.subCategory.description} Modified: trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -27,14 +27,14 @@ xmlns:ui="http://java.sun.com/jsf/facelets" <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <!-- page title --> <ui:define name="pagetitle">#{messages['resource.add.pageTitlePrefix']} #{resourceType.name}</ui:define> <!-- body --> <ui:define name="body"> <div class="notabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <div class="instructionalText"> #{messages['content.resourceInstance.create']} Modified: trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -25,7 +25,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <!-- page title --> <ui:define name="pagetitle">#{messages['resource.add.pageTitlePrefix']} #{resourceType.name}</ui:define> @@ -33,13 +33,13 @@ <!-- body --> <ui:define name="body"> <div class="notabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <hr/> <h:form id="resourceCreateForm"> <h:panelGrid styleClass="formstyle"> - <ui:include src="/include/formDropDownComponent.xhtml"> + <ui:include src="/WEB-INF/facelets/formDropDownComponent.xhtml"> <ui:param name="identifier" value="selectedTemplate"/> <ui:param name="label" value="#{messages['resource.template.select']}"/> <ui:param name="beanValue" value="#{templateDropDownPopulator.selectedTemplate}"/> Modified: trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -25,14 +25,14 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:onc="http://jboss.org/on/component"> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{resource.resource.name}</ui:define> <!-- This rendered might be an issue if actionType is neither UPDATE or CREATE, which shouldn't happen--> <ui:define name="tabmenu"> <h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'UPDATE'}"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="configuration"/> </ui:include> </h:panelGroup> Modified: trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -30,12 +30,12 @@ <body> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{resource.name}</ui:define> <ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="content"/> </ui:include> </ui:define> @@ -43,7 +43,7 @@ <!-- body --> <ui:define name="body"> <div class="notabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <h:panelGroup layout="block" rendered="#{not empty packageDetails.location}" styleClass="instructionalText"> <b>File Path: </b> #{packageDetails.location} Modified: trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -30,19 +30,19 @@ <body> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{resource.resource.name}</ui:define> <ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="metric"/> </ui:include> </ui:define> <ui:define name="body"> <div class="tabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <div class="instructionalText"> #{messages['metrics.resourceInstance.pageDescription']} Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -33,19 +33,19 @@ <body> <f:view> -<ui:composition template="/layout.xhtml"> +<ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{currentResource.name}</ui:define> <ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="operation"/> </ui:include> </ui:define> <ui:define name="body"> <div class="tabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <h:outputText value="#{messages['control.resourceInstance.error.noOperations']}" rendered="#{empty operations}"/> @@ -164,7 +164,7 @@ </rich:columnGroup> </rich:dataTable> - <ui:include src="../include/resourceDataScroller.xhtml"> + <ui:include src="/WEB-INF/facelets/resourceDataScroller.xhtml"> <ui:param name="paginationDataModel" value="#{operationHistories}"/> <ui:param name="paginationDataTableName" value="dataTable"/> </ui:include> Modified: trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -30,19 +30,19 @@ <body> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{resource.resource.name}</ui:define> <ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="summary"/> </ui:include> </ui:define> <ui:define name="body"> <div class="tabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <h2>#{messages['summary.resourceInstance.configuration']}</h2> <table border="0"> Modified: trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -31,12 +31,12 @@ <body> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="pagetitle">#{resourceType.name}</ui:define> <ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="summary"/> </ui:include> </ui:define> @@ -45,7 +45,7 @@ <div class="tabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <div class="instructionalText"> #{resourceType.description} @@ -121,7 +121,7 @@ <ui:param name="paginationDataModel" value="#{resources}"/> <ui:param name="paginationDataTableName" value="dataTable"/> - <ui:include src="../include/resourceDataScroller.xhtml"/> + <ui:include src="/WEB-INF/facelets/resourceDataScroller.xhtml"/> </h:form> </div> Modified: trunk/core/src/main/webapp/secure/rootSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/rootSummary.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/rootSummary.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -28,17 +28,17 @@ <body> <f:view> - <ui:composition template="/layout.xhtml"> + <ui:composition template="/WEB-INF/facelets/layout.xhtml"> <ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> + <ui:include src="/WEB-INF/facelets/tabMenu.xhtml"> <ui:param name="activeTab" value="summary"/> </ui:include> </ui:define> <ui:define name="body"> <div class="tabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <h1>#{messages['summary.root.title']}</h1> Modified: trunk/core/src/main/webapp/secure/viewResultsMap.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/viewResultsMap.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/secure/viewResultsMap.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -32,7 +32,7 @@ THIS TEXT WILL BE REMOVED. -<ui:composition template="/layout.xhtml"> +<ui:composition template="/WEB-INF/facelets/layout.xhtml"> THIS TEXT WILL BE REMOVED AS WELL. Deleted: trunk/core/src/main/webapp/security_error.xhtml =================================================================== --- trunk/core/src/main/webapp/security_error.xhtml 2009-08-11 03:48:12 UTC (rev 663) +++ trunk/core/src/main/webapp/security_error.xhtml 2009-08-11 17:37:33 UTC (rev 664) @@ -1,41 +0,0 @@ -<?xml version="1.0"?> -<!-- - ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. - ~ All rights reserved. - ~ - ~ This program is free software; you can redistribute it and/or modify - ~ it under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this program; if not, write to the Free Software - ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - --> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - > -<f:view> - <ui:composition template="/layout.xhtml"> - - <!-- page title --> - <ui:define name="header">#{messages['securityError.title']}Security Error</ui:define> - - <!-- body --> - <ui:define name="body"> - <div class="notabmenubox"> - Security error - </div> - </ui:define> - </ui:composition> -</f:view> -</html> \ No newline at end of file