Subversion Repositories WebE

Compare Revisions

Last modification

Ignore whitespace Rev 36 → Rev 37

/trunk/WebContent/admin/relTypeAdd.jsp
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: relTypeList.jsp
===================================================================
--- relTypeList.jsp (revision 36)
+++ relTypeList.jsp (nonexistent)
@@ -1,43 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}" />
-
-<html>
-<head>
-<title>Beziehungstypen bearbeiten</title>
-</head>
-<body>
-
-<h1>Beziehungstypen</h1>
-<p>Hier k&ouml;nnen Sie die Beziehungstypen anpassen.</p>
-
-<s:if test="relTypeList.size() == 0">
-<p>Keine Beziehungstypen gefunden</p>
-</s:if><s:else>
-<table>
- <tr>
- <th>Bezeichnung A =&lt; B</th>
- <th>Bezeichnung B =&lt; A</th>
- </tr>
-<s:iterator value="relTypeList" status="stat">
- <tr>
- <td><s:property value="nameFrom" /></td>
- <td><s:property value="nameTo" /></td>
-
- <td><s:url id="editURL" action="editRelType">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{editURL}">
- <img src="${contextPath}/resources/icons/page_white_edit.png" alt="edit" />
- </s:a></td>
-
- <td><s:url id="deleteURL" action="deleteRelType">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{deleteURL}">
- <img src="${contextPath}/resources/icons/delete.png" alt="delete" />
- </s:a></td>
- </tr>
-</s:iterator>
-</table>
-</s:else>
-</body>
-</html>
\ No newline at end of file
/relTypeList.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: userList.jsp
===================================================================
--- userList.jsp (revision 36)
+++ userList.jsp (nonexistent)
@@ -1,49 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}" />
-
-<html>
-<head>
-<title>User bearbeiten</title>
-</head>
-<body>
-
-<h1>UserListe</h1>
-<p>Die Liste:</p>
-
-<s:if test="userList.size() == 0">
-<p>Keine Benutzer gefunden</p>
-</s:if>
-<s:else>
-<table>
- <tr>
- <th>Username</th>
- <th>Vorname</th>
- <th>Nachname</th>
- <th>Admin?</th>
- </tr>
-<s:iterator value="userList" status="stat">
- <tr>
- <td><s:property value="username" /></td>
- <td><s:property value="firstname" /></td>
- <td><s:property value="lastname" /></td>
- <td><s:property value="admin" /></td>
-
- <td><s:url id="editURL" action="editUser">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{editURL}">
- <img src="${contextPath}/resources/icons/page_white_edit.png" alt="edit" />
- </s:a></td>
-
- <td><s:url id="deleteURL" action="deleteUser">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{deleteURL}">
- <img src="${contextPath}/resources/icons/delete.png" alt="delete" />
- </s:a></td>
- </tr>
-</s:iterator>
-</table>
-</s:else>
-
-</body>
-</html>
\ No newline at end of file
/userList.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: relTypeAddForm.jsp
===================================================================
--- relTypeAddForm.jsp (revision 36)
+++ relTypeAddForm.jsp (nonexistent)
@@ -1,23 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<html>
-<head>
-<title>Beziehungstyp erstellen</title>
-</head>
-<body>
-
-<h1>Beziehungstyp hinzuf&uuml;gen</h1>
-<p>Bitte geben Sie die Daten f&uuml;r den Beziehungstypen ein</p>
-<s:form action="doRelTypeAdd">
- <s:hidden name="relType.id" />
- <s:textfield name="relType.nameFrom" label="Name vom Ausgangspunkt (z.B. ist Vater von)" />
- <s:textfield name="relType.nameTo" label="Name vom Zielpunkt (z.B. ist Sohn von)" />
-
- <s:if test="relType.id != ''">
- <s:submit value="Edit" />
- </s:if><s:else>
- <s:submit value="Add" />
- </s:else>
-
-</s:form>
-</body>
-</html>
/relTypeAddForm.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: userAdd.jsp
===================================================================
--- userAdd.jsp (revision 36)
+++ userAdd.jsp (nonexistent)
@@ -1,17 +0,0 @@
-<html>
-<head>
-<title>User added</title>
-</head>
-<body>
-
- <h1>
- User hinzugef&uuml;gt
- </h1>
- <p>
- Der Benutzer wurde hinzugef&uuml;gt
- </p>
- <p>
- TODO: Weiterleitung!!
- </p>
-</body>
-</html>
\ No newline at end of file
/userAdd.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: userAddForm.jsp
===================================================================
--- userAddForm.jsp (revision 36)
+++ userAddForm.jsp (nonexistent)
@@ -1,27 +0,0 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
-<html>
-<head>
-<title>User erstellen</title>
-</head>
-<body>
-
-<h1>User hinzuf&uuml;gen</h1>
-<p>Bitte geben Sie die Benutzerdaten ein</p>
-<s:form action="doUserAdd">
- <s:hidden name="user.id" />
- <s:textfield name="user.username" label="User Name" />
- <s:password name="user.password" label="Password" />
- <s:textfield name="user.firstname" label="Vorname" />
- <s:textfield name="user.lastname" label="Nachname" />
- <s:checkbox name="user.admin"
- label="Soll der User admin sein?" />
-
- <s:if test="user.id != ''">
- <s:submit value="Edit" />
- </s:if><s:else>
- <s:submit value="Add" />
- </s:else>
-
-</s:form>
-</body>
-</html>
/userAddForm.jsp
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: nav.jsp
===================================================================
--- nav.jsp (revision 36)
+++ nav.jsp (revision 37)
@@ -1,21 +1,14 @@
<div id="navigation">
<ul>
- <li>User
+ <li>Verwalten
<ul>
- <li><a href="userAddForm">Hinzuf&uuml;gen</a></li>
- <li><a href="userList">&Auml;ndern, L&ouml;schen</a></li>
+ <li><a href="listUsers">Benutzer</a></li>
+ <li><a href="listRelTypes">Beziehungstypen</a></li>
</ul></li>
- <li>Beziehungstypen
+ <li>Benutzerfunktionen
<ul>
- <li><a href="relTypeAddForm">Hinzuf&uuml;gen</a></li>
- <li><a href="relTypeList">&Auml;ndern, L&ouml;schen</a></li>
+ <li><a href="../Logout">Abmelden</a></li>
</ul></li>
-
- <li>User-Settings
- <ul>
- <li><a href="../Logout">Logout</a></li>
- </ul></li>
-
</ul>
</div>
/trunk/WebContent/admin/relTypes.jsp
0,0 → 1,87
<%@taglib uri="/struts-tags" prefix="s"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<c:set var="contextPath" value="${pageContext.request.contextPath}" />
 
<html>
<head>
<s:if test="edit">
<title>Beziehungstyp bearbeiten</title>
</s:if>
<s:else>
<title>Beziehungstypen verwalten</title>
</s:else>
</head>
<body>
<s:if test="edit">
<h1>Beziehungstyp bearbeiten</h1>
</s:if>
<s:else>
<h1>Beziehungstypen verwalten</h1>
</s:else>
<s:if test="edit">
<h2>Dieser Beziehungstyp</h2>
</s:if>
<s:else>
<h2>Neuer Beziehungstyp</h2>
</s:else>
<s:form action="doRelTypeAdd">
<s:hidden name="relType.id" />
<s:textfield name="relType.nameFrom"
label="Bezeichnung A --> B (z.B. &quot;ist Sohn von&quot;)"
/>
<s:textfield name="relType.nameTo"
label="Bezeichnung A <-- B (z.B. &quot;ist Vater von&quot;)"
/>
<s:if test="edit">
<s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
Speichern</s:submit>
</s:if>
<s:else>
<s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
Hinzuf&uuml;gen
</s:submit>
</s:else>
</s:form>
<h2>Definierte Beziehungstypen</h2>
<s:if test="relTypeList.size() == 0">
<p>Keine Beziehungstypen gefunden</p>
</s:if>
<s:else>
<table>
<tr>
<th>A &rarr; B</th>
<th>A &larr; B</th>
</tr>
<s:iterator value="relTypeList" status="stat">
<tr>
<td><s:property value="nameFrom" /></td>
<td><s:property value="nameTo" /></td>
<td><s:url id="editURL" action="editRelType">
<s:param name="id" value="%{id}"></s:param>
</s:url> <s:a href="%{editURL}">
<img
src="${contextPath}/resources/icons/page_white_edit.png"
alt="edit"
/>
</s:a>
</td>
<td><s:url id="deleteURL" action="deleteRelType">
<s:param name="id" value="%{id}"></s:param>
</s:url> <s:a href="%{deleteURL}">
<img src="${contextPath}/resources/icons/delete.png"
alt="delete"
/>
</s:a>
</td>
</tr>
</s:iterator>
</table>
</s:else>
</body>
</html>
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: users.jsp
===================================================================
--- users.jsp (nonexistent)
+++ users.jsp (revision 37)
@@ -0,0 +1,93 @@
+<%@taglib uri="/struts-tags" prefix="s"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<c:set var="contextPath" value="${pageContext.request.contextPath}" />
+
+<html>
+ <head>
+ <title>User bearbeiten</title>
+ </head>
+ <body>
+ <s:if test="edit">
+ <h1>Benutzer bearbeiten</h1>
+ </s:if>
+ <s:else>
+ <h1>Benutzer verwalten</h1>
+ </s:else>
+
+ <s:if test="added">
+ <p>Der Benutzer <b><s:text name="savedUser.username"/>
+ <s:if test="savedUser.firstname.length() > 0 || savedUser.lastname.length() > 0))">
+ (<s:text name="savedUser.firstname"/> <s:text name="savedUser.lastname"/>)
+ </s:if></b>
+ wurde hinzugef&uuml;gt.</p>
+ </s:if>
+
+ <s:if test="edit">
+ <h2>Dieser Benutzer</h2>
+ </s:if>
+ <s:else>
+ <h2>Neuer Benutzer</h2>
+ </s:else>
+
+ <s:form action="saveUser">
+ <s:hidden name="edit" />
+ <s:hidden name="user.id" />
+ <s:textfield name="user.username" label="Benutzername" required="true" />
+ <s:password name="user.password" label="Passwort" required="true" />
+ <s:textfield name="user.firstname" label="Vorname" />
+ <s:textfield name="user.lastname" label="Nachname" />
+ <s:checkbox name="user.admin" label="Administrator" />
+
+ <s:if test="edit">
+ <s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
+ Speichern</s:submit>
+ </s:if>
+ <s:else>
+ <s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
+ Hinzuf&uuml;gen
+ </s:submit>
+ </s:else>
+ </s:form>
+
+ <h2>Registrierte Benutzer</h2>
+ <s:if test="userList.size() == 0">
+ <p>Keine Benutzer gefunden</p>
+ </s:if>
+ <s:else>
+ <table>
+ <thead>
+ <tr>
+ <th>Benutzername</th>
+ <th>Vorname</th>
+ <th>Nachname</th>
+ <th>Administrator</th>
+ </tr>
+ </thead>
+ <tbody>
+ <s:iterator value="userList" status="stat">
+ <tr>
+ <td><s:property value="username" /></td>
+ <td><s:property value="firstname" /></td>
+ <td><s:property value="lastname" /></td>
+ <td><s:if test="admin">ja</s:if><s:else>nein</s:else></td>
+
+ <td><s:url id="editURL" action="editUser">
+ <s:param name="id" value="%{id}"></s:param>
+ </s:url> <s:a href="%{editURL}">
+ <img src="${contextPath}/resources/icons/page_white_edit.png" alt="edit" />
+ </s:a></td>
+
+ <s:if test="!admin">
+ <td><s:url id="deleteURL" action="deleteUser">
+ <s:param name="id" value="%{id}"></s:param>
+ </s:url> <s:a href="%{deleteURL}">
+ <img src="${contextPath}/resources/icons/delete.png" alt="delete" />
+ </s:a></td>
+ </s:if>
+ </tr>
+ </s:iterator>
+ </tbody>
+ </table>
+ </s:else>
+ </body>
+</html>
\ No newline at end of file
/users.jsp
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property