* TermAction.java - Implemented add and edit (rename) (TODO: delete) * RelationshipAction.java - Implemented add, edit, and delete * nav.jsp - Removed obsolete navigation items * General - Moved term/relationship edit form to list view, reuse for add (TODO: update documentation)
/trunk/WebContent/user/termAddForm.jsp |
---|
File deleted |
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: relationshipList.jsp |
=================================================================== |
--- relationshipList.jsp (revision 34) |
+++ relationshipList.jsp (nonexistent) |
@@ -1,47 +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>Beziehung bearbeiten/lö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 |
/relationshipList.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: termList.jsp |
=================================================================== |
--- termList.jsp (revision 34) |
+++ termList.jsp (nonexistent) |
@@ -1,27 +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>Begriff bearbeiten/löschen</title> |
- </head> |
- <body> |
- |
- <h1>Liste der Begriffe</h1> |
- |
- <s:if test="termList.size() == 0"> |
- <p>Keine Begriffe eingegeben</p> |
- </s:if> |
- <s:else> |
- <table> |
- <s:iterator value="termList" status="stat"> |
- <tr> |
- <td><s:property value="name" /></td> |
- </tr> |
- </s:iterator> |
- </tbody> |
- </table> |
- </s:else> |
- </body> |
-</html> |
\ No newline at end of file |
/termList.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: relationshipAdd.jsp |
=================================================================== |
--- relationshipAdd.jsp (revision 34) |
+++ relationshipAdd.jsp (nonexistent) |
@@ -1,17 +0,0 @@ |
-<html> |
-<head> |
-<title>Relationship added</title> |
-</head> |
-<body> |
- |
- <h1> |
- Beziehung hinzugefügt |
- </h1> |
- <p> |
- Die Beziehung wurde hinzugefügt |
- </p> |
- <p> |
- TODO: Weiterleitung!! |
- </p> |
-</body> |
-</html> |
\ No newline at end of file |
/relationshipAdd.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: termAdd.jsp |
=================================================================== |
--- termAdd.jsp (revision 34) |
+++ termAdd.jsp (nonexistent) |
@@ -1,17 +0,0 @@ |
-<html> |
-<head> |
-<title>Term added</title> |
-</head> |
-<body> |
- |
- <h1> |
- Begriff hinzugefügt |
- </h1> |
- <p> |
- Der Begriff wurde hinzugefügt |
- </p> |
- <p> |
- TODO: Weiterleitung!! |
- </p> |
-</body> |
-</html> |
\ No newline at end of file |
/termAdd.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: relationshipAddForm.jsp |
=================================================================== |
--- relationshipAddForm.jsp (revision 34) |
+++ relationshipAddForm.jsp (nonexistent) |
@@ -1,18 +0,0 @@ |
-<%@taglib uri="/struts-tags" prefix="s"%> |
-<html> |
- <head> |
- <title>Beziehung hinzufügen</title> |
- </head> |
- <body> |
- <h1> |
- Beziehung hinzufü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> |
/relationshipAddForm.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: nav.jsp |
=================================================================== |
--- nav.jsp (revision 34) |
+++ nav.jsp (revision 35) |
@@ -1,20 +1,13 @@ |
<div id="navigation"> |
<ul> |
- <li>Ontologie |
- <ul> |
- <li><a href="">Ansehen</a></li> |
- </ul></li> |
- |
<li>Begriffe |
<ul> |
- <li><a href="termAdd">Hinzufügen</a></li> |
- <li><a href="termList">Anzeigen<!-- Ändern, Löschen --></a></li> |
+ <li><a href="listTerms">Anzeigen/Bearbeiten</a></li> |
</ul></li> |
<li>Beziehungen |
<ul> |
- <li><a href="relationshipAdd">Hinzufügen</a></li> |
- <li><a href="relationshipList">Ändern, Löschen</a></li> |
+ <li><a href="listRelationships">Anzeigen/Bearbeiten</a></li> |
</ul></li> |
<li>User-Settings |
/trunk/WebContent/user/relationships.jsp |
---|
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> |
<s:if test="edit"> |
<title>Beziehung bearbeiten</title> |
</s:if> |
<s:else> |
<title>Beziehungen anzeigen/bearbeiten</title> |
</s:else> |
</head> |
<body> |
<s:if test="edit"> |
<h1>Beziehung bearbeiten</h1> |
</s:if> |
<s:else> |
<h1>Beziehungen anzeigen/bearbeiten</h1> |
</s:else> |
<s:if test="added"> |
<p> |
Die Beziehung <b>"<s:text name="modifiedRelationship.termFrom.name"/>" |
"<s:text name="modifiedRelationship.relationshipType.nameFrom"/>" |
"<s:text name="modifiedRelationship.termTo.name"/>"</b> |
wurde hinzugefügt. |
</p> |
</s:if> |
<s:if test="edit"> |
<h2>Diese Beziehung</h2> |
</s:if> |
<s:else> |
<h2>Neue Beziehung</h2> |
</s:else> |
<s:form action="saveRelationship"> |
<s:hidden name="edit" /> |
<s:hidden name="relationship.objectId" /> |
<s:select name="term1" list="terms" listKey="objectId" listValue="name" |
label="Begriff 1" value="relationship.termFrom.objectId" /> |
<s:select name="type" list="relationshipTypes" listKey="id" listValue="nameFrom" |
label="Beziehungstyp" value="relationship.relationshipType.id"/> |
<s:select name="term2" list="terms" listKey="objectId" listValue="name" |
label="Begriff 2" value="relationship.termTo.objectId"/> |
<s:if test="edit"> |
<s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" /> |
Änderungen 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>Definierte Beziehungen</h2> |
<s:if test="relationshipList.size() == 0"> |
<p>Keine Beziehungen definiert</p> |
</s:if> |
<s:else> |
<table> |
<thead> |
<th>Begriff 1</th> |
<th>Beziehungstyp</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> |
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: terms.jsp |
=================================================================== |
--- terms.jsp (nonexistent) |
+++ terms.jsp (revision 35) |
@@ -0,0 +1,75 @@ |
+<%@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>Begriff bearbeiten</title> |
+ </s:if> |
+ <s:else> |
+ <title>Begriffe anzeigen/bearbeiten</title> |
+ </s:else> |
+ </head> |
+ <body> |
+ |
+ <s:if test="edit"> |
+ <h1>Begriff bearbeiten</h1> |
+ </s:if> |
+ <s:else> |
+ <h1>Begriffe anzeigen/bearbeiten</h1> |
+ </s:else> |
+ |
+ <s:if test="added"> |
+ <p>Der Begriff <b><s:text name="savedTerm.name"/></b> wurde hinzugefügt.</p> |
+ </s:if> |
+ |
+ <s:if test="edit"> |
+ <h2>Dieser Begriff</h2> |
+ </s:if> |
+ <s:else> |
+ <h2>Neuer Begriff</h2> |
+ </s:else> |
+ |
+ <s:form action="saveTerm"> |
+ <s:hidden name="edit" /> |
+ <s:hidden name="term.objectId" /> |
+ <s:textfield name="term.name" label="Name" /> |
+ <s:if test="edit"> |
+ <s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" /> |
+ Umbenennen</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> |
+ |
+ <s:if test="termList.size() == 0"> |
+ <p>Keine Begriffe eingegeben</p> |
+ </s:if> |
+ <s:else> |
+ <h2>Gespeicherte Begriffe</h2> |
+ <table> |
+ <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="%{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 |
/terms.jsp |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |