WebSVN - WebE - Path Comparison - /trunk/WebContent/admin Rev 37 and /trunk/WebContent/admin Rev 36

Ignore whitespace Rev 37 → Rev 36

/trunk/WebContent/admin/relTypes.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: users.jsp
===================================================================
--- users.jsp (revision 37)
+++ users.jsp (nonexistent)
@@ -1,93 +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>
- <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ü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ü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:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: relTypeList.jsp
===================================================================
--- relTypeList.jsp (nonexistent)
+++ relTypeList.jsp (revision 36)
@@ -0,0 +1,43 @@
+<%@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ö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 =< B</th>
+ <th>Bezeichnung B =< 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:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: relTypeAddForm.jsp
===================================================================
--- relTypeAddForm.jsp (nonexistent)
+++ relTypeAddForm.jsp (revision 36)
@@ -0,0 +1,23 @@
+<%@taglib uri="/struts-tags" prefix="s"%>
+<html>
+<head>
+<title>Beziehungstyp erstellen</title>
+</head>
+<body>
+
+<h1>Beziehungstyp hinzufügen</h1>
+<p>Bitte geben Sie die Daten fü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:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: nav.jsp
===================================================================
--- nav.jsp (revision 37)
+++ nav.jsp (revision 36)
@@ -1,14 +1,21 @@
<div id="navigation">
<ul>
- <li>Verwalten
+ <li>User
<ul>
- <li><a href="listUsers">Benutzer</a></li>
- <li><a href="listRelTypes">Beziehungstypen</a></li>
+ <li><a href="userAddForm">Hinzufügen</a></li>
+ <li><a href="userList">Ändern, Löschen</a></li>
</ul></li>
- <li>Benutzerfunktionen
+ <li>Beziehungstypen
<ul>
- <li><a href="../Logout">Abmelden</a></li>
+ <li><a href="relTypeAddForm">Hinzufügen</a></li>
+ <li><a href="relTypeList">Ändern, Löschen</a></li>
</ul></li>
+
+ <li>User-Settings
+ <ul>
+ <li><a href="../Logout">Logout</a></li>
+ </ul></li>
+
</ul>
</div>

 /trunk/WebContent/admin/userAdd.jsp
 ,0 → 1,17
+<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>
 Property changes:
 Added: svn:mime-type
 ## -0,0 +1 ##
 +text/plain
 \ No newline at end of property
 Index: relTypeAdd.jsp
 ===================================================================
 --- relTypeAdd.jsp	(nonexistent)
 +++ relTypeAdd.jsp	(revision 36)
@@ -0,0 +1,17 @@
 +<html>
 +<head>
 +<title>Beziehungstyp added</title>
 +</head>
 +<body>
 +
 +  <h1>
 +    Beziehungstyp hinzugef&uuml;gt
 +  </h1>
 +  <p>
 +    Der Beziehungstyp wurde hinzugef&uuml;gt
 +  </p>
 +  <p>
 +    TODO: Weiterleitung!!
 +  </p>
 +</body>
 +</html>
 \ No newline at end of file

/relTypeAdd.jsp
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: userList.jsp
===================================================================
--- userList.jsp (nonexistent)
+++ userList.jsp (revision 36)
@@ -0,0 +1,49 @@
+<%@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:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: userAddForm.jsp
===================================================================
--- userAddForm.jsp (nonexistent)
+++ userAddForm.jsp (revision 36)
@@ -0,0 +1,27 @@
+<%@taglib uri="/struts-tags" prefix="s"%>
+<html>
+<head>
+<title>User erstellen</title>
+</head>
+<body>
+
+<h1>User hinzufü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>

Subversion Repositories WebE

Compare Revisions

Last modification

Ignore whitespace Rev 37 → Rev 36