WebEes-matrixFAQsJSXLCARSOpenCV2-CookbookPHPXES

Català-Valencià - Catalan中文 - Chinese (Simplified)中文 - Chinese (Traditional)Česky - CzechDansk - DanishNederlands - DutchEnglish - EnglishSuomi - FinnishFrançais - FrenchDeutsch - Germanעברית - Hebrewहिंदी - HindiMagyar - HungarianBahasa Indonesia - IndonesianItaliano - Italian日本語 - Japanese한국어 - KoreanМакедонски - Macedonianमराठी - MarathiNorsk - NorwegianPolski - PolishPortuguês - PortuguesePortuguês - Portuguese (Brazil)Русский - RussianSlovenčina - SlovakSlovenščina - SlovenianEspañol - SpanishSvenska - SwedishTürkçe - TurkishУкраїнська - UkrainianOëzbekcha - Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/WebContent/user/ @ 36

  → /trunk/WebContent/user/ @ 37

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Last modification

• Rev 37 2011-01-15 10:21:24
• Author: PointedEars

• Log message:

  * mainTemplate.jsp
    - Moved application name to back for better bookmarks
  
  * Terms.java
    - Added relationship links
  
  * Relationships:
    - Added term links
  
  * General:
    - Implemented history for term+relationship create and update
      (TODO: also for delete, using flag)
    - Removed unnecessary interfaces
    - Unifiorm method names in actions and DAO
    - Unified UI and actions (only one template for CRUD of an object)
    - Removed edit=false assignment in favor of redirection

Ignore whitespace Rev 36 → Rev 37

/trunk/WebContent/user/nav.jsp
1,19 → 1,15
<div id="navigation">
<ul>
<li>Begriffe
<li>Ontologie
<ul>
<li><a href="listTerms">Anzeigen/Bearbeiten</a></li>
<li><a href="listTerms">Begriffe</a></li>
<li><a href="listRelationships">Beziehungen</li>
</ul></li>
<li>Beziehungen
<li>Benutzerfunktionen
<ul>
<li><a href="listRelationships">Anzeigen/Bearbeiten</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>
</div>

/trunk/WebContent/user/relationships.jsp
29,32 → 29,64
</p>
</s:if>
<s:if test="edit">
<h2>Diese Beziehung</h2>
<s:if test="terms.size() == 0">
<p>Bitte definieren Sie zuerst mindestens einen
<s:url id="termURL" action="listTerms" />
<s:a href="%{termURL}">Begriff</s:a>.</p>
</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="" />
&Auml;nderungen speichern</s:submit>
<h2>Diese Beziehung</h2>
</s:if>
<s:else>
<s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
Hinzuf&uuml;gen</s:submit>
<h2>Neue Beziehung</h2>
</s:else>
</s:form>
<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:textarea name="comment" label="Aenderungskommentar (optional)" />
<s:if test="edit">
<s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
&Auml;nderungen 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>
</s:else>
<s:if test="edit">
<h3>&Auml;nderungsprotokoll</h3>
<table>
<thead>
<th>Datum</th>
<th>Benutzer</th>
<th>Aktion</th>
<th>Neuer Wert</th>
<th>Kommentar</th>
</thead>
<tbody>
<s:iterator value="relationship.object.history" status="stat">
<tr>
<td><s:date name="date" format="yyyy-MM-dd hh:mm:ss" /></td>
<td><s:property value="user.firstname" /> <s:property value="user.lastname"/></td>
<td><s:property value="actionType.name" /></td>
<td><s:property value="value" /></td>
<td><s:property value="comment" /></td>
</tr>
</s:iterator>
</tbody>
</table>
</s:if>
<h2>Definierte Beziehungen</h2>
<s:if test="relationshipList.size() == 0">
<p>Keine Beziehungen definiert</p>
69,21 → 101,25
<tbody>
<s:iterator value="relationshipList" status="stat">
<tr>
<td><s:property value="termFrom.name" /></td>
<td><s:url id="term1URL" action="editTerm">
<s:param name="id" value="%{termFrom.objectId}"></s:param>
</s:url><s:a href="%{term1URL}"><s:property value="termFrom.name" /></s:a></td>
<td><s:property value="relationshipType.nameFrom" /></td>
<td><s:property value="termTo.name" /></td>
<td><s:url id="term2URL" action="editTerm">
<s:param name="id" value="%{termTo.objectId}"></s:param>
</s:url><s:a href="%{term2URL}"><s:property value="termTo.name" /></s:a></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>
<s:param name="id" value="%{objectId}"></s:param>
</s:url><s:a href="%{editURL}"><img
src="${contextPath}/resources/icons/page_white_edit.png"
alt="Bearbeiten" title="Bearbeiten" /></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>
</s:url><s:a href="%{deleteURL}" onclick="return window.confirm('Beziehung loeschen?')"><img
src="${contextPath}/resources/icons/delete.png"
alt="L&ouml;schen" title="L&ouml;schen" /></s:a></td>
</tr>
</s:iterator>
</tbody>

/trunk/WebContent/user/terms.jsp
4,72 → 4,169
<html>
<head>
<s:if test="edit">
<title>Begriff bearbeiten</title>
</s:if>
<s:else>
<title>Begriffe anzeigen/bearbeiten</title>
</s:else>
<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&uuml;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" />
<body>
<s:if test="edit">
<s:submit type="button"><img src="${contextPath}/resources/icons/tick.png" alt="" />
Umbenennen</s:submit>
<h1>Begriff bearbeiten</h1>
</s:if>
<s:else>
<s:submit type="button"><img src="${contextPath}/resources/icons/add.png" alt="" />
Hinzuf&uuml;gen
</s:submit>
<h1>Begriffe anzeigen/bearbeiten</h1>
</s:else>
</s:form>
<s:if test="added">
<p>Der Begriff <b><s:text name="savedTerm.name"/></b> wurde hinzugef&uuml;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" required="true" />
<s:textarea name="comment" label="Aenderungskommentar (optional)" />
<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&uuml;gen
</s:submit>
</s:else>
</s:form>
<s:if test="edit">
<h3>Beziehungen</h3>
<s:if test="term.relationshipsForTermFrom.size() == 0 && term.relationshipsForTermTo.size() == 0">
<p>Dieser Begriff steht mit keinem anderen in Beziehung.</p>
</s:if>
<s:else>
<p>Dieser Begriff steht zur Zeit in folgenden Beziehungen:</p>
<table>
<thead>
<th>Begriff 1</th>
<th>Beziehungstyp</th>
<th>Begriff 2</th>
</thead>
<tbody>
<s:iterator value="term.relationshipsForTermFrom">
<tr>
<td><s:property value="termFrom.name" /></td>
<td><s:property value="relationshipType.nameFrom" /></td>
<td><s:url id="term1URL" action="editTerm">
<s:param name="id" value="%{termTo.objectId}"></s:param>
</s:url><s:a href="%{term1URL}"><s:property value="termTo.name" /></s:a></td>
<td><s:url id="editURL" action="editRelationship">
<s:param name="id" value="%{objectId}" />
</s:url><s:a href="%{editURL}"><img
src="${contextPath}/resources/icons/page_white_edit.png"
alt="Bearbeiten" title="Bearbeiten" />
</s:a></td>
<td><s:url id="deleteURL" action="deleteRelationship">
<s:param name="id" value="%{objectId}"></s:param>
</s:url><s:a href="%{deleteURL}"
onclick="return window.confirm('Beziehung loeschen?')"><img
src="${contextPath}/resources/icons/delete.png"
alt="L&ouml;schen" title="L&ouml;schen""/></s:a></td>
</tr>
</s:iterator>
<s:iterator value="term.relationshipsForTermTo">
<tr>
<td><s:property value="termTo.name" /></td>
<td><s:property value="relationshipType.nameTo" /></td>
<td><s:url id="term2URL" action="editTerm">
<s:param name="id" value="%{termFrom.objectId}" />
</s:url><s:a href="%{term2URL}"><s:property value="termFrom.name" /></s:a></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="Bearbeiten" title="Bearbeiten" />
</s:a></td>
<td><s:url id="deleteURL" action="deleteRelationship">
<s:param name="id" value="%{objectId}"></s:param>
</s:url><s:a href="%{deleteURL}"
onclick="return window.confirm('Beziehung loeschen?')"><img
src="${contextPath}/resources/icons/delete.png"
alt="L&ouml;schen" title="L&ouml;schen" /></s:a></td>
</tr>
</s:iterator>
</tbody>
</table>
</s:else>
<s:if test="termList.size() == 0">
<p>Keine Begriffe eingegeben</p>
</s:if>
<s:else>
<h3>&Auml;nderungsprotokoll</h3>
<s:if test="term.object.history.size() == 0">
<p>Es sind keine &Auml;nderungen f&uuml;r diesen Begriff protokolliert.</p>
</s:if>
<s:else>
<table>
<thead>
<th>Datum</th>
<th>Benutzer</th>
<th>Aktion</th>
<th>Neuer Name</th>
<th>Kommentar</th>
</thead>
<tbody>
<s:iterator value="term.object.history" status="stat">
<tr>
<td><s:date name="date" format="yyyy-MM-dd hh:mm:ss" /></td>
<td><s:property value="user.firstname" /> <s:property value="user.lastname"/></td>
<td><s:property value="actionType.name" /></td>
<td><s:property value="value" /></td>
<td><s:property value="comment" /></td>
</tr>
</s:iterator>
</tbody>
</table>
</s:else>
</s:if>
<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:if test="termList.size() == 0">
<p>Es wurden noch keine Begriffe eingegeben.</p>
</s:if>
<s:else>
<table>
<tbody>
<s:iterator value="termList" status="stat">
<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>
</s:url>
<tr>
<td><s:a href="%{editURL}"><s:property value="name" /></s:a></td>
<td><s:a href="%{editURL}"><img
src="${contextPath}/resources/icons/page_white_edit.png"
alt="Bearbeiten" title="Bearbeiten" /></s:a></td>
<s:if test="false">
<td><s:url id="deleteURL" action="deleteTerm">
<s:param name="id" value="%{objectId}"></s:param>
</s:url><s:a href="%{deleteURL}" onclick="return window.confirm('Begriff loeschen?')"><img
src="${contextPath}/resources/icons/delete.png"
alt="L&ouml;schen" title="L&ouml;schen" /></s:a></td>
</s:if>
</tr>
</s:iterator>
</tbody>
</table>
</s:else>
</body>
</html>