[MRM-137] update the user management screens

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@440983 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2006-09-07 05:41:56 +00:00
parent a74504a57c
commit b30fff2ccc
7 changed files with 356 additions and 139 deletions

View File

@ -9,8 +9,10 @@
</skin>
<publishDate position="none"/>
<body>
<breadcrumbs>
<item name="Login/Register" href="/admin/login.html"/>
</breadcrumbs>
<links>
<item name="Login" href="/admin/login.html"/>
<item name="Archiva" href="http://maven.apache.org/archiva/"/>
<item name="Maven" href="http://maven.apache.org/"/>
<item name="Apache" href="http://www.apache.org/"/>
@ -24,7 +26,7 @@
<item name="Reports" href="/reports.html"/>
<item name="Synchronisation" href="/sync.html"/>
<item name="Administration" href="/admin/index.html">
<item name="User Management" href="/admin/users.html"/>
<item name="User Management" href="/admin/users.html"/>
<item name="Proxied Repositories" href="/admin/proxies.html"/>
<item name="Synced Repositories" href="/admin/sync.html"/>
</item>

View File

@ -1,3 +1,19 @@
<!--
~ 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.
-->
<document>
<properties>
<title>Archiva</title>
@ -20,13 +36,13 @@
<li>org.apache.maven.archiva</li>
<li>org.apache.maven.continuum</li>
<li>org.apache.maven.shared</li>
<li>org.apache.maven.sandbox</li>
<li>org.apache.maven.sandbox</li>
</ul>
</p>
<p>
<input type="submit" name="Confirm"/>
</p>
</form>
</div>
</div>

View File

@ -1,9 +1,25 @@
<!--
~ 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.
-->
<document>
<properties>
<title>Archiva</title>
</properties>
<body>
<h1>login</h1>
<h1>Login</h1>
<div id="sidebar">
<p>reserved sidebar</p>
@ -11,31 +27,90 @@
<div id="contentArea">
<div id="searchBox">
<form action="../results.html">
<p>
<table>
<tr>
<td>
Username:
</td>
<td>
<input type="text" size="50"/>
</td>
</tr>
<tr>
<td>
Password:
</td>
<td>
<input type="password" size="50"/>
</td>
</tr>
</table>
</p>
<p>
<input type="submit" name="Go!"/>
</p>
<div style="float: right">
<a href="#">Forgotten your Password?</a>
</div>
<h2>Already Registered?</h2>
<form action="../index.html">
<table>
<tr>
<th>
Username
</th>
<td>
<input type="text" size="30"/>
</td>
</tr>
<tr>
<th>
Password
</th>
<td>
<input type="password" size="20"/>
</td>
</tr>
<tr>
<td/>
<td>
<input type="submit" value="Login"/>
</td>
</tr>
</table>
</form>
<h2>Request an Account</h2>
<form action="../index.html">
<table>
<tr>
<th>
Username
</th>
<td>
<input type="text" size="30"/>
</td>
</tr>
<tr>
<th>
Password
</th>
<td>
<input type="password" size="20"/>
</td>
</tr>
<tr>
<th>
Confirm Password
</th>
<td>
<input type="confirmPassword" size="20"/>
</td>
</tr>
<tr>
<th>
Full Name
</th>
<td>
<input type="text" size="30"/>
</td>
</tr>
<tr>
<th>
Email
</th>
<td>
<input type="text" size="30"/>
<br/>
<span style="font-size: x-small">(Only administrators will be able to view this, and it will be used to
send you information about your project)
</span>
</td>
</tr>
<tr>
<td/>
<td>
<input type="submit" value="Register"/>
</td>
</tr>
</table>
</form>
</div>
</div>

View File

@ -0,0 +1,157 @@
<!--
~ 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.
-->
<document>
<properties>
<title>Archiva</title>
</properties>
<body>
<h1>User Management</h1>
<div id="sidebar">
<p>reserved sidebar</p>
</div>
<div id="contentArea">
<div id="searchBox">
<div style="float: right">
<a href="edit-details.html">Edit details</a>
</div>
<h2>brett</h2>
<table>
<tr>
<th>Name</th>
<td>Brett Porter</td>
</tr>
<tr>
<th>Email</th>
<td>brett@apache.org</td>
</tr>
</table>
<h2>Permissions</h2>
<table>
<tr>
<td>
<em>Manager</em>
of repository
<em>central</em>
</td>
<td>
<a href="user-details.html">Delete</a>
</td>
</tr>
<tr>
<td>
<em>Observer</em>
of repository
<em>central-plugins</em>
</td>
<td>
<a href="user-details.html">Delete</a>
</td>
</tr>
<tr>
<td>
<em>Manager</em>
of project
<em>org.apache.maven</em>
</td>
<td>
<a href="user-details.html">Delete</a>
</td>
</tr>
</table>
<h3>Grant Permissions</h3>
<form action="user-details.html">
<table>
<tr>
<td>
<input type="radio" checked="checked"/>
</td>
<td>Administrator</td>
<td>
<select>
<option>(Please Select)</option>
<option>System Administrator</option>
<option>User Administrator</option>
</select>
</td>
</tr>
<tr>
<td>
<input type="radio"/>
</td>
<td>Repository</td>
<td>
<select>
<option>(Please Select)</option>
<option>manager</option>
<option>obverser</option>
</select>
of
<select>
<option>(Please Select)</option>
<option>central</option>
<option>central-plugins</option>
<option>All repositories</option>
</select>
</td>
</tr>
<tr>
<td>
<input type="radio"/>
</td>
<td>Project</td>
<td>
<select>
<option>(Please Select)</option>
<option>manager</option>
<option>obverser</option>
</select>
of
<select>
<option>(Please Select)</option>
<option>central</option>
<option>central-plugins</option>
<option>All repositories</option>
</select>
for project group
<input type="text" name="projectExpression"/>
<br/>
<span style="font-size: x-small">
(eg org.apache.maven gives permissions on that group, and any sugroups)
</span>
</td>
</tr>
<tr>
<td></td>
<td>
<input type="submit" value="Add Role"/>
</td>
<td></td>
</tr>
</table>
</form>
</div>
</div>
</body>
</document>

View File

@ -0,0 +1,55 @@
<!--
~ 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.
-->
<document>
<properties>
<title>Archiva</title>
</properties>
<body>
<h1>User Management</h1>
<div id="sidebar">
<p>reserved sidebar</p>
</div>
<div id="contentArea">
<div id="searchBox">
<table>
<tr>
<th>Username</th>
<th>Name</th>
<th>Email</th>
</tr>
<tr>
<th>
<a href="user-details.html">brett</a>
</th>
<td>Brett Porter</td>
<td>brett@apache.org</td>
</tr>
<tr>
<th>
<a href="user-details.html">jesse</a>
</th>
<td>Jesse McConnell</td>
<td>jesse@apache.org</td>
</tr>
</table>
</div>
</div>
</body>
</document>

View File

@ -1,96 +0,0 @@
<document>
<properties>
<title>Archiva</title>
</properties>
<body>
<h1>User Management</h1>
<div id="sidebar">
<p>reserved sidebar</p>
</div>
<div id="contentArea">
<div id="searchBox">
<p>
Currently Assigned Roles
</p>
<ul>
<li>Manager of central</li>
<li>Observer of central-plugins</li>
<li>Project Manager of org.apache.maven.*</li>
</ul>
<hr/>
<form action="user.html">
<p>
Grant Adminstrative Role
</p>
<p>
<select>
<option>admin1</option>
<option>admin2</option>
</select>
</p>
<p>
<input type="submit" name="Add Role"/>
</p>
</form>
<hr/>
<form action="user.html">
<p>
Grant Repository Role
</p>
<p>
<select>
<option>manager of central-plugins</option>
<option>obverser of central-plugins</option>
<option>manager of central</option>
</select>
</p>
<p>
<input type="submit" name="Add Role"/>
</p>
</form>
<hr/>
<form action="confirm-roles.html">
<p>
Grant Project Role
</p>
<p>
<select>
<option>manager</option>
<option>obverser</option>
</select>
</p>
<p>
Project:
<table>
<tr>
<td>
<select>
<option>p1</option>
<option>p2</option>
<option>p3</option>
<option>p4</option>
<option>p5</option>
<option>p6</option>
</select>
</td>
<td>
or
</td>
<td>
Expression (ex: org.apache.maven.*):
<input type="text" name="projectExpression"/>
</td>
</tr>
</table>
</p>
<p>
<input type="submit" name="Add Role"/>
</p>
</form>
</div>
</div>
</body>
</document>

View File

@ -1,9 +1,25 @@
<!--
~ 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.
-->
<document>
<properties>
<title>Archiva</title>
</properties>
<body>
<h1>Users Management</h1>
<h1>User Management</h1>
<div id="sidebar">
<p>reserved sidebar</p>
@ -11,20 +27,12 @@
<div id="contentArea">
<div id="searchBox">
<p>
Select a user to administer:
</p>
<form action="user.html">
<form action="user-results.html">
<p>
<select name="user">
<option>user1</option>
<option>user2</option>
</select>
Find a user:
<input type="text"/>
<input type="submit" name="Search"/>
</p>
<p>
<input type="submit" name="Manage"/>
</p>
</form>
</div>
</div>