Subversion Repositories WebE

Compare Revisions

Last modification

Ignore whitespace Rev 33 → Rev 34

/trunk/WebContent/admin/relTypeList.jsp
25,13 → 25,13
<td><s:property value="nameTo" /></td>
<td><s:url id="editURL" action="editRelType">
<s:param name="id" value="%{relationshipId}"></s:param>
<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="%{relationshipId}"></s:param>
<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>
/trunk/WebContent/admin/relTypeAddForm.jsp
8,11 → 8,11
<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.relationshipId" />
<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.relationshipId != ''">
<s:if test="relType.id != ''">
<s:submit value="Edit" />
</s:if><s:else>
<s:submit value="Add" />
/trunk/WebContent/user/nav.jsp
7,14 → 7,14
 
<li>Begriffe
<ul>
<li><a href="termAddForm">Hinzuf&uuml;gen</a></li>
<li><a href="termList">&Auml;ndern, L&ouml;schen</a></li>
<li><a href="termAdd">Hinzuf&uuml;gen</a></li>
<li><a href="termList">Anzeigen<!-- &Auml;ndern, L&ouml;schen --></a></li>
</ul></li>
 
<li>Beziehungen
<ul>
<li><a href="">Hinzuf&uuml;gen</a></li>
<li><a href="">&Auml;ndern, L&ouml;schen</a></li>
<li><a href="relationshipAdd">Hinzuf&uuml;gen</a></li>
<li><a href="relationshipList">&Auml;ndern, L&ouml;schen</a></li>
</ul></li>
 
<li>User-Settings
/trunk/WebContent/user/termAddForm.jsp
7,7 → 7,11
<h1>
Begriff hinzuf&uuml;gen
</h1>
<s:form action="doTermAdd">
<s:form action="termSave">
<s:if test="term.edit">
<s:hidden name="edit" value="1" />
</s:if>
<s:hidden name="term.objectId" />
<s:textfield name="term.name" label="Name" />
<s:if test="term.name != ''">
<s:submit value="Umbenennen" />
/trunk/WebContent/user/userAdd.jsp
0,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: user/relationshipAdd.jsp
===================================================================
--- user/relationshipAdd.jsp (nonexistent)
+++ user/relationshipAdd.jsp (revision 34)
@@ -0,0 +1,17 @@
+<html>
+<head>
+<title>Relationship added</title>
+</head>
+<body>
+
+ <h1>
+ Beziehung hinzugef&uuml;gt
+ </h1>
+ <p>
+ Die Beziehung wurde hinzugef&uuml;gt
+ </p>
+ <p>
+ TODO: Weiterleitung!!
+ </p>
+</body>
+</html>
\ No newline at end of file
/user/relationshipAdd.jsp
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/relationshipList.jsp
===================================================================
--- user/relationshipList.jsp (nonexistent)
+++ user/relationshipList.jsp (revision 34)
@@ -0,0 +1,47 @@
+<%@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>Beziehung bearbeiten/l&ouml;schen</title>
+ </head>
+ <body>
+
+ <h1>Liste der Beziehungen</h1>
+
+ <s:if test="relationshipList.size() == 0">
+ <p>Keine Beziehung definiert</p>
+ </s:if>
+ <s:else>
+ <table>
+ <thead>
+ <th>Begriff 1</th>
+ <th>Beziehung</th>
+ <th>Begriff 2</th>
+ </thead>
+ <tbody>
+ <s:iterator value="relationshipList" status="stat">
+ <tr>
+ <td><s:property value="termFrom.name" /></td>
+ <td><s:property value="relationshipType.nameFrom" /></td>
+ <td><s:property value="termTo.name" /></td>
+
+ <td><s:url id="editURL" action="editRelationship">
+ <s:param name="id" value="%{objectId}"></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="deleteRelationship">
+ <s:param name="id" value="%{objectId}"></s:param>
+ </s:url> <s:a href="%{deleteURL}">
+ <img src="${contextPath}/resources/icons/delete.png" alt="delete" />
+ </s:a></td>
+ </tr>
+ </s:iterator>
+ </tbody>
+ </table>
+ </s:else>
+ </body>
+</html>
\ No newline at end of file
/user/relationshipList.jsp
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/relationshipAddForm.jsp
===================================================================
--- user/relationshipAddForm.jsp (nonexistent)
+++ user/relationshipAddForm.jsp (revision 34)
@@ -0,0 +1,18 @@
+<%@taglib uri="/struts-tags" prefix="s"%>
+<html>
+ <head>
+ <title>Beziehung hinzuf&uuml;gen</title>
+ </head>
+ <body>
+ <h1>
+ Beziehung hinzuf&uuml;gen
+ </h1>
+ <s:form action="relationshipSave">
+ <s:hidden name="relationship.objectId" />
+ <s:select name="term1" list="terms" listKey="objectId" listValue="name" label="Begriff 1"/>
+ <s:select name="type" list="relationshipTypes" listKey="id" listValue="nameFrom" label="Beziehungstyp"/>
+ <s:select name="term2" list="terms" listKey="objectId" listValue="name" label="Begriff 2"/>
+ <s:submit value="Hinzufügen" />
+ </s:form>
+ </body>
+</html>
/user/relationshipAddForm.jsp
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: user/termList.jsp
===================================================================
--- user/termList.jsp (revision 33)
+++ user/termList.jsp (revision 34)
@@ -15,26 +15,12 @@
</s:if>
<s:else>
<table>
- <tr>
- <th>Begriff</th>
- </tr>
- <s:iterator value="termList" status="stat">
- <tr>
- <td><s:property value="name" /></td>
-
- <td><s:url id="editURL" action="editTerm">
- <s:param name="id" value="%{objectId}"></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="deleteTerm">
- <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>
+ <s:iterator value="termList" status="stat">
+ <tr>
+ <td><s:property value="name" /></td>
+ </tr>
+ </s:iterator>
+ </tbody>
</table>
</s:else>
</body>