Menu
▾
▴
[Cobricks-cvscommit] drehscheibe-in/web/item index.html.en item.html.de itemcreate.html.de itemdelete.html.de itemsearch.html.de itemupdate.html.de template-date.html template-msg.html template.html templateedit-date.html templateedit-msg.html
Update of /cvsroot/cobricks/drehscheibe-in/web/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30270/item Modified Files: index.html.en item.html.de itemcreate.html.de itemdelete.html.de itemsearch.html.de itemupdate.html.de template-date.html template-msg.html template.html templateedit-date.html templateedit-msg.html Log Message: Index: template-date.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-date.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-date.html 13 Sep 2006 13:09:53 -0000 1.1 +++ template-date.html 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,7 +1,7 @@ #set($format = $portalPresenter.getDateTimeFormatter($language, true)) -<table border="1pt" cellpadding="5pt" width="100%"> +<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%"> <tr><td> #set($imageurl = $item.getAttributeAsString("imageurl")) @@ -9,12 +9,12 @@ <img align="right" valign="top" width="80" src="$imageurl"/> #end -#set($title = $item.getTitle("$!language")) -#if($title) +#set($title = $item.getTitle("$!lang")) +#if("$!title"!="") <b>$title</b> #else <b>$item.getTitle()</b> -<br><font size="-2">(Kein Titel in der angefragten Sprache $language verfügbar.)</font> +<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font> #end <br/> @@ -22,12 +22,12 @@ #set($creationtime = $item.getAttribute("creationtime")) #if($creator) (von - <a href="$contextPath/user/user.html?auserlogin=$creator.getUserLogin()">$creator.getName()</a> + <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a> #if("$!creationtime"!="") , am/um $format.format($creationtime) #end ) -#elseif("$!creationtime"!="") +#elseif($creationtime) (am/um $format.format($creationtime)) #end <p> @@ -38,13 +38,13 @@ <p>Bis: $format.format($endtime)</p> <table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td> -#set($content = $item.getContent("$!language")) +#set($content = $item.getContent("$!lang")) #if("$content"!="") <pre>$content </pre> #else $item.getContent() -<br/>(Kein Inhalt in der angefragten Sprache "$language" verfügbar.) +<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font> #end </td></tr></table><br/> @@ -59,7 +59,7 @@ #end #set($uri = $item.getAttributeAsString("url")) -#if($uri) +#if("$!uri"!="") Link zu zusätzlicher Information:<br/> <a href="$uri">$uri</a><br/><br/> #end @@ -68,8 +68,8 @@ #set($updatetime = $item.getAttribute("updatetime")) #if($updater) Letzte Aktualisierung durch - <a href="$contextPath/user/user.html?auserlogin=$updater.getUserLogin()"> - $updater.getName()</a> + <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)"> + $userPresenter.getUserName($updater)</a> #if($updatetime) , am/um $format.format($updatetime) #end @@ -81,7 +81,7 @@ <p>Kategorien, denen die Mitteilung zugeordnet ist: <ul> #foreach ($c in $item.getAttribute("categories")) - <li>$c.getTitle($language) + <li>$categoryPresenter.getCategory($c).getTitle("$lang") #end #if (!$item.getAttribute("categories")) <li>keine Kategorien Index: itemsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemsearch.html.de,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- itemsearch.html.de 13 Sep 2006 13:28:31 -0000 1.13 +++ itemsearch.html.de 15 Sep 2006 06:38:29 -0000 1.14 @@ -1,76 +1,69 @@ $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) -<em><a href="index.html">Item Component</a> - -<a href="itemsearch.html">Item Search</a> -</em> +<h1>Inhaltssuche</h1> -<h1>Cobricks-2 - Item Search</h1> +#if ("$!xpathquery"!="") -#if ($returnCode == 2004) - <p><div class="error">Failed searching for "$!XPathQuery".</div></p> -#end +#set ($iresult = $itemManager.searchItems("$!xpathquery")) -#if ($returnCode == 1004) -#if ($itemlist.isEmpty()) - <h2>No results found</h2> - <b>No items were found that match your query</b> "$xPathQuery" <br/> - <b>Please try again.</b> +#if ($iresult.isEmpty()) + <h3>Keine Items gefunden.</h3> + <b>Es wurden keine Items gefunden, die zu Ihrer Suchanfrage</b> + "$xpathquery" <b>passen.</b> #else - <h2>$itemlist.size() result(s) found</h2> - <b>Your query</b> "$xPathQuery" <b>led to the following result(s):</b> + <h3>$iresult.size() Items gefunden</h3> + <b>Ihre Suchanfrage</b> "$xpathquery" <b>liefert die folgenden + Resultate:</b> <ul> - #foreach ($item in $itemlist) - #set ($title = false) - #set ($title = $item.getTitle()) - #if ($title) - <li><a href="item.html?itemid=$item.getId()&fromSearch=true">$title</a></li> - #else - <li><a href="item.html?itemid=$item.getId()&fromSearch=true">No title specified for this item</a> - #end -#set ( $accedit = $userPresenter.checkPermission($userId, "item", "update", $i) ) -#set ( $accdel = $userPresenter.checkPermission($userId, "item", "delete", $i) ) +#foreach ($item in $iresult) +#set ( $itemclass = $item.getAttribute("itemclass") ) +#set ($title = false) +#set ($title = $item.getTitle()) +#if ($title) +<li> +<img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)"> +<a href="item.html?itemid=$item.getId()&fromSearch=true">$title</a> +#else +<li> +<img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)"> +<a href="item.html?itemid=$item.getId()&fromSearch=true">kein Titel</a> +#end +#set ( $accedit = $userPresenter.checkPermission($userId, "item", "update", $item) ) +#set ( $accdel = $userPresenter.checkPermission($userId, "item", "delete", $item) ) #if ( "$!accedit" == "true" ) - <a href="itemupdate.html?itemid=$i.getId()">edit</a> #end #if ( "$!accdel" == "true" ) - <a href="/ITEM?cmd=deleteitem&cmd.success=/item/itemlist.html&cmd.error=/item/itemlist.html&itemid=$i.getId()&itemclass=$!itemclass">delete</a> #end - </li> - #end - </ul> +</li> +#end +</ul> #end #end ## Show a textarea where the user can enter its query ## This query is then processed by the ItemServlet -<form action="$contextPath/ITEM" method="get"> +<form action="$contextPath/item/itemsearch.html" method="get"> <table> <tr> - <td><b>Please enter your query here:</b></td> + <td><b>Bitte geben Sie ihre Suchanfrage hier an:</b></td> </tr> <tr> - <td><textarea name="xPathQuery" cols="80" rows="5"></textarea></td> + <td><textarea name="xpathquery" cols="80" rows="5"></textarea></td> </tr> </table> - <input type="hidden" name="cmd" value="xpathsearchitem"> - <input type="hidden" name="cmd.success" value="$contextPath/item/itemsearch.html"> - <input type="hidden" name="cmd.error" value="$contextPath/item/itemsearch.html"> - - <input type="submit" value="Search"/> + <input type="submit" value="Suche durchführen"/> </form> -<p>Examples for queries are:</p> +<p>Beispiele für Suchanfragen sind:</p> <pre> /item[itemclass='item'] /item[itemclass='portalpage' and name='index.html'] /item[itemclass='portalpage'] and /item/folders/category/id=12 </pre> -<form action="$contextPath/item/index.html" method="get"> - <input type="submit" value="Back to item overview"/> -</form> - $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) Index: itemdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemdelete.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- itemdelete.html.de 13 Sep 2006 13:12:22 -0000 1.1 +++ itemdelete.html.de 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,24 +1,13 @@ $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) -<em><a href="index.html">Item Component</a> - -<a href="itemdelete.html">Item Delete</a></em> - -<h1>Cobricks-2 - Item Delete</h1> +<h1>Item Löschen</h1> #if ($returnCode == 1002) - <p><div class="success">Item deleted.</div></p> + <p><div class="success">Item "$itemid" wurde erfolgreich gelöscht.</div></p> #elseif ($returnCode == 2002) - <p><div class="error">Failed deleting item.</div></p> + <p><div class="error">Fehler beim Löschen des Items "$!itemid".</div></p> #end -<form action="$contextPath/ITEM" method="get"> - <input type="hidden" name="cmd" value="deleteitem"/> - <input type="hidden" name="cmd.success" value="$contextPath/item/itemdelete.html"/> - <input type="hidden" name="cmd.error" value="$contextPath/item/itemdelete.html"/> - Item with itemid=<input name="itemid" type="text" size="5"> - <input type="submit" value="Delete"> -</form> - $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) Index: templateedit-msg.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/templateedit-msg.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- templateedit-msg.html 13 Sep 2006 13:09:53 -0000 1.1 +++ templateedit-msg.html 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,8 +1,4 @@ -#if($catid) -#set($selectedCat = $!categoryPresenter.getCategory($catid)) -#end - <table cellspacing="10"> #foreach($lg in $selectedLangs) <tr><td colspan="2"> @@ -14,6 +10,7 @@ nicht nur "Vortrag" oder "Jobangebot", sondern auch Thema)</font> </td></tr> #end + #foreach($lg in $selectedLangs) <tr><td colspan="2"> <b>Inhalt</b> (in <b>$itemPresenter.getLanguageName($lg)</b>, in HTML, @@ -28,7 +25,7 @@ <b>Zufgriff:</b> </td></tr> <tr><td noWrap align=left colSpan=2> -$itemPresenter.printAttrInput($itemclass, "permission", $lang, null, 1, 30, false) +$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false) </td></tr> <tr> @@ -36,22 +33,8 @@ <tr> <td valign="top"> #set ( $categoryclass = "community" ) -#set ( $parentid = "$!parentid" ) -#set ( $catid = "$!catid") -#set ( $title = "$!title") -#set ( $selcatid = $selectedCat.getId() ) <select name="categories" size="10" multiple> -#foreach( $i in $categoryPresenter.getSortedCategories($!categoryclass, $!parentid, $!title, "$!lang") ) -#if("$!selcatid"=="$!i.getId()") - <option value="$!i.getId()" selected> - $!i.getTitle() - </option> -#else - <option value="$!i.getId()"> - $!i.getTitle() - </option> -#end -#end +$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories")) </select> </td> <td vAlign=top>Die Kategorien werden dazu benutzt, das @@ -61,17 +44,18 @@ href="/community/read.html.de">Informationen zu den einzelnen Communities</a>. </td> </tr> -<tr><td noWrap align=left colSpan=2> + +<tr><td nowrap align=left colSpan=2> <b>Verweis zu weiteren Informationen</b> (URL, optional): </td></tr> <tr> <td noWrap align=left colSpan=2> -$itemPresenter.printAttrInput($itemclass, "url", $lang, null, 1, 80, false) +$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false) </td></tr> <tr><td colSpan=2><b>Verfallsdatum:</b></td></tr> <tr><td colSpan=2> -$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, null, 1, 20, false) +$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false) </td></tr> </table> Index: templateedit-date.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/templateedit-date.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- templateedit-date.html 13 Sep 2006 13:09:53 -0000 1.1 +++ templateedit-date.html 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,8 +1,4 @@ -#if($catid) -#set($selectedCat = $!categoryPresenter.getCategory($catid)) -#end - <table cellspacing="10"> #foreach($lg in $selectedLangs) <tr><td colspan="2"> @@ -17,11 +13,11 @@ <tr><td colSpan=2><b>Anfangstermin:</b></td></tr> <tr><td colSpan=2> -$itemPresenter.printAttrInput($itemclass, "starttime", $lang, null, 1, 20, false) +$itemPresenter.printAttrInput($itemclass, "starttime", $lang, $velocityContext, 1, 20, false) </td></tr> <tr><td colSpan=2><b>Endtermin:</b></td></tr> <tr><td colSpan=2> -$itemPresenter.printAttrInput($itemclass, "endtime", $lang, null, 1, 20, false) +$itemPresenter.printAttrInput($itemclass, "endtime", $lang, $velocityContext, 1, 20, false) </td></tr> #foreach($lg in $selectedLangs) @@ -38,7 +34,7 @@ <b>Zufgriff:</b> </td></tr> <tr><td noWrap align=left colSpan=2> -$itemPresenter.printAttrInput($itemclass, "permission", $lang, null, 1, 30, false) +$itemPresenter.printAttrInput($itemclass, "permission", $lang, $velocityContext, 1, 30, false) </td></tr> <tr> @@ -46,22 +42,8 @@ <tr> <td valign="top"> #set ( $categoryclass = "community" ) -#set ( $parentid = "$!parentid" ) -#set ( $catid = "$!catid") -#set ( $title = "$!title") -#set ( $selcatid = $selectedCat.getId() ) <select name="categories" size="10" multiple> -#foreach( $i in $categoryPresenter.getSortedCategories($!categoryclass, $!parentid, $!title, "$!lang") ) -#if("$!selcatid"=="$!i.getId()") - <option value="$!i.getId()" selected> - $!i.getTitle() - </option> -#else - <option value="$!i.getId()"> - $!i.getTitle() - </option> -#end -#end +$itemPresenter.getCategoryOptions("$!categoryclass","$lang",$item.getAttribute("categories")) </select> </td> <td vAlign=top>Die Kategorien werden dazu benutzt, das @@ -71,12 +53,17 @@ href="/community/read.html.de">Informationen zu den einzelnen Communities</a>. </td> </tr> + <tr><td noWrap align=left colSpan=2> <b>Verweis zu weiteren Informationen</b> (URL, optional): </td></tr> <tr><td noWrap align=left colSpan=2> -$itemPresenter.printAttrInput($itemclass, "url", $lang, null, 1, 80, false) +$itemPresenter.printAttrInput($itemclass, "url", $lang, $velocityContext, 1, 80, false) </td></tr> +<tr><td colSpan=2><b>Verfallsdatum:</b></td></tr> +<tr><td colSpan=2> +$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $velocityContext, 1, 20, false) +</td></tr> </table> Index: itemcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemcreate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- itemcreate.html.de 13 Sep 2006 13:09:53 -0000 1.1 +++ itemcreate.html.de 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,12 +1,19 @@ $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) -#set ( $auserlogin = "$!auserlogin" ) -#if ( $auserlogin == "" ) +#set ($lang = "de") +#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) +#if(!$selectedLangs) +#set ($selectedLangs = [$lang]) +#end + #set ( $auserlogin = $userLogin ) #end #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) #set ( $auser = $userManager.getUser($auserid)) +#if ("$!author"=="") +#set ($author = $auser.getName()) +#end #if("$!itemclass"=="") #set($itemclass = "item") @@ -25,12 +32,6 @@ #end</ul></div><br/> #end -#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) -#if(!$selectedLangs) -#set($selectedLangs = [$lang]) -#end - - <form action="$contextPath/ITEM" method="post" enctype="multipart/form-data"> <input type="hidden" name="itemclass" value="${itemclass}"/> <input type="hidden" name="cmd" value="createitem"/> @@ -43,10 +44,6 @@ #end #set ($itemtemplate = $itemPresenter.getItemEditTemplate("$!itemclass")) -#if ($itemtemplate == "") -#set ( $itemtemplate = "/item/templateedit.html" ) -#end - $portalPresenter.parse("$itemtemplate",$portalRequest,"/item/templateedit.html") <p> Index: item.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/item.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- item.html.de 13 Sep 2006 13:09:53 -0000 1.1 +++ item.html.de 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,21 +1,27 @@ $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) -#set ( $auserlogin = "$!auserlogin" ) -#if ( $auserlogin == "" ) -#set ( $auserlogin = $userLogin ) +#set ($lang = "de") +#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) +#if(!$selectedLangs) +#set ($selectedLangs = [$lang]) #end -#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) -#set ( $auser = $userManager.getUser($auserid)) #set($item = $itemPresenter.getItem($itemid)) +#if(!$item) +<h1>Item anzeigen</h1> +<div class="error">Item mit Identifikator "$!itemid" existiert nicht.</div> +#else + #set($itemclass = $item.getItemClass()) #set ( $itemname = $itemManager.getOntology().getClass("$itemclass").getDescription("de") ) #if ("$!itemname"=="") #set ($itemname = "Item") #end +#if ( $itemclass!="fww") <h3>$itemname</h3> +#end #if ($returnCode == 1005) <p><div class="success">Anmerkung angefügt.</div></p> @@ -45,10 +51,14 @@ #set ($itemtemplate = $itemPresenter.getItemTemplate("details", $item)) <p> -$portalPresenter.parse("$itemtemplate",$portalRequest,"/item/template.html") -</p> +$portalPresenter.parse("$itemtemplate",$portalRequest,"/item/template.html")<br> +<div align="right"><form action="/item/itemupdate.html" method="get"> +<input type="hidden" name="itemid" value="$itemid"> +<input type="submit" value="Editieren"></form></div> +</p> +#if ("$!itemdisplayattachments"!="false") ## Print attachments <h3>Attachments:</h3> <ul> @@ -73,7 +83,9 @@ </form> <br/> +#end +#if ("$!itemdisplayannotations"!="false") ## Print annotations and a form to insert annotations <h3>Anmerkungen:</h3> <ul> @@ -100,8 +112,7 @@ </form> <br/> - -<a href="/item/itemupdate.html?itemid=$itemid">Item editieren</a> - +#end +#end $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) Index: itemupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemupdate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- itemupdate.html.de 13 Sep 2006 13:09:53 -0000 1.1 +++ itemupdate.html.de 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,171 +1,88 @@ $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) -<h1>Cobricks-2 - Item Update</h1> +#set ($lang = "de") +#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) +#if(!$selectedLangs) +#set ($selectedLangs = [$lang]) +#end + +#set ( $auserlogin = "$!auserlogin" ) +#if ( $auserlogin == "" ) +#set ( $auserlogin = $userLogin ) +#end +#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) +#set ( $auser = $userManager.getUser($auserid)) #if($createdItem) - #set($itemid= $!createdItem.getLocalId()) - #set($item = $itemManager.getItem($itemid)) +#set($itemid= $!createdItem.getLocalId()) +#set($item = $itemManager.getItem($itemid)) +#elseif($itemid) +#set($item = $itemPresenter.getItem($itemid)) #end -#if($itemid) - #set($item = $itemPresenter.getItem($itemid)) - #set($item = $itemManager.getItem($itemid)) + +#if(!$item) +<h1>Item editieren</h1> +<div class="error">Item mit Identifikator "$!itemid" existiert nicht.</div> +#else + +#set ($itemclass = $item.getItemClass()) +#set ($itemname = $itemManager.getOntology().getClass("$itemclass").getDescription("de") ) +#if ("$!itemname"=="") +#set ($itemname = "Item") #end +<h1>$!itemname editieren</h1> + #if($returnCode == 1003) -<div class="success">Successfully updated item.</div><br/> +<div class="success">Item erfolgreich aktualisiert.</div><br/> #elseif($returnCode == 2003) -<div class="error">Failed updating item. The following error(s) ocurred: +<div class="error">Fehler beim Aktualisieren des Items: <ul>#foreach($error in $errors) <li>$corePresenter.printErrorMessage($error, "$!lang")</li> #end</ul></div><br/> #end -#set($item = $itemPresenter.getItem($itemid)) -#if(!$itemPresenter.isInteger($itemid)) -<div class="error">Item Id $!itemid is not an integer.</div> -<form action="$contextPath/item/itemupdate_start.html" method="get"> - <input type="submit" value="Back"/> -</form> -#elseif(!$item) -<div class="error">Item with item Id $!itemid does not exist.</div> -<form action="$contextPath/item/itemupdate_start.html" method="get"> - <input type="submit" value="Back"/> -</form> -#else - #set ($acc = $userPresenter.checkPermission("$userId", "item", "update", "itemid=$itemid")) #if ($acc == "false") <div class="error"> -You do not have the appropriate permissions to update this item. +Sie haben nicht ausreichend Rechte um das gewünschte Item mit dem +Identifikator "$!itemid" zu editieren. </div> #else -<form action="$contextPath/ITEM" method="get"> -<input type="hidden" name="cmd" value="deleteitem"/> -<input type="hidden" name="cmd.success" value="$contextPath/item/itemdelete.html"/> -<input type="hidden" name="cmd.error" value="$contextPath/item/itemdelete.html"/> -<input type="hidden" name="itemid" value="$itemid"/> -<p> - <table><tr> - <td><input type="submit" value="Delete"/></td> - <td>(if you want to delete this item)</td> - </tr></table> -</p> -</form> - #set($itemclass = $item.getItemClass()) -#set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) -#if(!$selectedLangs) - #set($selectedLangs = [$lang]) -#end <form action="$contextPath/ITEM" method="get"> <input type="hidden" name="itemid" value="$!itemid"> -#foreach($lg in $selectedLangs) - <input type="hidden" name="_languages" value="${lg}"/> -#end - -<p> -<b>Item class</b> -$itemPresenter.printDropDown("itemclass", $itemclass, "itemclass", false) -<p> - -<table cellspacing="10"> -#set($CURRENT_ATTR = "title") -$portalPresenter.parse("attribute_fields.html", $portalRequest) -#set($CURRENT_ATTR = "content") -$portalPresenter.parse("attribute_fields.html", $portalRequest) -</table> - - <table cellspacing="10"><tr valign="top"> - <td><b>State</b><br/>$itemPresenter.printDescription($itemclass, "state", $lang)</td> - <td>$itemPresenter.printDropDown("state", $itemPresenter.printAttribute($item.getAttribute("state"), $lang), "state", false)</td> - <td align="right"><b>Location</b><br/>$itemPresenter.printDescription($itemclass, "location", $lang)</td> - <td>$itemPresenter.printAttrInput($itemclass, "location", $lang, $itemPresenter.printAttribute($item.getAttribute("location"), $lang), 1, 50, false)</td> - </tr><tr valign="top"> - <td><b>Expiration<br/>time</b><br/>$itemPresenter.printDescription($itemclass, "expirationtime", $lang)</td> - <td>$itemPresenter.printAttrInput($itemclass, "expirationtime", $lang, $itemPresenter.printAttribute($item.getAttribute("expirationtime"), $lang), 1, 20, false)</td> - <td align="right"><b>Origin</b><br/>$itemPresenter.printDescription($itemclass, "origin", $lang)</td> - <td>$itemPresenter.printAttrInput($itemclass, "origin", $lang, $itemPresenter.printAttribute($item.getAttribute("origin"), $lang), 1, 50, false)</td> - </tr></table> -</p> - -<input type="hidden" name="globalid" value="$itemPresenter.printAttribute($item.getAttribute("globalid"), $lang)"/> -<input type="hidden" name="updater" value="${userId}"/> -<input type="hidden" name="updatetime" value="$portalPresenter.getCurrentDateTime($lang)"/> -<input type="hidden" name="creator" value="$itemPresenter.printAttribute($item.getAttribute("creator"), $lang)"/> -<input type="hidden" name="creationtime" value="$itemPresenter.printAttribute($item.getAttribute("creationtime"), $lang)"/> -<!-- TBD --><input type="hidden" name="_lang" value="${lang}"/> <input type="hidden" name="cmd" value="updateitem"/> <input type="hidden" name="cmd.success" value="$contextPath/item/itemupdate.html"/> <input type="hidden" name="cmd.error" value="$contextPath/item/itemupdate.html"/> -<input type="hidden" name="cmd.changedItemClass" value="$contextPath/item/itemupdate_changedIC.html"/> -#set($allAttrs = $itemPresenter.getAttributeNames($itemclass)) -#set($itemAttrs = $itemPresenter.getAttributeNames("item")) -#set($attrs = $itemPresenter.removeDuplicates($allAttrs, $itemAttrs)) - -#if(!$attrs.isEmpty()) - <p> - <table cellspacing="10"> - #foreach($attr in $attrs) - #set($CURRENT_ATTR = $attr) - $portalPresenter.parse("attribute_fields.html", $portalRequest) - #end - </table> - </p> +#foreach($lg in $selectedLangs) + <input type="hidden" name="_languages" value="${lg}"/> #end -<hr/> +#set ($itemtemplate = $itemPresenter.getItemEditTemplate("$!itemclass")) +$itemPresenter.setItemAttrInContext($item, $velocityContext) +$portalPresenter.parse("$itemtemplate",$portalRequest,"/item/templateedit.html") <p> -<h2>Change/add custom attributes:</h2> -#set($temp = $item.getAttributeNames()) -#set($custattrs = $itemPresenter.removeDuplicates($temp, $allAttrs)) - <table cellspacing="10"> - #if(!$custattrs.isEmpty()) - <tr><td colspan="4"><b>Previously defined:</b></td></tr> - #foreach($cattr in $custattrs) - <tr valign="top"> - <td><b>$cattr</b></td> - <td colspan="3">$itemPresenter.printNewAttrInput($cattr, $itemPresenter.printAttribute($item.getAttribute($cattr), $lang), 80)</td> - </tr> - #end - #end - <tr><td colspan="4"><b>Defined by yourself:</b></td></tr> - <tr valign="top"> - <td><b>Attribute name</b></td> - <td>$itemPresenter.printNewAttrInput("_customAname_1", null, 10)</td> - <td><b>Attribute value</b></td> - <td>$itemPresenter.printNewAttrInput("_customAvalue_1", null, 80)</td> - </tr> - <tr valign="top"> - <td><b>Attribute name</b></td> - <td>$itemPresenter.printNewAttrInput("_customAname_2", null, 10)</td> - <td><b>Attribute value</b></td> - <td>$itemPresenter.printNewAttrInput("_customAvalue_2", null, 80)</td> - </tr> - <tr valign="top"> - <td><b>Attribute name</b></td> - <td>$itemPresenter.printNewAttrInput("_customAname_3", null, 10)</td> - <td><b>Attribute value</b></td> - <td>$itemPresenter.printNewAttrInput("_customAvalue_3", null, 80)</td> - </tr> - </table> +<input type="submit" value="$itemname aktualisieren"/> </p> -<hr/> -<p> - <table><tr> - <td><input type="submit" value="Save changes"/></td> - <td><input type="reset" value="Reset all values"/></td> - </tr></table> -</p> </form> +<div align="right"> +<form action="$contextPath/ITEM" method="get"> +<input type="hidden" name="cmd" value="deleteitem"/> +<input type="hidden" name="cmd.success" value="$contextPath/item/itemdelete.html"/> +<input type="hidden" name="cmd.error" value="$contextPath/item/itemdelete.html"/> +<input type="hidden" name="itemid" value="$itemid"/> +<input type="submit" value="Item löschen"/> +</form></div> #end Index: template-msg.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-msg.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-msg.html 13 Sep 2006 13:09:53 -0000 1.1 +++ template-msg.html 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,7 +1,7 @@ -#set($format = $portalPresenter.getDateTimeFormatter($language, true)) +#set($format = $portalPresenter.getDateTimeFormatter($lang, true)) -<table border="1pt" cellpadding="5pt" width="100%"> +<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%"> <tr><td> #set($imageurl = $item.getAttributeAsString("imageurl")) @@ -9,12 +9,12 @@ <img align="right" valign="top" width="80" src="$imageurl"/> #end -#set($title = $item.getTitle("$!language")) -#if($title) +#set($title = $item.getTitle("$!lang")) +#if("$!title"!="") <b>$title</b> #else <b>$item.getTitle()</b> -<br><font size="-2">(Kein Titel in der angefragten Sprache $language verfügbar.)</font> +<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font> #end <br/> @@ -22,7 +22,7 @@ #set($creationtime = $item.getAttribute("creationtime")) #if($creator) (von - <a href="$contextPath/user/user.html?auserlogin=$creator.getUserLogin()">$creator.getName()</a> + <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a> #if("$!creationtime"!="") , am/um $format.format($creationtime) #end @@ -33,13 +33,13 @@ <p> <table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td> -#set($content = $item.getContent("$!language")) +#set($content = $item.getContent("$!lang")) #if("$content"!="") <pre>$content </pre> #else $item.getContent() -<br/>(Kein Inhalt in der angefragten Sprache "$language" verfügbar.) +<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font> #end </td></tr></table><br/> @@ -54,7 +54,7 @@ #end #set($uri = $item.getAttributeAsString("url")) -#if($uri) +#if("$!uri"!="") Link zu zusätzlicher Information:<br/> <a href="$uri">$uri</a><br/><br/> #end @@ -63,8 +63,8 @@ #set($updatetime = $item.getAttribute("updatetime")) #if($updater) Letzte Aktualisierung durch - <a href="$contextPath/user/user.html?auserlogin=$updater.getUserLogin()"> - $updater.getName()</a> + <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)"> + $userPresenter.getUserName($updater)</a> #if($updatetime) , am/um $format.format($updatetime) #end @@ -76,7 +76,7 @@ <p>Kategorien, denen die Mitteilung zugeordnet ist: <ul> #foreach ($c in $item.getAttribute("categories")) - <li>$c.getTitle($language) + <li>$categoryPresenter.getCategory($c).getTitle("$lang") #end #if (!$item.getAttribute("categories")) <li>keine Kategorien Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 13 Sep 2006 13:09:53 -0000 1.1 +++ index.html.en 15 Sep 2006 06:38:29 -0000 1.2 @@ -17,6 +17,10 @@ <li><a href="itemcreate.html?itemclass=tummsg">Mitteilung (tummsg)</a> <li><a href="itemcreate.html?itemclass=tumdate">Veranstaltungsankündigung (tumdate)</a> <p> +<li><a href="itemcreate.html?itemclass=fww">Eintrag in Fakultätswegweiser (fww)</a> +<p> + +<p> <li><a href="termin.html">Veranstaltungsankündigung - offiziell (odate)</a> <li><a href="bookmark.html">Mitteilung (bookmark)</a> <p> @@ -24,16 +28,11 @@ <li><a href="idp.html">IdP-Angebot (da)</a> <li><a href="sypro.html">Systementwicklungsprojektangebot (sypro)</a> <p> -<li><a href="job.html">Jobangebot (da)</a> -<p> -<li><a href="sypro.html">Systementwicklungsprojektangebot (fww)</a> -<li><a href="sypro.html">Systementwicklungsprojektangebot (vwm)</a> -<li><a href="sypro.html">Systementwicklungsprojektangebot (fipro)</a> -<li><a href="sypro.html">Systementwicklungsprojektangebot (fipra)</a> -<li><a href="sypro.html">Systementwicklungsprojektangebot (fidoc)</a> -<li><a href="sypro.html">Systementwicklungsprojektangebot (conv)</a> +<li><a href="job.html">Jobangebot (job)</a> </ul> +<p>Ausserdem können Sie <a href="itemsearch.html">im Bestand der Items +suchen</a>.</p> <table width="100%" border=0> <tbody> @@ -51,16 +50,10 @@ #foreach ($i in $iresult) #set ( $itemclass = $i.getAttribute("itemclass") ) <tr><td vAlign=top> - #if($itemclass=="diplom") - <img alt=- src="images/itemtypeicon-da.gif"> - #elseif($itemclass=="sep") - <img alt=- src="images/itemtypeicon-sypro.gif"> - #else - <img alt=- src="images/itemtype.gif"> - #end + <img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)"> </td> <td> - <a href="/item/item.html?itemid=$i.getId()">$i.getTitle() xxx</a> + <a href="/item/item.html?itemid=$i.getId()">$i.getTitle()</a> #if($i.getAttribute("expirationtime")) [$i.getAttribute("expirationtime")] #end @@ -87,10 +80,10 @@ #foreach ($i in $iresult) #set ( $itemclass = $i.getAttribute("itemclass") ) <tr><td vAlign=top> - <img alt=- src="$itemPresenter.getItemTypeIcon()"> + <img alt=- src="$itemPresenter.getItemTypeIcon($!itemclass)"> </td> <td> - <a href="/item/item.html?itemid=$i.getId()">$i.getTitle()</a> + <a href="/item/item.html?itemid=$i.getId()">$i.getTitle() xxx</a> #if($i.getAttribute("expirationtime")) [$i.getAttribute("expirationtime")] #end Index: template.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template.html 13 Sep 2006 13:09:53 -0000 1.1 +++ template.html 15 Sep 2006 06:38:29 -0000 1.2 @@ -1,6 +1,8 @@ ## default item display (if no special display was defined in the ## properties +#set($format = $portalPresenter.getDateTimeFormatter($language, true)) + ## Divide the attributes of this item into two categories: ## 1. The standard attributes (standardAttrs): Attributes that are ## defined in the ontology @@ -10,9 +12,8 @@ #set($map = $itemPresenter.categorizeItemAttributes($item)) #set($standardAttrs = $map.get("standard")) #set($additionalAttrs = $map.get("additional")) -#set($format = $portalPresenter.getDateTimeFormatter($language, true)) -<table border="1pt" cellpadding="5pt" width="100%"> +<table border="1" cellspacing="0pt" cellpadding="5pt" width="100%"> <tr><td> #set($imageurl = $standardAttrs.get("imageurl")) @@ -20,32 +21,31 @@ <img align="right" valign="top" width="80" src="$imageurl"/> #end -#set($title = $item.getTitle("$!language")) -<h2> -#if($title) -$title +#set($title = $item.getTitle("$!lang")) +#if("$!title"!="") +<b>$title</b> #else -$item.getTitle() -<br><font size="-2">Kein Titel in der angefragten Sprache $language verfügbar.)</font> +<b>$item.getTitle()</b> +<br><font size="-2">(Kein Titel in der angefragten Sprache "$lang" verfügbar.)</font> #end -</h2> +<br/> -#set($creator = $standardAttrs.get("creator")) -#set($creationtime = $standardAttrs.get("creationtime")) +#set($creator = $item.getAttribute("creator")) +#set($creationtime = $item.getAttribute("creationtime")) #if($creator) - (veröffentlicht durch - <a href="$contextPath/user/user.html?auserlogin=$creator.getUserLogin()">$creator.getName()</a> + (von + <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($creator)">$userPresenter.getUserName($creator)</a> #if("$!creationtime"!="") , am/um $format.format($creationtime) #end -)<br/><br/> +) #elseif($creationtime) - (veröffentlicht am/um $format.format($creationtime))<br/><br/> + (am/um $format.format($creationtime)) #end -<br/> +<p> #set($location = $standardAttrs.get("location")) -#if($location) +#if("$!location"!="") <b>Ort:</b> $location<br/><br/> #end @@ -55,27 +55,28 @@ #end <table width="95%"><tr bgcolor="#dfdfdf" width="100%"><td> -#set($content = $item.getContent("$!language")) +#set($content = $item.getContent("$!lang")) #if("$content"!="") <pre>$content </pre> #else -Kein Inhalt in der angefragten Sprache $language verfügbar. +$item.getContent() +<br/><font size="-2">(Kein Inhalt in der angefragten Sprache "$lang" verfügbar.)</font> #end </td></tr></table><br/> #set($uri = $standardAttrs.get("url")) -#if($uri) +#if("$!uri"!="") Link zu zusätzlicher Information:<br/> <a href="$uri">$uri</a><br/><br/> #end -#set($updater = $standardAttrs.get("updater")) -#set($updatetime = $standardAttrs.get("updatetime")) +#set($updater = $item.getAttribute("updater")) +#set($updatetime = $item.getAttribute("updatetime")) #if($updater) Letzte Aktualisierung durch - <a href="$contextPath/user/user.html?auserlogin=$updater.getUserLogin()"> - $updater.getName()</a> + <a href="$contextPath/user/user.html?auserlogin=$userPresenter.getUserLogin($updater)"> + $userPresenter.getUserName($updater)</a> #if($updatetime) , am/um $format.format($updatetime) #end @@ -87,7 +88,7 @@ <p>Kategorien, denen das Item zugeordnet ist: <ul> #foreach ($c in $standardAttrs.get("categories")) - <li>$c.getTitle($language) + <li>$categoryPresenter.getCategory($c).getTitle("$lang") #end #if (!$standardAttrs.get("categories")) <li>keine Kategorien |
