diff options
Diffstat (limited to 'archiva-webapp/src/main/webapp')
4 files changed, 10 insertions, 152 deletions
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/createAdmin.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/createAdmin.jsp deleted file mode 100644 index 04e7b0e47..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/createAdmin.jsp +++ /dev/null @@ -1,40 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --%> - -<%@ taglib prefix="ww" uri="/webwork"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - -<html> -<head> - <title>Create Admin User</title> - <ww:head/> -</head> - -<body> - -<c:import url="/WEB-INF/jsp/pss/include/formValidationResults.jspf" /> - -<h2>Create Admin User</h2> - -<ww:form action="addadmin!submit" namespace="/admin" theme="xhtml" - id="adminCreateForm" method="post" name="admincreate" cssClass="security adminCreate"> - <c:import url="/WEB-INF/jsp/pss/include/userCredentials.jspf" /> - <ww:submit value="Create Admin" /> -</ww:form> - -</body> - -</html> diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp index 702651fb9..af2284e04 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp @@ -59,7 +59,7 @@ <div id="breadcrumbs"> <div class="xleft"> - <c:import url="/WEB-INF/jsp/pss/include/securityLinks.jspf" /> + <c:import url="/WEB-INF/jsp/pss/include/securityLinks.jsp"/> </div> <div class="xright"> @@ -92,7 +92,7 @@ <my:currentWWUrl action="browse" namespace="/">Browse</my:currentWWUrl> </li> </ul> - <pss:ifAnyAuthorized permissions="edit-all-users,access-reports,edit-configuration"> + <pss:ifAnyAuthorized permissions="archiva-manage-users,access-reports,archiva-manage-configuration"> <h5>Manage</h5> <ul> <pss:ifAuthorized permission="access-reports"> @@ -105,15 +105,14 @@ <a href="#">Synchronisation</a> </li> --%> - <pss:ifAnyAuthorized permissions="edit-configuration,edit-all-users"> - <pss:ifAuthorized permission="edit-all-users"> - <li class="none"> - <my:currentWWUrl action="userlist" namespace="/security">User Management</my:currentWWUrl> - </li> - </pss:ifAuthorized> - <pss:ifAuthorized permission="edit-configuration"> + <pss:ifAuthorized permission="archiva-manage-users"> <li class="none"> - <my:currentWWUrl action="index" namespace="/admin">Administration</my:currentWWUrl> + <my:currentWWUrl action="userlist" namespace="/security">User Management</my:currentWWUrl> + </li> + </pss:ifAuthorized> + <pss:ifAuthorized permission="archiva-manage-configuration"> + <li class="none"> + <my:currentWWUrl action="index" namespace="/admin">Administration</my:currentWWUrl> <ul> @@ -128,8 +127,7 @@ --%> </ul> </li> - </pss:ifAuthorized> - </pss:ifAnyAuthorized> + </pss:ifAuthorized> </ul> </pss:ifAnyAuthorized> <br/> diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/logout.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/logout.jsp deleted file mode 100644 index 59e0a8a92..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/logout.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --%> - -<%@ taglib prefix="ww" uri="/webwork" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -<html> -<head> - <title>Logout Page</title> - <ww:head/> -</head> - -<body> - -<h1>Logout</h1> - -<div id="contentArea"> - <div id="nameColumn"> - You have been successfully logged out! - </div> -</div> - -</body> -</html> diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp deleted file mode 100644 index af7675016..000000000 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp +++ /dev/null @@ -1,63 +0,0 @@ -<%-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --%> - -<%@ taglib prefix="ww" uri="/webwork" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -<html> -<head> - <title>Registration Page</title> - <ww:head/> -</head> - -<body> - -<div id="contentArea"> - <div id="searchBox"> - - <div id="results"> - <%-- This is where the "Account Created Successfully" type message goes. --%> - <div class="success"> - <ww:actionmessage /> - </div> - <%-- This is where errors from the action and other non-form field specific errors appear. --%> - <div class="errors"> - <ww:actionerror /> - </div> - </div> - - <h2>Register for an Account</h2> - - <%-- You don't need a table to wrap form elements in, - the ww:form creates the table, labels, context sensitive actionerrors, requirements indicators, etc... - - Joakim --%> - - <ww:form action="register" method="post"> - <%@ include file="/WEB-INF/jsp/admin/include/registerUserForm.jspf" %> - <ww:submit value="Register"/> - </ww:form> - - </div> -</div> - - -<div class="clear"> - <hr/> -</div> - -</body> - -</html> |