Menu
▾
▴
cobricks-cvscommit — Information about commits to the CVS repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(11) |
Mar
(106) |
Apr
(146) |
May
(79) |
Jun
(233) |
Jul
(218) |
Aug
(160) |
Sep
(155) |
Oct
(80) |
Nov
(176) |
Dec
(115) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(77) |
Feb
(106) |
Mar
(10) |
Apr
(54) |
May
(29) |
Jun
(29) |
Jul
(65) |
Aug
(80) |
Sep
|
Oct
(42) |
Nov
(45) |
Dec
(33) |
| 2006 |
Jan
(49) |
Feb
(52) |
Mar
(8) |
Apr
(3) |
May
(108) |
Jun
(43) |
Jul
(13) |
Aug
(1) |
Sep
(58) |
Oct
(66) |
Nov
(70) |
Dec
(115) |
| 2007 |
Jan
(26) |
Feb
(3) |
Mar
(17) |
Apr
(1) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael K. <ko...@us...> - 2006-11-13 10:02:20
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13333 Modified Files: User.java UserPresenter.java UserProfileModel.java userontology.xml Log Message: Index: UserPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserPresenter.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- UserPresenter.java 14 Sep 2006 12:21:26 -0000 1.39 +++ UserPresenter.java 13 Nov 2006 10:02:14 -0000 1.40 @@ -603,7 +603,8 @@ return null; } else { if (attrDataType.getTypeName().equalsIgnoreCase("user")) { - Set useridList = (Set)currentUser.getAttributes().get(attrname); + Set useridList = (Set) + currentUser.getAttributes().get(attrname); if (useridList != null) { for (Iterator i = useridList.iterator(); i.hasNext();) { Integer userIdFromList = (Integer)i.next(); @@ -612,9 +613,9 @@ } } } - if (attrDataType.getTypeName().equalsIgnoreCase("category")) { - Set categoryidList = (Set)currentUser.getAttributes().get(attrname); + Set categoryidList = (Set) + currentUser.getAttributes().get(attrname); if (categoryidList != null) { for (Iterator i = categoryidList.iterator(); i.hasNext();) { Integer categoryidFromList = (Integer)i.next(); @@ -624,7 +625,6 @@ } } } - return result; } Index: UserProfileModel.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserProfileModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- UserProfileModel.java 18 Mar 2005 16:11:38 -0000 1.3 +++ UserProfileModel.java 13 Nov 2006 10:02:14 -0000 1.4 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004 Cobricks Group. All rights reserved. + * Copyright (c) 2003-2006 Cobricks Group. All rights reserved. * * This file is part of a free software package; you can redistribute * it and/or modify it under the terms of the Cobricks Software Licence; Index: userontology.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/userontology.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- userontology.xml 26 Oct 2006 10:38:25 -0000 1.17 +++ userontology.xml 13 Nov 2006 10:02:14 -0000 1.18 @@ -121,7 +121,7 @@ <description lang="de">Telefon (privat)</description> <description lang="en">Phone (private)</description> </attr> - <attr name="basic.contact-priv.telecom.fax" type="string(25)"/> + <attr name="basic.contact-priv.telecom.fax" type="string(25)"> </attr> <attr name="basic.contact-work.postal.comment" type="string(50)"> </attr> Index: User.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/User.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- User.java 18 Sep 2006 14:42:29 -0000 1.31 +++ User.java 13 Nov 2006 10:02:14 -0000 1.32 @@ -126,7 +126,7 @@ { String tmps = (String)getAttribute("basic.contact.online.email"); if (tmps == null) - tmps = (String)getAttribute("basic.contact-home.online.email"); + tmps = (String)getAttribute("basic.contact-priv.online.email"); if (tmps == null) tmps = (String)getAttribute("basic.contact-work.online.email"); return tmps; |
|
From: Michael K. <ko...@us...> - 2006-11-09 12:03:57
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28750 Modified Files: ItemManagerImpl.java Log Message: Index: ItemManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemManagerImpl.java,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- ItemManagerImpl.java 18 Oct 2006 16:47:50 -0000 1.73 +++ ItemManagerImpl.java 9 Nov 2006 12:03:51 -0000 1.74 @@ -2191,6 +2191,8 @@ throws CobricksException { // result caching for some seconds to boost performance + if (itemclasses == null) itemclasses = new ArrayList(); + if (categories == null) categories = new ArrayList(); String cachekey = aname+sortasc+itemclasses.toString() +categories.toString()+maxrows; Date tmpd = (Date)searchItemsByTimestampCacheTime.get(cachekey); |
|
From: Michael K. <ko...@us...> - 2006-11-06 09:13:51
|
Update of /cvsroot/cobricks/drehscheibe-in/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6033/user Modified Files: change_password.html.de index.html.de login-success.html.de login.html.de logout.html.de register-success.html.de register.html.de user-allpaths.html.de user-buddylist.html.de user-contact.html user-delete-result.html.de user-delete.html.de user-interests.html.de user-roles.html.de user-search.html.de user.html.de Log Message: Index: user-buddylist.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-buddylist.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- user-buddylist.html.de 18 Oct 2006 16:52:00 -0000 1.5 +++ user-buddylist.html.de 6 Nov 2006 09:13:45 -0000 1.6 @@ -1,170 +1,168 @@ - -$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) - -#set ( $auserlogin = "$!auserlogin" ) -#if ( $auserlogin == "" ) -#set ( $auserlogin = $userLogin ) -#end -#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) -#set ($auser = $userManager.getUser($auserid)) -#set ($auserclass = $auser.getUserClass() ) - -<h1>Benutzerprofil - Freundesliste</h1> - -#set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) -#if ( "$auth" != "true" ) - #if ( "$auserlogin" == "$userLogin" ) - #set ( $auth = "true" ) - #end -#end -#if ( $auth != "true" ) - -<div class="error">Sie haben keine ausreichenden Zugriffsrechte um das -Benutzerprofil von "$auserlogin" zu lesen.</div> - -<p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten -an oder kontaktieren Sie den Plattformadministrator um die notwendigen -Rechte zugewiesen zu bekommen.</p> - -#else - -#if ($auserid == 0) - <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> -#else - -#if ($returnCode == 1001) -<p><div class="error">User with user login $!newUserLogin does not exist, please check your input!</div></p> -<p><div class="info">And try again!</div></p> -#end -#if ($returnCode == 1002) -<p><div class="info">The user you try to add, is already in your buddylist.</div></p> -#end -#if ($returnCode == 1003) -<p><div class="info">It is impossible to add yourself into your buddylist!</div></p> -#end -#if ($returnCode == 1010) -<p><div class="info">Your input is empty!</div></p> -#end -#if ($returnCode == 2001) -<p><div class="info">You have added one new member in your buddylist.</div></p> -#end - -<p>Loginname: $auserlogin</p> - -<form action="/USER" method="post"> -<input type="hidden" name="cmd" value="deleteListMember" /> -<input type="hidden" name="cmd.success" value="/user/user-buddylist.html" /> -<input type="hidden" name="cmd.error" value="/user/user-buddylist.html" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> -<input type="hidden" name="aname" value="pim.network.buddylist" /> -<input type="hidden" name="uid" value="$auserid" /> -<input type="hidden" name="auserlogin" value="$auserlogin" /> - -<p> -<table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> -<tr bgcolor="#eeeeee"> -<td> -<table border="0" cellpadding="5pt"><tr><td> -<em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - -<a href="user-contact.html?auserlogin=$auserlogin">Kontaktdaten</a> - -<a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - -<a href="user-buddylist.html?auserlogin=$auserlogin"><b>Freundesliste</b></a> - -<a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> -</td></tr></table></td> -<td align="right"> -<table border="0" cellpadding="5pt"><tr><td> -<em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> -</td></tr></table> -</td></tr> -<tr><td colspan="2"> - -<table border="0" cellpadding="8pt"> -<tr><td> - -<b>Freundesliste von Benutzer <i>$userManager.getUser($auserid).getName()</i></b> - -<br><br> -<table width="100%"> - <tr bgcolor="dfdfdf"> - <td width="7%"> - <b>Löschen?</b> - </td> - <td width="12%"> - <b>Bild</b> - </td> - <td width="43%"> - <b>Name</b> - </td> - <td width="38%"> - <b>E-Mail</b> - </td> - </tr> - #set ($result = $userPresenter.getUserAttrSet($auserid, "pim.network.buddylist")) - #if ($result.size() > 0) - #foreach ($i in $result) - <tr bgcolor="dfdfdf"> - <td align="center"><input type="checkbox" name="id" value="$i.getId()"></td> - <td valign=center> - #set ($imageuri = "") - #set ($imageuri = $i.getAttribute("basic.personal.imageuri")) - #if ("$!imageuri"!="") - <img src="$imageuri" width="32" height=32> - #end - </td> - <td><a href="/user/card.html?auserlogin=$i.getUserLogin()">$i.getName()</a></td> - <td> - #if ($i.getAttribute("basic.contact-work.online.email")) - $!i.getAttribute("basic.contact-work.online.email") - #else - $!i.getAttribute("basic.contact-private.online.email") - #end</td> - </tr> - #end - #else - <tr><td colspan = "3">Ihre Freundesliste hat noch keine Einträge.</td></tr> - #end -</table> -<br> -<input type="submit" value="Ausgewählte Eintrage löschen"> -</form> - -<p> - -<form action="/USER" method="post" name=frm1 id=frm1> -<input type="hidden" name="cmd" value="addListMember" /> -<input type="hidden" name="cmd.success" value="/user/user-buddylist.html" /> -<input type="hidden" name="cmd.error" value="/user/user-buddylist.html" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> -<input type="hidden" name="aname" value="pim.network.buddylist" /> -<input type="hidden" name="uid" value="$auserid" /> -<input type="hidden" name="auserlogin" value="$auserlogin" /> - -Um jemanden zur Freundesliste hinzuzufügen geben Sie bitte hier ihre -oder seine Benutzerkennung/Benutzerlogin an. - -</p> -<br> -<input type="submit" value="Zur Liste hinzufügen"> -<input name="newUserLogin" size="20" value="$!newUserLogin"> - -<script type="text/javascript"> -// <!-- - document.write("<input type=button value=Suche onClick=\"window.open('/user/user-buddylist-search.html?print=true&auserlogin=$auserlogin','usersearch','width=500,height=500,scrollbar=yes,menu=no');\">"); -// --> -</script> - -<noscript> - <a href="/user/user-buddylist-search.html?auserlogin=$auserlogin">Suche</a> -</noscript> - -</td></tr></table> - -</td></tr></table> - -</form> - -#end - -#end - -$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) + +$portalPresenter.parse("/pageheader.html",$portalRequest) + +#set ( $auserlogin = "$!auserlogin" ) +#if ( $auserlogin == "" ) +#set ( $auserlogin = $userLogin ) +#end +#set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) +#set ($auser = $userManager.getUser($auserid)) +#set ($auserclass = $auser.getUserClass() ) + +<h1>Benutzerprofil - Freundesliste</h1> + +#set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) +#if ( "$auth" != "true" ) + #if ( "$auserlogin" == "$userLogin" ) + #set ( $auth = "true" ) + #end +#end +#if ( $auth != "true" ) + +<div class="error">Sie haben keine ausreichenden Zugriffsrechte um das +Benutzerprofil von "$auserlogin" zu lesen.</div> + +<p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten +an oder kontaktieren Sie den Plattformadministrator um die notwendigen +Rechte zugewiesen zu bekommen.</p> + +#else + +#if ($auserid == 0) + <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> +#else + +#if ($returnCode == 1001) +<p><div class="error">User with user login $!newUserLogin does not exist, please check your input!</div></p> +<p><div class="info">And try again!</div></p> +#end +#if ($returnCode == 1002) +<p><div class="info">The user you try to add, is already in your buddylist.</div></p> +#end +#if ($returnCode == 1003) +<p><div class="info">It is impossible to add yourself into your buddylist!</div></p> +#end +#if ($returnCode == 1010) +<p><div class="info">Your input is empty!</div></p> +#end +#if ($returnCode == 2001) +<p><div class="info">You have added one new member in your buddylist.</div></p> +#end + +<p>Loginname: $auserlogin</p> + +<form action="$contextPath/USER" method="post"> +<input type="hidden" name="cmd" value="deleteListMember" /> +<input type="hidden" name="cmd.success" value="$contextPath/user/user-buddylist.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/user-buddylist.html" /> +<input type="hidden" name="aname" value="pim.network.buddylist" /> +<input type="hidden" name="uid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> + +<p> +<table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> +<tr bgcolor="#eeeeee"> +<td> +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - +<a href="user-contact.html?auserlogin=$auserlogin">Kontaktdaten</a> - +<a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - +<a href="user-buddylist.html?auserlogin=$auserlogin"><b>Freundesliste</b></a> - +<a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> +</td></tr></table></td> +<td align="right"> +<table border="0" cellpadding="5pt"><tr><td> +<em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> +</td></tr></table> +</td></tr> +<tr><td colspan="2"> + +<table border="0" cellpadding="8pt"> +<tr><td> + +<b>Freundesliste von Benutzer <i>$userManager.getUser($auserid).getName()</i></b> + +<br><br> +<table width="100%"> + <tr bgcolor="dfdfdf"> + <td width="7%"> + <b>Löschen?</b> + </td> + <td width="12%"> + <b>Bild</b> + </td> + <td width="43%"> + <b>Name</b> + </td> + <td width="38%"> + <b>E-Mail</b> + </td> + </tr> + #set ($result = $userPresenter.getUserAttrSet($auserid, "pim.network.buddylist")) + #if ($result.size() > 0) + #foreach ($i in $result) + <tr bgcolor="dfdfdf"> + <td align="center"><input type="checkbox" name="id" value="$i.getId()"></td> + <td valign=center> + #set ($imageuri = "") + #set ($imageuri = $i.getAttribute("basic.personal.imageuri")) + #if ("$!imageuri"!="") + <img src="$imageuri" width="32" height=32> + #end + </td> + <td><a href="$contextPath/user/card.html?auserlogin=$i.getUserLogin()">$i.getName()</a></td> + <td> + #if ($i.getAttribute("basic.contact-work.online.email")) + $!i.getAttribute("basic.contact-work.online.email") + #else + $!i.getAttribute("basic.contact-private.online.email") + #end</td> + </tr> + #end + #else + <tr><td colspan = "3">Ihre Freundesliste hat noch keine Einträge.</td></tr> + #end +</table> +<br> +<input type="submit" value="Ausgewählte Eintrage löschen"> +</form> + +<p> + +<form action="$contextPath/USER" method="post" name=frm1 id=frm1> +<input type="hidden" name="cmd" value="addListMember" /> +<input type="hidden" name="cmd.success" value="$contextPath/user/user-buddylist.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/user-buddylist.html" /> +<input type="hidden" name="aname" value="pim.network.buddylist" /> +<input type="hidden" name="uid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> + +Um jemanden zur Freundesliste hinzuzufügen geben Sie bitte hier ihre +oder seine Benutzerkennung/Benutzerlogin an. + +</p> +<br> +<input type="submit" value="Zur Liste hinzufügen"> +<input name="newUserLogin" size="20" value="$!newUserLogin"> + +<script type="text/javascript"> +// <!-- + document.write("<input type=button value=Suche onClick=\"window.open('/user/user-buddylist-search.html?print=true&auserlogin=$auserlogin','usersearch','width=500,height=500,scrollbar=yes,menu=no');\">"); +// --> +</script> + +<noscript> + <a href="$contextPath/user/user-buddylist-search.html?auserlogin=$auserlogin">Suche</a> +</noscript> + +</td></tr></table> + +</td></tr></table> + +</form> + +#end + +#end + +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: change_password.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/change_password.html.de,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- change_password.html.de 12 Sep 2006 12:45:01 -0000 1.7 +++ change_password.html.de 6 Nov 2006 09:13:45 -0000 1.8 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Passwort ändern</h1> @@ -32,15 +32,15 @@ #end #end -<form action="/USER" method=post> +<form action="$contextPath/USER" method=post> <p> <INPUT TYPE=hidden NAME=cmd VALUE=changePassword /> <input type="hidden" name="userclass" value="universityuser" /> -<input type="hidden" name="cmd.success" value="/user/change_password.html" /> -<input type="hidden" name="cmd.error" value="/user/change_password.html" /> +<input type="hidden" name="cmd.success" value="$contextPath/user/change_password.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/change_password.html" /> <input type="hidden" name="auLogin"> #if ($returnCode == 2001) <div class="info">Your password on this platform has been changed!</div> @@ -67,5 +67,4 @@ #end </form> - -#parse ( "pagefooter.html" ) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user-delete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-delete.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- user-delete.html.de 6 Oct 2006 12:36:32 -0000 1.4 +++ user-delete.html.de 6 Nov 2006 09:13:45 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -26,11 +26,10 @@ <p class="standard">Bitte bestätigen Sie hier das Löschen der Benutzerkennung $auserlogin.</p> -<form action="/USER" method="post"> +<form action="$contextPath/USER" method="post"> <input type="hidden" name="cmd" value="delete"/> -<input type="hidden" name="cmd.success" value="/user/user-delete-result.html.de"> -<input type="hidden" name="cmd.error" value="/user/user-delete-result.html.de"> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="cmd.success" value="$contextPath/user/user-delete-result.html.de"> +<input type="hidden" name="cmd.error" value="$contextPath/user/user-delete-result.html.de"> <input type="hidden" name="auserid" value="$auserid" /> <input type="hidden" name="auserlogin" value="$auserlogin" /> <input type="submit" value="Benutzerkennung löschen" /> @@ -38,4 +37,4 @@ #end -$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: login-success.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login-success.html.de,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- login-success.html.de 18 Oct 2006 16:52:00 -0000 1.9 +++ login-success.html.de 6 Nov 2006 09:13:45 -0000 1.10 @@ -1,26 +1,29 @@ -$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) -#set ( $auserid = $userManager.getUserIdForUserLogin($userlogin) ) +#set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #set ($auser = $userManager.getUser($auserid)) <h1>Hallo <b>$auser.getName()</b>,</h1> -<p><div class="success">Das Anmelden war erfolgreich.</div></p> +<p><div class="success">Das Anmelden mit der Kennung "$userLogin" war +erfolgreich.</div></p> <p>Als registrierter Benutzer können Sie jetzt folgende Funktionen ausführen:</P> <p> <ul> -<li><a href="/user/user.html">Benutzerprofil +<li><a href="$contextPath/user/user.html">Benutzerprofil und Interessenseinstellungen editieren</a> -<li><a href="/user/user-search.html">Benutzer suchen</a> +<li><a href="$contextPath/user/user-search.html">Benutzer suchen</a> <p> -<li><a href="/item/">Inhaltsmanagement</a> - Ankündigungen, ... +<li><a href="$contextPath/item/">Inhaltsmanagement</a> - Ankündigungen, ... <p> -<li><a href="/portal/">Portal-Management</a> - Web-Seiten, ... +<li><a href="$contextPath/portal/">Portal-Management</a> - Web-Seiten, ... <p> -<li><a href="/course/">Course Management</a> - Lehrveranstaltungen, Module, ... +<li><a href="$contextPath/course/">Course Management</a> - Lehrveranstaltungen, Module, ... +<p> +<li><a href="user.html">test</a> </ul> -$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user-delete-result.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-delete-result.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- user-delete-result.html.de 6 Oct 2006 12:36:32 -0000 1.1 +++ user-delete-result.html.de 6 Nov 2006 09:13:45 -0000 1.2 @@ -5,7 +5,7 @@ #end #end -$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #if ($returnCode == 1050) <div class="info"> @@ -18,4 +18,4 @@ </div> #end -$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: login.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login.html.de,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- login.html.de 2 Nov 2006 07:17:12 -0000 1.11 +++ login.html.de 6 Nov 2006 09:13:45 -0000 1.12 @@ -1,11 +1,11 @@ -$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Login</h1> #if ($returnCode == 1030) <div class="success"> - Neues Passwort für Benutzerlogin "$!auserlogin" gesetzt und an + Neues Passwort für Benutzerlogin "$!auserlogin" gesetzt und an E-Mail Adresse "$!email" geschickt. </div> #end @@ -21,12 +21,12 @@ #elseif ($returnCode == 2003) Keine oder eine illegale E-Mail-Adresse angegeben. #elseif ($returnCode == 2030) - Fehler beim Zurücksetzen des Passworts. + Fehler beim Zurücksetzen des Passworts. #elseif ($returnCode == 2031) Der angebene Benutzerlogin exisitert nicht oder hat nicht die angegebene E-Mail-Adresse zugeordnet. #else - Fehler bei der Ausführung des Dienstes. + Fehler bei der Ausführung des Dienstes. #end </div> #end @@ -38,13 +38,13 @@ <br> Weitere Informationen zur MyTUM-Kennung finden Sie hier: <a href="http://portal.mytum.de/onlinehelp/anmeldung/">http://portal.mytum.de/onlinehelp/anmeldung/</a>. -Über das MyTUM-Portal können Sie auch Ihr Passwort ändern.</p> +Ãber das MyTUM-Portal können Sie auch Ihr Passwort ändern.</p> <quote> -<form name="loginForm" action="/PORTAL" method="post"> +<form name="loginForm" action="$contextPath/PORTAL" method="post"> <INPUT TYPE="hidden" NAME="cmd" VALUE="login"> -<INPUT TYPE="hidden" NAME="cmd.success" VALUE="/user/login-success.html"> -<INPUT TYPE="hidden" NAME="cmd.error" VALUE="/user/login.html"> +<INPUT TYPE="hidden" NAME="cmd.success" VALUE="$contextPath/user/login-success.html"> +<INPUT TYPE="hidden" NAME="cmd.error" VALUE="$contextPath/user/login.html"> <INPUT TYPE="hidden" NAME="redirect" VALUE="$!redirect"> Login<br> <input title="Benutzername" size="20" name="luserlogin" type="text" value="$!luserlogin"><br> @@ -66,12 +66,12 @@ Impressum).</p> <p> -<form action="/USER" method=post> +<form action="$contextPath/USER" method=post> <INPUT TYPE=hidden NAME=cmd VALUE="forgotPassword" /> -<input type="hidden" name="cmd.success" value="/user/login.html" /> -<input type="hidden" name="cmd.error" value="/user/login.html" /> +<input type="hidden" name="cmd.success" value="$contextPath/user/login.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/login.html" /> <input type="hidden" name="email_subject" value="Drehscheibe www.in.tum.de Password" /> -<input type="hidden" name="email_textsource" value="/user/forgot_password.txt" /> +<input type="hidden" name="email_textsource" value="$contextPath/user/forgot_password.txt" /> <table border="0"> <tr><td>Loginname*:</td><td><input name="auserlogin" size=20 value="$!auserlogin"></td></tr> <tr><td>E-Mail*:</TD><TD><input name="email" size=20 value="$!email"></td></tr> @@ -90,4 +90,4 @@ für die Plattform an die angegebene E-Mail-Adresse geschickt.</p> </form> -$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user-allpaths.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-allpaths.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- user-allpaths.html.de 12 Sep 2006 12:45:01 -0000 1.1 +++ user-allpaths.html.de 6 Nov 2006 09:13:45 -0000 1.2 @@ -1,79 +1,80 @@ -#parse ( "pageheader.html" ) - -#set ( $userida = $userManager.getUserIdForUserLogin($!usera) ) -#set ( $useridb = $userManager.getUserIdForUserLogin($!userb) ) - -#set ( $usera = $userManager.getUser($userida) ) -#set ( $userb = $userManager.getUser($useridb) ) - -#set ( $usernamea = $usera.getUserLogin() ) -#set ( $usernameb = $userb.getUserLogin() ) - -<h1>Social Networks</h1> - -<p> - This page shows the path from - user <em>$usernamea</em> to user <em>$usernameb</em>. -</p> - -<p> - The paths are calculated using the relationship defined by the - attribute "pim.network.buddylist". Since the buddylists are - also based on this attribute, these paths are based on the entries of - the buddylists. -</p> - -<p> - <a href="card.html?auserlogin=$usernameb">Back to the user-card</a> - -#set ( $paths = $userPresenter.getUserPaths($userida, $useridb) ) -#set ( $pathssize = $paths.size() ) -#set ( $pathsmaxindex = $pathssize - 1 ) - -<p> - Number of found paths: $pathssize<br> - Showing only the first 10 results. -</p> -#set ( $first = 1 ) -#set ( $indexpath = 0 ) -<table border=0 style="table-layout:fixed;"> - #foreach ($j in $paths) - #set ( $indexpath = $indexpath + 1 ) - #if ( $indexpath < 10 ) - - <tr> - <td>$indexpath</td> - - #set ( $maxindex = $j.size() - 1 ) - #set ( $index = 0 ) - #foreach ($i in $j) - #set ( $useri = $userManager.getUser($i) ) - <td height=32 valign=bottom align=center style="border:1px solid #DFDFDF;"> - - #set ($imageuri = "") - #set ($imageuri = $useri.getAttribute("basic.personal.imageuri")) - #if ($imageuri == "") - #set ($imageuri = "/images/nouser.png") - #end - - - - #set ($userLogin = $useri.getUserLogin()) - - <a href="card.html?auserlogin=$userLogin"><img src="$imageuri" width=32 height=32></a> - <br> - <a href="card.html?auserlogin=$userLogin">$userLogin</a> - </td> - #if($index != $maxindex) - <td valign=middle align=center> - <img src="/images/arrow.png"> - </td> - #end - #set ($index = $index + 1) - #end - </tr> - #end - #end -</table> - -#parse ( "pagefooter.html" ) + +$portalPresenter.parse("/pageheader.html",$portalRequest) + +#set ( $userida = $userManager.getUserIdForUserLogin($!usera) ) +#set ( $useridb = $userManager.getUserIdForUserLogin($!userb) ) + +#set ( $usera = $userManager.getUser($userida) ) +#set ( $userb = $userManager.getUser($useridb) ) + +#set ( $usernamea = $usera.getUserLogin() ) +#set ( $usernameb = $userb.getUserLogin() ) + +<h1>Social Networks</h1> + +<p> + This page shows the path from + user <em>$usernamea</em> to user <em>$usernameb</em>. +</p> + +<p> + The paths are calculated using the relationship defined by the + attribute "pim.network.buddylist". Since the buddylists are + also based on this attribute, these paths are based on the entries of + the buddylists. +</p> + +<p> + <a href="card.html?auserlogin=$usernameb">Back to the user-card</a> + +#set ( $paths = $userPresenter.getUserPaths($userida, $useridb) ) +#set ( $pathssize = $paths.size() ) +#set ( $pathsmaxindex = $pathssize - 1 ) + +<p> + Number of found paths: $pathssize<br> + Showing only the first 10 results. +</p> +#set ( $first = 1 ) +#set ( $indexpath = 0 ) +<table border=0 style="table-layout:fixed;"> + #foreach ($j in $paths) + #set ( $indexpath = $indexpath + 1 ) + #if ( $indexpath < 10 ) + + <tr> + <td>$indexpath</td> + + #set ( $maxindex = $j.size() - 1 ) + #set ( $index = 0 ) + #foreach ($i in $j) + #set ( $useri = $userManager.getUser($i) ) + <td height=32 valign=bottom align=center style="border:1px solid #DFDFDF;"> + + #set ($imageuri = "") + #set ($imageuri = $useri.getAttribute("basic.personal.imageuri")) + #if ($imageuri == "") + #set ($imageuri = "/images/nouser.png") + #end + + + + #set ($userLogin = $useri.getUserLogin()) + + <a href="card.html?auserlogin=$userLogin"><img src="$imageuri" width=32 height=32></a> + <br> + <a href="card.html?auserlogin=$userLogin">$userLogin</a> + </td> + #if($index != $maxindex) + <td valign=middle align=center> + <img src="/images/arrow.png"> + </td> + #end + #set ($index = $index + 1) + #end + </tr> + #end + #end +</table> + +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user.html.de,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- user.html.de 2 Nov 2006 07:17:12 -0000 1.15 +++ user.html.de 6 Nov 2006 09:13:45 -0000 1.16 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -70,11 +70,10 @@ </td></tr> <tr><td colspan="2"> -<form action="/USER" method="post" enctype="multipart/form-data" accept-charset="UTF-8"> +<form action="$contextPath/USER" method="post" enctype="multipart/form-data" accept-charset="UTF-8"> <INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> -<input type="hidden" name="cmd.success" value="/user/user.html" /> -<input type="hidden" name="cmd.error" value="/user/user.html" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="cmd.success" value="$contextPath/user/user.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/user.html" /> <input type="hidden" name="auserid" value="$auserid" /> <input type="hidden" name="auserlogin" value="$auserlogin" /> <input type="hidden" name="anames" value="basic.personal.lastname,basic.personal.firstname,basic.personal.title,basic.contact-priv.online.email,basic.contact-priv.online.uri,preference.language,basic.personal.languagesspoken,basic.personal.imageuri,basic.university.status,basic.university.subject,basic.university.graduation" /> @@ -154,4 +153,4 @@ #end #end -$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: register-success.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/register-success.html.de,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- register-success.html.de 12 Sep 2006 12:45:01 -0000 1.6 +++ register-success.html.de 6 Nov 2006 09:13:45 -0000 1.7 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Benutzerregistrierung</h1> @@ -13,4 +13,4 @@ diesem Passwort an und ändern Sie es Ihren Wünschen entsprechend.</p> -$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user-roles.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-roles.html.de,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- user-roles.html.de 6 Oct 2006 12:36:32 -0000 1.8 +++ user-roles.html.de 6 Nov 2006 09:13:45 -0000 1.9 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -78,4 +78,4 @@ #end -$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/index.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- index.html.de 18 Oct 2006 16:52:00 -0000 1.2 +++ index.html.de 6 Nov 2006 09:13:45 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Benutzerverwaltung</h1> @@ -9,7 +9,7 @@ <p>Ihre Benutzerkennung können sie folgendermaÃen verwalten:</p> <ul> -<li><a href="/user/user.html">Benutzerprofil +<li><a href="$contextPath/user/user.html">Benutzerprofil und Interessenseinstellungen editieren</a> <p> <li><a href="change_password.html">Password ändern</a> @@ -21,11 +21,11 @@ <p>Sie sind momanten nicht als Benutzer angemeldet.</p> -<p><a href="/user/login.html">Melden Sie sich entweder mit einer +<p><a href="$contextPath/user/login.html">Melden Sie sich entweder mit einer vorhandenen Kennung auf der Plattform an</a> oder <a -href="/user/register.html">richten Sie eine neue lokale Kennung +href="$contextPath/user/register.html">richten Sie eine neue lokale Kennung ein</a>.</p> #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user-interests.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-interests.html.de,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- user-interests.html.de 18 Oct 2006 16:52:00 -0000 1.14 +++ user-interests.html.de 6 Nov 2006 09:13:45 -0000 1.15 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -47,11 +47,10 @@ <p><div class="info">Ihre Änderungen wurden erfolgreich gespeichert.</div></p> #end -<form action="/USER" method="post"> +<form action="$contextPath/USER" method="post"> <input type="hidden" name="cmd" value="deleteListMember" /> -<input type="hidden" name="cmd.success" value="/user/user-interests.html" /> -<input type="hidden" name="cmd.error" value="/user/user-interests.html" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="cmd.success" value="$contextPath/user/user-interests.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/user-interests.html" /> <input type="hidden" name="aname" value="interests.categories" /> <input type="hidden" name="uid" value="$auserid" /> <input type="hidden" name="auserlogin" value="$auserlogin" /> @@ -103,11 +102,10 @@ <p> -<form action="/USER" method="post"> +<form action="$contextPath/USER" method="post"> <input type="hidden" name="cmd" value="addListMember" /> -<input type="hidden" name="cmd.success" value="/user/user-interests.html" /> -<input type="hidden" name="cmd.error" value="/user/user-interests.html" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="cmd.success" value="$contextPath/user/user-interests.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/user-interests.html" /> <input type="hidden" name="aname" value="interests.categories" /> <input type="hidden" name="uid" value="$auserid" /> <input type="hidden" name="auserlogin" value="$auserlogin" /> @@ -132,11 +130,10 @@ aktivieren wählen Sie bitte in nachfolgender Liste die gewünschte Form der Benachrichtigung aus:</p> -<form action="/USER" method="post"> +<form action="$contextPath/USER" method="post"> <INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> -<input type="hidden" name="cmd.success" value="/user/user-interests.html" /> -<input type="hidden" name="cmd.error" value="/user/user-interests.html" /> -<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="cmd.success" value="$contextPath/user/user-interests.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/user-interests.html" /> <input type="hidden" name="auserid" value="$auserid" /> <input type="hidden" name="auserlogin" value="$auserlogin" /> <input type="hidden" name="anames" value="cobricks.notification" /> @@ -159,4 +156,4 @@ #end -$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user-contact.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-contact.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- user-contact.html 18 Oct 2006 16:52:00 -0000 1.1 +++ user-contact.html 6 Nov 2006 09:13:45 -0000 1.2 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -58,10 +58,10 @@ </td></tr> <tr><td colspan="2"> -<form action="/USER" method="post" enctype="multipart/form-data" accept-charset="UTF-8"> +<form action="$contextPath/USER" method="post" enctype="multipart/form-data" accept-charset="UTF-8"> <INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> -<input type="hidden" name="cmd.success" value="/user/user-contact.html" /> -<input type="hidden" name="cmd.error" value="/user/user-contact.html" /> +<input type="hidden" name="cmd.success" value="$contextPath/user/user-contact.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/user-contact.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="auserid" value="$auserid" /> <input type="hidden" name="auserlogin" value="$auserlogin" /> @@ -101,4 +101,4 @@ #end #end -$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: logout.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/logout.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- logout.html.de 22 Sep 2006 17:42:27 -0000 1.1 +++ logout.html.de 6 Nov 2006 09:13:45 -0000 1.2 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Logout</h1> @@ -9,4 +9,4 @@ Website oder <A href="/user/login.html.de">melden Sie sich erneut an</A>. </P> -$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: user-search.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-search.html.de,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- user-search.html.de 6 Oct 2006 12:36:32 -0000 1.7 +++ user-search.html.de 6 Nov 2006 09:13:45 -0000 1.8 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Benutzersuche</h1> @@ -99,10 +99,10 @@ #set( $number = $number + 1 ) <td> - <a href="/user/card.html.de?auserlogin=$i.getUserLogin()"> $i.getUserLogin()</a> + <a href="$contextPath/user/card.html.de?auserlogin=$i.getUserLogin()"> $i.getUserLogin()</a> </td> <td> -<a href="/USER?cmd=addListMember&cmd.success=/user/user-buddylist.html&cmd.error=/user/user-buddylist.html&path=$portalRequest.getPagePath()&aname=pim.network.buddylist&uid=$i.getUserId()&newUserLogin=$i.getUserLogin()">→ Freundesliste</a> +<a href="$contextPath/USER?cmd=addListMember&cmd.success=$contextPath/user/user-buddylist.html&cmd.error=$contextPath/user/user-buddylist.html&path=$portalRequest.getPagePath()&aname=pim.network.buddylist&uid=$i.getUserId()&newUserLogin=$i.getUserLogin()">→ Freundesliste</a> </td> </tr> #end @@ -126,4 +126,4 @@ #end -$portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: register.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/register.html.de,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- register.html.de 12 Sep 2006 12:45:01 -0000 1.9 +++ register.html.de 6 Nov 2006 09:13:45 -0000 1.10 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Benutzerregistrierung</h1> @@ -35,7 +35,7 @@ <p> Wenn Sie bereits eine Kennung auf dieser Plattform haben, dann können Sie sich über das <a -href="/user/login.html">Login-Formular</a> anmelden. </p> +href="$contextPath/user/login.html">Login-Formular</a> anmelden. </p> <p> Um sich als neuer Benutzer auf dieser Plattform zu registrieren, wählen Sie im nachfolgenden Formular zuerst einen Benutzernamen @@ -49,7 +49,7 @@ #end -<form action="/USER" method=post> +<form action="$contextPath/USER" method=post> <p> <INPUT TYPE=hidden NAME=cmd VALUE=register /> @@ -58,8 +58,8 @@ <input type="hidden" name="attrnames" value="basic_personal_title" /> <input type="hidden" name="userclass" value="universityuser" /> -<input type="hidden" name="cmd.success" value="/user/register-success.html" /> -<input type="hidden" name="cmd.error" value="/user/register.html" /> +<input type="hidden" name="cmd.success" value="$contextPath/user/register-success.html" /> +<input type="hidden" name="cmd.error" value="$contextPath/user/register.html" /> <TABLE BORDER=0> <tr> <TD>Gewünschter Loginname*:</TD><TD><input name="auserlogin" size=20 value="$!auserlogin"></td> @@ -85,7 +85,7 @@ #set ($login = "$!auserlogin") <p><input type=submit value="Registrieren"></p> <input type="hidden" name="email_subject" value="Drehscheibe Registrierung" /> -<input type=hidden name="email_textsource" value="/user/registeremail.txt.de" /> +<input type=hidden name="email_textsource" value="$contextPath/user/registeremail.txt.de" /> </form> -$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-11-06 09:13:50
|
Update of /cvsroot/cobricks/drehscheibe-in/web/ADMIN In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6033/ADMIN Modified Files: index.html.en pageheader.html Log Message: Index: pageheader.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/ADMIN/pageheader.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pageheader.html 6 Oct 2006 13:19:16 -0000 1.1 +++ pageheader.html 6 Nov 2006 09:13:43 -0000 1.2 @@ -1,12 +1,18 @@ <html> <head> -$portalPresenter.printHeader($portalRequest, "Cobricks-2 Admin") +<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> +<title>www.in.tum.de/ADMIN</title> +<base href="$portalRequest.getBaseUrl()"> +<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE"> +<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> +<meta http-equiv="expires" content="0"> +<META NAME="GOOGLEBOT" CONTENT="NOARCHIVE"> +<META NAME="ROBOTS" CONTENT="NONE"> <link rel="stylesheet" type="text/css" href="$contextPath/ADMIN/style.css"> <link rel="shortcut icon" href="http://www.cobricks.de/c2.png" type="image/png"> </head> -<body bgcolor="#ffffff" topmargin="1" leftmargin="3" - marginwidth="3" marginheight="1"> +<body bgcolor="#ffffff" topmargin="1" leftmargin="3" marginwidth="3" marginheight="1"> <table border="0" width="100%" cellpadding="4" cellspacing="0"> <tr bgcolor="#dfdfdf"> @@ -54,7 +60,8 @@ - <a href="/ADMIN/org.cobricks.user/roles.html">User Roles</a><br> <br> <b>Item Management</b><br> -- <a href="/ADMIN/org.cobricks.item/search.html">List Items</a><br> +- <a href="/ADMIN/org.cobricks.item/itemsearch.html">List Items</a><br> +- <a href="/ADMIN/org.cobricks.item/itemcreate_start.html">Create New Item</a><br> <br> <b>Category Management</b><br> - <a href="/ADMIN/org.cobricks.category/search.html">List Categories</a><br> Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/ADMIN/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.en 6 Oct 2006 13:19:16 -0000 1.1 +++ index.html.en 6 Nov 2006 09:13:43 -0000 1.2 @@ -52,5 +52,4 @@ #end </ul> - #parse ( "$contextPath/ADMIN/pagefooter.html" ) |
Update of /cvsroot/cobricks/drehscheibe-in/web/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6033/course Modified Files: c.html.de ccreate.html.de ccreatepreselect.html.de cdelete.html.de clcreate.html.de cldelete.html.de clsearch.html.de clupdate.html.de cm.html.de cm.html.en cmall.html.de cmcreate.html.de cmcreateres.html.de cmdelete.html.de cmsearch.html.de cmupdate.html.de cmupdateemail.html.de cpcreate.html.de cpdelete.html.de cpsearch.html.de cpupdate.html.de crcreate.html.de crdelete.html.de crsearch.html.de crupdate.html.de cupdate.html.de index.html.de timetable.html.de timetablem.html.de timetablew.html.de Log Message: Index: cpdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cpdelete.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cpdelete.html.de 6 Oct 2006 12:36:32 -0000 1.2 +++ cpdelete.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,7 +1,7 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) -<h1>Studiengang löschen</h1> +<h1>Studiengang löschen</h1> #set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #if ( $auserid == 0 ) @@ -12,35 +12,35 @@ #if ( "$!tmps" != "true" ) <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte -um Studiengänge zu editieren. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +um Studiengänge zu editieren. Wenn Sie die entsprechenden Rechte +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else #if ( $returnCode > 1999 ) -<font color="red">Fehler beim Löschen eines Studiengangs.</font><p> +<font color="red">Fehler beim Löschen eines Studiengangs.</font><p> #end #set ( $courseProgram = $coursePresenter.getCourseProgram($cpid) ) -<p>Bitte bestätigen Sie das Löschen des Studiengangs +<p>Bitte bestätigen Sie das Löschen des Studiengangs "$courseProgram.getName()".</p> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourseprogram" /> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/cpdelete.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cpdelete.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="cpid" value="$cpid" /> <input type="button" class="submit" value="Back" onClick="javascript:history.go(-1)"/> -<input type="submit" class="submit" value="Studiengang löschen"/> +<input type="submit" class="submit" value="Studiengang löschen"/> </form> #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: clcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clcreate.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- clcreate.html.de 18 Oct 2006 16:51:06 -0000 1.3 +++ clcreate.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Dozent anlegen</h1> @@ -13,7 +13,7 @@ <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte um Dozenten anzulegen. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else @@ -23,11 +23,11 @@ #end <table border="0"> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="createcourselecturer"> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/clcreate.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/clcreate.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <tr> <td>Vorname</td> @@ -86,4 +86,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cmall.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmall.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cmall.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ cmall.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -18,7 +18,7 @@ <p> <table id="result" width="100%" align="center" border="1"> <tr> -<td>Modul</td><td>Titel</td><td>Umfang</td><td>Credits</td><td>Turnus</td><td>Studiengänge</td><td>Vorkenntnisse</td> +<td>Modul</td><td>Titel</td><td>Umfang</td><td>Credits</td><td>Turnus</td><td>Studiengänge</td><td>Vorkenntnisse</td> </tr> #foreach ( $cm in $results ) <tr> @@ -38,5 +38,5 @@ </table> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: ccreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/ccreate.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ccreate.html.de 18 Oct 2006 16:51:06 -0000 1.4 +++ ccreate.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Veranstaltung anlegen (Schritt 2)</h1> @@ -24,15 +24,15 @@ #set( $cm = $coursePresenter.getCourseModule($cmid) ) -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="createcourse"> -<input type="hidden" name="cmd.success" value="/course/index.html"> -<input type="hidden" name="cmd.error" value="/course/ccreate.html"> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html"> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html"> +<input type="hidden" name="cmd.error" value="$!contextPath/course/ccreate.html"> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="cmid" value="$cmid"/> -<h2><a href="/course/cm.html?cmid=$cmid" target="_blank">$cm.getName()</a></h2> +<h2><a href="$!contextPath/course/cm.html?cmid=$cmid" target="_blank">$cm.getName()</a></h2> <p><em>Hinweis: Manche der folgenden Felder sind von dem zugeordneten Modul übernommen und können nicht geändert @@ -234,4 +234,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cpcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cpcreate.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cpcreate.html.de 18 Oct 2006 16:51:06 -0000 1.3 +++ cpcreate.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Studiengang anlegen</h1> @@ -23,11 +23,11 @@ #end <table border="0"> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="createcourseprogram"> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/cpcreate.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cpcreate.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <tr> <td>Name</td> @@ -54,4 +54,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cm.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cm.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cm.html.de 18 Oct 2006 16:51:06 -0000 1.3 +++ cm.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #if ( "$!cmid" == "" ) #if ( "$!id" != "" ) @@ -130,11 +130,11 @@ </table> #if ( "$!acc" == "true" ) <p align="right"> -<a href="/course/cmupdate.html?cmid=$cm.getId()">Modul editieren</a> +<a href="$!contextPath/course/cmupdate.html?cmid=$cm.getId()">Modul editieren</a> </p> #end <p> <a href="csearch.html?cmid=$cm.getId()">Veranstaltungen zu diesem Modul anzeigen</a> -$portalPresenter.parse("$contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: crdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crdelete.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- crdelete.html.de 6 Oct 2006 12:36:32 -0000 1.2 +++ crdelete.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,7 +1,7 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) -<h1>Raum löschen</h1> +<h1>Raum löschen</h1> #set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #if ( $auserid == 0 ) @@ -12,33 +12,32 @@ #if ( "$!tmps" != "true" ) <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte -um Räume zu löschen. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +um Räume zu löschen. Wenn Sie die entsprechenden Rechte +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else #if ( $returnCode > 1999 ) -<font color="red">Fehler beim Löschen eines Raums.</font><p> +<font color="red">Fehler beim Löschen eines Raums.</font><p> #end #set ( $courseRoom = $coursePresenter.getCourseRoom($crid) ) -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourseroom" /> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/crdelete.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/crdelete.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="crid" value="$crid" /> <input type="button" class="submit" value="Back" onClick="javascript:history.go(-1)"/> -<input type="submit" class="submit" value="Raum löschen"/> +<input type="submit" class="submit" value="Raum löschen"/> </form> #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) - +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: timetablew.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/timetablew.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- timetablew.html.de 18 Oct 2006 16:51:06 -0000 1.2 +++ timetablew.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Stundenplan</h1> @@ -24,7 +24,7 @@ #set ( $term = $coursePresenter.getCurrentTerm() ) #end -<form action="/course/timetablew.html" method="post"> +<form action="$!contextPath/course/timetablew.html" method="post"> <p>Stundenplan für Semester <select name="term" size="1"> $!coursePresenter.getTerms("$!term") @@ -42,7 +42,7 @@ #else #foreach( $cttid in $tt.keySet() ) <li> - <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetablew.html&cmd.error=/course/timetablew.html">entfernen</a> + <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="$!contextPath/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetablew.html&cmd.error=/course/timetablew.html"><i>entfernen</i></a> </li> #end #end @@ -53,7 +53,7 @@ <h3>Wochenansicht</h3> <p> -$calendarPresenter.printWeekCalendarAsHtml($!datestring, $!catids, "en","timetable.html", "timetablew.html", "timetablem.html","$!auserid") +$calendarPresenter.printWeekCalendarAsHtml($!datestring, $!catids, "de","timetable.html", "timetablew.html", "timetablem.html","$!auserid") </p> -$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cdelete.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cdelete.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ cdelete.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Veranstaltung löschen</h1> @@ -28,11 +28,11 @@ <p>Bitte bestätigen Sie, dass die Veranstaltung "$course.getName()" im Semester $course.getTerm() wirklich gelöscht werden soll.</p> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourse" /> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/cdelete.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cdelete.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="cid" value="$cid" /> @@ -43,4 +43,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: timetable.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/timetable.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- timetable.html.de 18 Oct 2006 16:51:06 -0000 1.2 +++ timetable.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Stundenplan</h1> @@ -24,7 +24,7 @@ #set ( $term = $coursePresenter.getCurrentTerm() ) #end -<form action="/course/timetable.html" method="post"> +<form action="$!contextPath/course/timetable.html" method="post"> <p>Stundenplan für Semester <select name="term" size="1"> $!coursePresenter.getTerms("$!term") @@ -42,7 +42,7 @@ #else #foreach( $cttid in $tt.keySet() ) <li> - <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">entfernen</a> + <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="$!contextPath/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html"><i>entfernen</i></a> </li> #end #end @@ -53,7 +53,7 @@ <h3>Tagesansicht</h3> <p> -$calendarPresenter.printDayCalendarAsHtml($!datestring, $!catids, "en", "timetable.html", "timetablew.html", "timetablem.html","$!auserid") +$calendarPresenter.printDayCalendarAsHtml($!datestring, $!catids, "de", "timetable.html", "timetablew.html", "timetablem.html","$!auserid") </p> -$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cmcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmcreate.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cmcreate.html.de 18 Oct 2006 16:51:06 -0000 1.4 +++ cmcreate.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Modul anlegen/beantragen</h1> @@ -47,11 +47,11 @@ #end -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="createcoursemodule"> -<input type="hidden" name="cmd.success" value="/course/cmcreateres.html"> -<input type="hidden" name="cmd.error" value="/course/cmcreate.html"> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html"> +<input type="hidden" name="cmd.success" value="$!contextPath/course/cmcreateres.html"> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cmcreate.html"> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="_requattrs" value="cmname,cmname_en,cmtarget,cmtarget_en,cmcontent,cmcontent_en,cmcert"> @@ -256,4 +256,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: timetablem.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/timetablem.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- timetablem.html.de 18 Oct 2006 16:51:06 -0000 1.2 +++ timetablem.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Stundenplan</h1> @@ -24,7 +24,7 @@ #set ( $term = $coursePresenter.getCurrentTerm() ) #end -<form action="/course/timetablem.html" method="post"> +<form action="$!contextPath/course/timetablem.html" method="post"> <p>Stundenplan für Semester <select name="term" size="1"> $!coursePresenter.getTerms("$!term") @@ -42,7 +42,7 @@ #else #foreach( $cttid in $tt.keySet() ) <li> - <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">entfernen</a> + <a href="c.html?cid=$tt.get($cttid).getId() ">$tt.get($cttid).getFullName() </a> - <a href="$!contextPath/COURSE?cmd=removecoursett&cttid=$cttid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html"><i>entfernen</i></a> </li> #end #end @@ -53,7 +53,7 @@ <h3>Monatsansicht</h3> <p> -$calendarPresenter.printMonthCalendarAsHtml($!datestring, $!catids, "en","timetable.html", "timetablew.html", "timetablem.html","$!auserid") +$calendarPresenter.printMonthCalendarAsHtml($!datestring, $!catids, "de","timetable.html", "timetablew.html", "timetablem.html","$!auserid") </p> -$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: crcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crcreate.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- crcreate.html.de 6 Oct 2006 12:36:32 -0000 1.3 +++ crcreate.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Raum anlegen</h1> @@ -23,11 +23,11 @@ #end <table border="0"> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="createcourseroom"> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/crcreate.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/crcreate.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <tr> <td>Name</td> @@ -64,4 +64,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cmsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmsearch.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cmsearch.html.de 6 Oct 2006 12:36:31 -0000 1.2 +++ cmsearch.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -122,4 +122,4 @@ </form> </table> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/index.html.de,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- index.html.de 18 Oct 2006 16:51:06 -0000 1.6 +++ index.html.de 6 Nov 2006 09:13:44 -0000 1.7 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) <h1>Course Management</h1> @@ -156,4 +156,4 @@ #end -$portalPresenter.parse("$!contextPath/pagefooter.html",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: clupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clupdate.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- clupdate.html.de 18 Oct 2006 16:51:06 -0000 1.3 +++ clupdate.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Dozentendaten aktualisieren</h1> @@ -13,7 +13,7 @@ <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte um Dozenten zu editieren. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else @@ -25,11 +25,11 @@ #set ( $courseLecturer = $coursePresenter.getCourseLecturer($lid) ) <table border="0"> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecourselecturer"> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/clupdate.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/clupdate.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="lid" value="$lid" /> <input type="hidden" name="uid" value="$courseLecturer.getUniqueId()" /> @@ -82,4 +82,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cmupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmupdate.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cmupdate.html.de 18 Oct 2006 16:51:06 -0000 1.4 +++ cmupdate.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Modul aktualisieren</h1> @@ -58,11 +58,11 @@ #if ( "$!acc" == "course" ) <form action="cmupdateemail.html" method="post"> #else -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecoursemodule"> -<input type="hidden" name="cmd.success" value="/course/index.html"> -<input type="hidden" name="cmd.error" value="/course/cmupdate.html"> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html"> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html"> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cmupdate.html"> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html"> #end <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -389,4 +389,4 @@ #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: crupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crupdate.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- crupdate.html.de 6 Oct 2006 12:36:32 -0000 1.2 +++ crupdate.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Raum aktualisieren</h1> @@ -25,11 +25,11 @@ #set ( $courseRoom = $coursePresenter.getCourseRoom($crid) ) <table border="0"> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecourseroom"> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/crupdate.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/crupdate.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="crid" value="$crid" /> @@ -64,4 +64,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cm.html.en =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cm.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cm.html.en 18 Oct 2006 16:51:06 -0000 1.3 +++ cm.html.en 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #if ( "$!cmid" == "" ) #if ( "$!id" != "" ) @@ -134,11 +134,11 @@ </table> #if ( "$!acc" == "true" ) <p align="right"> -<a href="/course/cmupdate.html?cmid=$cm.getId()">edit module</a> +<a href="$contextPath/course/cmupdate.html?cmid=$cm.getId()">edit module</a> </p> #end <p> <a href="csearch.html?cmid=$cm.getId()">Show lectures for this module</a> -$portalPresenter.parse("$contextPath/pagefooter.html.en",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cmupdateemail.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmupdateemail.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cmupdateemail.html.de 6 Oct 2006 12:36:32 -0000 1.2 +++ cmupdateemail.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Modul aktualisieren</h1> @@ -33,4 +33,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cmcreateres.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmcreateres.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cmcreateres.html.de 6 Oct 2006 12:36:31 -0000 1.2 +++ cmcreateres.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Modul anlegen/beantragen</h1> @@ -130,9 +130,7 @@ #set ( $tmps = $portalPresenter.sendEmail("ko...@in...","[Drehscheibe] Modulantrag","cmcreateres.txt",$portalRequest) ) #end -<p><a href="/course/index.html">zurück zur Course Management Übersicht</a></p> - #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: crsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crsearch.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- crsearch.html.de 18 Oct 2006 16:51:06 -0000 1.4 +++ crsearch.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -70,4 +70,4 @@ </form> </table> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: ccreatepreselect.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/ccreatepreselect.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ccreatepreselect.html.de 6 Oct 2006 12:36:31 -0000 1.3 +++ ccreatepreselect.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,58 +1,58 @@ - -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) - -<h1>Veranstaltung anlegen (Schritt 1)</h1> - -#set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) -#if ( $auserid == 0 ) -$portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) -#else -#set ( $auser = $userManager.getUser($auserid)) -#set ( $tmps = $userPresenter.checkPermission("$auserid", "course", "create", "") ) -#if ( "$!tmps" != "true" ) - -<p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte -um Veranstaltungen zu editieren. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der -Plattform.</div></p> - -#else - -#if ( $returnCode > 1999 ) -<font color="red">Fehler beim Anlegen einer Veranstaltung.</font><p> -#end - -<p>Um eine neue Veranstaltung anzulegen, müssen Sie zuerst das -zugehörige Modul auswählen. Geben Sie dazu bitte in -folgendes Formular einen Substring des gewünschten Modulnamens -ein (case-sensitive).</p> - -<p> -<form action="ccreatepreselect.html" method="post"> - <input name="cmname" size="50"> - <input type="submit" class="submit" value="Module suchen"/> -</form> -</p> -#if ( "$!cmname" != "" ) -<p>Module zu Ihrer Suchanfrage:<br/> -<form action="ccreate.html" method="post"> -<select name="cmid" size="10"> -#foreach ( $cm in $coursePresenter.getCourseModules("$!cmid", "$!cmname") ) - <option value="$!cm.getId()">$!cm.getName()</option> -#end -</select> -<br /> -<input type="submit" class="submit" value="Veranstaltung zu dem ausgewählten Modul anlegen"/> -</form> -<p> - -Hinweis: Neu Beantragte Module erscheinen in dieser Liste erst wenn -sie vom Prüfungsausschuss genehmigt/bestätigt worden sind.</p> - -#end -</p> - -#end -#end - -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) + +$portalPresenter.parse("/pageheader.html",$portalRequest) + +<h1>Veranstaltung anlegen (Schritt 1)</h1> + +#set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) +#if ( $auserid == 0 ) +$portalPresenter.parse("$!contextPath/pagelogin.html.de",$portalRequest) +#else +#set ( $auser = $userManager.getUser($auserid)) +#set ( $tmps = $userPresenter.checkPermission("$auserid", "course", "create", "") ) +#if ( "$!tmps" != "true" ) + +<p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte +um Veranstaltungen zu editieren. Wenn Sie die entsprechenden Rechte +benötigen, dann wenden Sie sich bitte an die Administratoren der +Plattform.</div></p> + +#else + +#if ( $returnCode > 1999 ) +<font color="red">Fehler beim Anlegen einer Veranstaltung.</font><p> +#end + +<p>Um eine neue Veranstaltung anzulegen, müssen Sie zuerst das +zugehörige Modul auswählen. Geben Sie dazu bitte in +folgendes Formular einen Substring des gewünschten Modulnamens +ein (case-sensitive).</p> + +<p> +<form action="ccreatepreselect.html" method="post"> + <input name="cmname" size="50"> + <input type="submit" class="submit" value="Module suchen"/> +</form> +</p> +#if ( "$!cmname" != "" ) +<p>Module zu Ihrer Suchanfrage:<br/> +<form action="ccreate.html" method="post"> +<select name="cmid" size="10"> +#foreach ( $cm in $coursePresenter.getCourseModules("$!cmid", "$!cmname") ) + <option value="$!cm.getId()">$!cm.getName()</option> +#end +</select> +<br /> +<input type="submit" class="submit" value="Veranstaltung zu dem ausgewählten Modul anlegen"/> +</form> +<p> + +Hinweis: Neu Beantragte Module erscheinen in dieser Liste erst wenn +sie vom Prüfungsausschuss genehmigt/bestätigt worden sind.</p> + +#end +</p> + +#end +#end + +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: clsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clsearch.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- clsearch.html.de 18 Oct 2006 16:51:06 -0000 1.4 +++ clsearch.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -91,4 +91,4 @@ </form> </table> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cpsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cpsearch.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cpsearch.html.de 18 Oct 2006 16:51:06 -0000 1.3 +++ cpsearch.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) @@ -69,4 +69,4 @@ </form> </table> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cmdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmdelete.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cmdelete.html.de 18 Oct 2006 16:51:06 -0000 1.4 +++ cmdelete.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Modul löschen</h1> @@ -57,11 +57,11 @@ Bitte bestätigen Sie das Löschen. <p> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecoursemodule" /> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/cmdelete.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cmdelete.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="cmid" value="$cmid" /> @@ -74,4 +74,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: c.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/c.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- c.html.de 18 Oct 2006 16:51:06 -0000 1.3 +++ c.html.de 6 Nov 2006 09:13:44 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) #set ($cid = $!cid) #set( $course = $coursePresenter.getCourse($cid) ) @@ -207,16 +207,16 @@ <p> #if ($!userLogin != "anonymous") -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="addcoursett"/> <input type="hidden" name="cid" value="$cid"/> <input type="hidden" name="uid" value="$auserid"/> -<input type="hidden" name="cmd.success" value="/course/timetable.html"/> -<input type="hidden" name="cmd.error" value="/course/timetable.html"/> +<input type="hidden" name="cmd.success" value="$!contextPath/course/timetable.html"/> +<input type="hidden" name="cmd.error" value="$!contextPath/course/timetable.html"/> <input type="submit" value="Zum persönlichen Stundenplan hinzufügen"> </form> #end <p> -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cpupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cpupdate.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cpupdate.html.de 6 Oct 2006 12:36:32 -0000 1.2 +++ cpupdate.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Studiengang editieren</h1> @@ -12,8 +12,8 @@ #if ( "$!tmps" != "true" ) <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte -um Studiengänge zu editieren. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +um Studiengänge zu editieren. Wenn Sie die entsprechenden Rechte +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else @@ -25,11 +25,11 @@ #end <table border="0"> -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="updatecourseprogram"> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/cpupdate.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cpupdate.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="cpid" value="$cpid" /> @@ -42,7 +42,7 @@ <td><input name="cpname_en" size="50" value="$!courseProgram.getNameEn()"></td> </tr> <tr> - <td>Kürzel</td> + <td>Kürzel</td> <td><input name="cplabel" size="50" value="$!courseProgram.getLabel()"></td> </tr> <tr> @@ -57,4 +57,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cldelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cldelete.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cldelete.html.de 6 Oct 2006 12:36:31 -0000 1.2 +++ cldelete.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,7 +1,7 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) -<h1>Dozent löschen</h1> +<h1>Dozent löschen</h1> #set ( $auserid = $userManager.getUserIdForUserLogin($userLogin) ) #if ( $auserid == 0 ) @@ -13,31 +13,31 @@ <p><div class="error">Ihr aktueller Login hat nicht ausreichend Rechte um Dozenten anzulegen. Wenn Sie die entsprechenden Rechte -benötigen, dann wenden Sie sich bitte an die Administratoren der +benötigen, dann wenden Sie sich bitte an die Administratoren der Plattform.</div></p> #else #if ( $returnCode > 1999 ) -<font color="red">Fehler beim Löschen eines Dozenten.</font><p> +<font color="red">Fehler beim Löschen eines Dozenten.</font><p> #end #set ( $courseLecturer = $coursePresenter.getCourseLecturer($lid) ) -<form action="/COURSE" method="post"> +<form action="$!contextPath/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecourselecturer" /> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/cldelete.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cldelete.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="lid" value="$lid" /> <input type="button" class="submit" value="Back" onClick="javascript:history.go(-1)"/> -<input type="submit" class="submit" value="Dozent löschen"/> +<input type="submit" class="submit" value="Dozent löschen"/> </form> #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) Index: cupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cupdate.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cupdate.html.de 18 Oct 2006 16:51:06 -0000 1.5 +++ cupdate.html.de 6 Nov 2006 09:13:44 -0000 1.6 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) +$portalPresenter.parse("/pageheader.html",$portalRequest) <h1>Veranstaltungsdaten aktualisieren</h1> @@ -26,11 +26,11 @@ <font color="red">Fehler beim Aktualisieren einer Veranstaltung.</font><p> #end -<form action="/COURSE" method="post" name="courseform"> +<form action="$!contextPath/COURSE" method="post" name="courseform"> <input type="hidden" name="cmd" value="updatecourse"> -<input type="hidden" name="cmd.success" value="/course/index.html" /> -<input type="hidden" name="cmd.error" value="/course/cupdate.html" /> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html" /> +<input type="hidden" name="cmd.success" value="$!contextPath/course/index.html" /> +<input type="hidden" name="cmd.error" value="$!contextPath/course/cupdate.html" /> +<input type="hidden" name="cmd.noaccess" value="$!contextPath/noaccess.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="cid" value="$cid" /> @@ -287,4 +287,4 @@ #end #end -$portalPresenter.parse("$!contextPath/pagefooter.html.de",$portalRequest) +$portalPresenter.parse("/pagefooter.html",$portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-11-06 09:13:48
|
Update of /cvsroot/cobricks/drehscheibe-in/web/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6033/item Modified Files: index.html.de item.html.de itemcreate.html.de itemsearch.html.de itemupdate.html.de template-da.html template-date.html template-job.html template-msg.html template-odate.html template-sypro.html template.html Log Message: Index: template-sypro.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-sypro.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- template-sypro.html 18 Oct 2006 16:51:35 -0000 1.2 +++ template-sypro.html 6 Nov 2006 09:13:45 -0000 1.3 @@ -74,7 +74,10 @@ <p>Kategorien, denen die Mitteilung zugeordnet ist: <ul> #foreach ($c in $item.getAttribute("categories")) - <li>$categoryPresenter.getCategory($c).getTitle("$lang") +#set ($tmpc = $categoryPresenter.getCategory("$!c")) +#if ("$!tmpc"!="") + <li>$tmpc.getTitle("$!lang") +#end #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.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- itemsearch.html.de 18 Oct 2006 16:51:34 -0000 1.17 +++ itemsearch.html.de 6 Nov 2006 09:13:44 -0000 1.18 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) <h1>Inhaltssuche</h1> @@ -13,7 +13,7 @@ #set ($iresult = $itemPresenter.searchItems("$!qtext","$!qitemclass","$!qcategory","$!qcreator","creationtime","$!qolder","","$!qsortby",30)) -#if ($iresult.isEmpty()) +#if ("$!iresult"=="") <h3>Keine Items gefunden.</h3> <b>Es wurden keine Items gefunden, die zu Ihrer Suchanfrage passen.</b> <p> @@ -39,7 +39,7 @@ - <a href="itemupdate.html?itemid=$item.getId()"><i>editieren</i></a> #end #if ( "$!accdel" == "true" ) -- <a href="/ITEM?cmd=deleteitem&cmd.success=/item/itemsearch.html&cmd.error=/item/itemsearch.html&itemid=$item.getId()&itemclass=$!itemclass"><i>löschen</i></a> +- <a href="$contextPath/ITEM?cmd=deleteitem&cmd.success=/item/itemsearch.html&cmd.error=/item/itemsearch.html&itemid=$item.getId()&itemclass=$!itemclass"><i>löschen</i></a> #end </li> #end @@ -57,17 +57,9 @@ <input type="hidden" name="query" value="t" /> <table> <tr><td><b>Typ:</b></td></tr> -<tr><td><select size="1" name="qitemclass"> -<option value="tummsg">Ankündigung</option> -<option value="tumdate">Terminankündigung</option> -<option value="odate">Offizielle Terminankündigung</option> -<option value="da">Ankündigung Diplom/Master/Bachelorarbeit</option> -<option value="idp">Ankündigung Interdisz. Projekt</option> -<option value="sypro">Ankündigung Systementwicklungsprojekt</option> -<option value="job">Jobangebot</option> -<option value="fww">Eintrag Fakultätswegweiser</option> -<option value="">-- beliebig --</option> -</select></td></tr> +<tr><td> +$portalPresenter.printSelect("qitemclass","Ankündigung,Veranstaltungsankündigung,Offizielle Veranstaltungsankündigung,Ankündigung Diplom/Master/Bachelorarbeit,Ankündigung Interdisz. Projekt,Ankündigung Systementwicklungsprojekt,Jobangebot,Eintrag Fakultätswegweiser,-- beliebig --","tummsg,tumdate,odate,da,idp,sypro,job,fww, ","$!qitemclass") +</td></tr> <tr><td colspan=2><b>Suchtext:</b></td></tr> <tr><td colspan=2><input type="text" name="qtext" value="$!qtext" size="40"></td></tr> <tr><td><b>Nicht älter als:</b></td> @@ -100,4 +92,4 @@ </form> -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) +$portalPresenter.parse("/pagefooter.html", $portalRequest) Index: template-date.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-date.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- template-date.html 18 Oct 2006 16:51:34 -0000 1.4 +++ template-date.html 6 Nov 2006 09:13:44 -0000 1.5 @@ -85,7 +85,10 @@ <ul> #foreach ($c in $item.getAttribute("categories")) #if ("$!c"!="0") - <li>$categoryPresenter.getCategory($c).getTitle("$lang") +#set ($tmpc = $categoryPresenter.getCategory("$!c")) +#if ("$!tmpc"!="") + <li>$tmpc.getTitle("$!lang") +#end #end #end #if (!$item.getAttribute("categories")) Index: template-odate.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-odate.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- template-odate.html 18 Oct 2006 16:51:34 -0000 1.2 +++ template-odate.html 6 Nov 2006 09:13:45 -0000 1.3 @@ -79,7 +79,10 @@ <p>Kategorien, denen die Mitteilung zugeordnet ist: <ul> #foreach ($c in $item.getAttribute("categories")) - <li>$categoryPresenter.getCategory($c).getTitle("$lang") +#set ($tmpc = $categoryPresenter.getCategory("$!c")) +#if ("$!tmpc"!="") + <li>$tmpc.getTitle("$!lang") +#end #end #if (!$item.getAttribute("categories")) <li>keine Kategorien Index: itemupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemupdate.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- itemupdate.html.de 18 Oct 2006 16:51:34 -0000 1.4 +++ itemupdate.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) #set ($lang = "de") #set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) @@ -35,9 +35,11 @@ <div class="success">Item erfolgreich aktualisiert.</div><br/> #elseif($returnCode == 2003) <div class="error">Fehler beim Aktualisieren des Items: -<ul>#foreach($error in $errors) +<ul> +#foreach($error in $errors) <li>$corePresenter.printErrorMessage($error, "$!lang")</li> -#end</ul></div><br/> +#end +</ul></div><br/> #end #if ($returnCode == 2002) <p><div class="error">Fehler beim Löschen des Items "$!itemid".</div></p> @@ -68,6 +70,8 @@ #set ($acc = "false") #end #end +#end + #if ($acc == "false") <div class="error"> @@ -117,7 +121,7 @@ <ul> #foreach ($ia in $item.getAttachments()) #set ($iconurl = $portalPresenter.getMimeTypeIcon($!ia.getMimeType())) -<li><a href="/ITEM?cmd=geta&aid=$!ia.getId()"> +<li><a href="$contextPath/ITEM?cmd=geta&aid=$!ia.getId()"> #if ("$!iconurl"=="") [$!ia.getMimeType()] #else @@ -183,6 +187,4 @@ #end -#end - -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) +$portalPresenter.parse("/pagefooter.html", $portalRequest) Index: itemcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/itemcreate.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- itemcreate.html.de 18 Oct 2006 16:51:34 -0000 1.4 +++ itemcreate.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) #set ($lang = "de") #set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) @@ -94,4 +94,4 @@ #end -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) +$portalPresenter.parse("/pagefooter.html", $portalRequest) Index: item.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/item.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- item.html.de 18 Oct 2006 16:51:34 -0000 1.4 +++ item.html.de 6 Nov 2006 09:13:44 -0000 1.5 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) #set ($lang = "de") #set($selectedLangs = $portalRequest.getRequestParameterValues("_languages")) @@ -74,7 +74,7 @@ #set ($itemtemplate = $itemPresenter.getItemTemplate("details", $item)) <p> $portalPresenter.parse("$itemtemplate",$portalRequest,"/item/template.html")<br> -<div align="right"><form action="/item/itemupdate.html" method="get"> +<div align="right"><form action="$contextPath/item/itemupdate.html" method="get"> <input type="hidden" name="itemid" value="$itemid"> <input type="submit" value="Item Editieren"></form></div> @@ -89,7 +89,7 @@ <ul> #foreach ($ia in $item.getAttachments()) #set ($iconurl = $portalPresenter.getMimeTypeIcon($!ia.getMimeType())) -<li><a href="/ITEM?cmd=geta&aid=$!ia.getId()"> +<li><a href="$contextPath/ITEM?cmd=geta&aid=$!ia.getId()"> #if ("$!iconurl"=="") [$!ia.getMimeType()] #else @@ -153,4 +153,4 @@ #end -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) +$portalPresenter.parse("/pagefooter.html", $portalRequest) Index: template-job.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-job.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- template-job.html 18 Oct 2006 16:51:34 -0000 1.2 +++ template-job.html 6 Nov 2006 09:13:44 -0000 1.3 @@ -74,7 +74,10 @@ <p>Kategorien, denen die Mitteilung zugeordnet ist: <ul> #foreach ($c in $item.getAttribute("categories")) - <li>$categoryPresenter.getCategory($c).getTitle("$lang") +#set ($tmpc = $categoryPresenter.getCategory("$!c")) +#if ("$!tmpc"!="") + <li>$tmpc.getTitle("$!lang") +#end #end #if (!$item.getAttribute("categories")) <li>keine Kategorien Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/index.html.de,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- index.html.de 18 Oct 2006 16:51:34 -0000 1.2 +++ index.html.de 6 Nov 2006 09:13:44 -0000 1.3 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) <h1>Dynamische Inhalte</h1> @@ -34,4 +34,4 @@ suchen</a>.</p> -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) +$portalPresenter.parse("/pagefooter.html", $portalRequest) Index: template-msg.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-msg.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- template-msg.html 18 Oct 2006 16:51:34 -0000 1.4 +++ template-msg.html 6 Nov 2006 09:13:45 -0000 1.5 @@ -75,7 +75,10 @@ <ul> #foreach ($c in $item.getAttribute("categories")) #if ("$!c"!="0") - <li>$categoryPresenter.getCategory($c).getTitle("$!lang") +#set ($tmpc = $categoryPresenter.getCategory("$!c")) +#if ("$!tmpc"!="") + <li>$tmpc.getTitle("$!lang") +#end #end #end #if (!$item.getAttribute("categories")) Index: template.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- template.html 18 Oct 2006 16:51:35 -0000 1.4 +++ template.html 6 Nov 2006 09:13:45 -0000 1.5 @@ -87,7 +87,10 @@ <ul> #foreach ($c in $standardAttrs.get("categories")) #if ("$!c"!="0") - <li>$categoryPresenter.getCategory($c).getTitle("$!lang") +#set ($tmpc = $categoryPresenter.getCategory("$!c")) +#if ("$!tmpc"!="") + <li>$tmpc.getTitle("$!lang") +#end #end #end #if (!$standardAttrs.get("categories")) Index: template-da.html =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/item/template-da.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- template-da.html 18 Oct 2006 16:51:34 -0000 1.2 +++ template-da.html 6 Nov 2006 09:13:44 -0000 1.3 @@ -74,7 +74,10 @@ <p>Kategorien, denen die Mitteilung zugeordnet ist: <ul> #foreach ($c in $item.getAttribute("categories")) - <li>$categoryPresenter.getCategory($c).getTitle("$lang") +#set ($tmpc = $categoryPresenter.getCategory("$!c")) +#if ("$!tmpc"!="") + <li>$tmpc.getTitle("$!lang") +#end #end #if (!$item.getAttribute("categories")) <li>keine Kategorien |
|
From: Michael K. <ko...@us...> - 2006-11-06 09:13:48
|
Update of /cvsroot/cobricks/drehscheibe-in/web/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6033/portal Modified Files: edit.html.de historywiki.html.en index.html.de Log Message: Index: edit.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/portal/edit.html.de,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- edit.html.de 6 Oct 2006 12:36:32 -0000 1.3 +++ edit.html.de 6 Nov 2006 09:13:45 -0000 1.4 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) <h1>Portalseite editieren</h1> @@ -34,9 +34,9 @@ <form action="$contextPath/PORTAL" method="post" enctype="multipart/form-data"> <input type="hidden" name="cmd" value="update"> -<input type="hidden" name="cmd.success" value="/portal/edit.html"> -<input type="hidden" name="cmd.error" value="/portal/edit.html"> -<input type="hidden" name="cmd.noaccess" value="/noaccess.html"> +<input type="hidden" name="cmd.success" value="$contextPath/portal/edit.html"> +<input type="hidden" name="cmd.error" value="$contextPath/portal/edit.html"> +<input type="hidden" name="cmd.noaccess" value="$contextPath/noaccess.html"> <input type="hidden" name="itemid" value="$itemid"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> @@ -93,7 +93,7 @@ <p> #if ("wikipage" == $page.getAttribute("ontologyclassname")) <p> -<a href="/portal/wikihelp.html" target="_blank">Hilfe zur Wiki-Sprache</a> +<a href="$contextPath/portal/wikihelp.html" target="_blank">Hilfe zur Wiki-Sprache</a> </p> #if ($userId == $page.getAttributeAsString("creator")) <input type="checkbox" name="newContentVersion" checked="true" value="true"> Eine neue Version des Inhalts anlegen? @@ -155,4 +155,4 @@ #end -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) +$portalPresenter.parse("/pagefooter.html", $portalRequest) Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/portal/index.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.de 22 Sep 2006 17:45:04 -0000 1.1 +++ index.html.de 6 Nov 2006 09:13:45 -0000 1.2 @@ -1,5 +1,5 @@ -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) +$portalPresenter.parse("/pageheader.html", $portalRequest) <h1>Portal</h1> @@ -10,7 +10,7 @@ am Fuss einer editierbaren Seite an.</p> <p>Zum Anlegen von neuen Seiten und anderen Web-Objekten nutzen Sie -bitte die <a href="/ADMIN/org.cobricks.portal/">Funktionalität im +bitte die <a href="$contextPath/ADMIN/org.cobricks.portal/">Funktionalität im ADMIN-Bereich.</p> -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) +$portalPresenter.parse("/pagefooter.html", $portalRequest) Index: historywiki.html.en =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/portal/historywiki.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- historywiki.html.en 6 Oct 2006 12:36:32 -0000 1.1 +++ historywiki.html.en 6 Nov 2006 09:13:45 -0000 1.2 @@ -1,22 +1,22 @@ - -$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) - - -<em><a href="index.html">Portal Component</a> - -<a href="historywiki.html">List Wiki history Objects</a></em> - -#set ( $page = $portalPresenter.getPage($itemid) ) - -<h1>Content history of $page.getPageName()</h1> - -<ul> -#foreach( $i in $itemManager.getContentVersions($corePresenter.parseInt($itemid), "$lang") ) -<li> -Creatoruserid: $i.get("creatoruserid") -- Version: <a href="$page.getPagePath()$page.getPageName()?lang=$lang&versionid=$i.get("versionid")">$i.get("versionid")</a> -- Created: $i.get("creationtime") -</li> -#end -</ul> - -$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) + +$portalPresenter.parse("/pageheader.html", $portalRequest) + + +<em><a href="index.html">Portal Component</a> - +<a href="historywiki.html">List Wiki history Objects</a></em> + +#set ( $page = $portalPresenter.getPage($itemid) ) + +<h1>Content history of $page.getPageName()</h1> + +<ul> +#foreach( $i in $itemManager.getContentVersions($corePresenter.parseInt($itemid), "$lang") ) +<li> +Creatoruserid: $i.get("creatoruserid") +- Version: <a href="$page.getPagePath()$page.getPageName()?lang=$lang&versionid=$i.get("versionid")">$i.get("versionid")</a> +- Created: $i.get("creationtime") +</li> +#end +</ul> + +$portalPresenter.parse("/pagefooter.html", $portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-11-06 09:13:48
|
Update of /cvsroot/cobricks/drehscheibe-in/web In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6033 Modified Files: navigation.html.de pageheader.html.de pageheader.html.en Removed Files: about.html.de Log Message: Index: navigation.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/navigation.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- navigation.html.de 6 Oct 2006 12:36:31 -0000 1.5 +++ navigation.html.de 6 Nov 2006 09:13:43 -0000 1.6 @@ -1,4 +1,3 @@ -<td valign=top width=150 bgColor="#e0e0e0"> <BR><A class=hnav href="/index.html.de"><B>HOME</B></A><BR> <A class=sub @@ -72,4 +71,3 @@ href="mailto:dre...@in...">Feedback</A><BR> <IMG src="/images/spacer160.gif" width=150><BR> -</TD> \ No newline at end of file Index: pageheader.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/pageheader.html.de,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pageheader.html.de 6 Oct 2006 12:36:31 -0000 1.5 +++ pageheader.html.de 6 Nov 2006 09:13:43 -0000 1.6 @@ -19,13 +19,13 @@ <TBODY> <TR> <TD vAlign=center align=left> - <A href="/index.html.de"><IMG height=50 - src="/images/abakus50x50.gif" width=50 border=0></A> </TD> + <A href="$contextPath/index.html.de"><IMG height=50 + src="$contextPath/images/abakus50x50.gif" width=50 border=0></A> </TD> <TD vAlign=center align=middle><FONT color=#a1a1a1 size=+3>Fakultät für</FONT> <FONT color="#0075cf" size=+3>Informatik</FONT><BR><FONT color=#bfbfbf size=+1>der Technischen Universität München</FONT> </TD> <TD vAlign=center align=right><A href="http://www.tum.de/"><IMG height=32 - src="/images/tum-logo60x32.gif" width=60 border=0></A></TD> + src="$contextPath/images/tum-logo60x32.gif" width=60 border=0></A></TD> </TR> </TBODY> </TABLE> @@ -33,10 +33,10 @@ <TBODY> <TR> <TD vAlign=center noWrap align=middle><font size="+1"> - <a href="/index.html.de">HOME</a> | <a href="/studium/index.html.de">STUDIUM</a> | - <a href="/forschung/index.html.de">FORSCHUNG</a> | <a href="/fakultaet/index.html.de">FAKULTÄT</a> | - <a href="/dienste/index.html.de">DIENSTE</a> | <a href="/info/index.html.de">INFORMATION</a> | - <a href="/alumni/index.html.de">ALUMNI</a> + <a href="$contextPath/index.html.de">HOME</a> | <a href="$contextPath/studium/index.html.de">STUDIUM</a> | + <a href="$contextPath/forschung/index.html.de">FORSCHUNG</a> | <a href="$contextPath/fakultaet/index.html.de">FAKULTÄT</a> | + <a href="$contextPath/dienste/index.html.de">DIENSTE</a> | <a href="$contextPath/info/index.html.de">INFORMATION</a> | + <a href="$contextPath/alumni/index.html.de">ALUMNI</a> </font> </TD> </TR> @@ -47,23 +47,23 @@ <TR> #if ($!userLogin != "anonymous") <TD align=left valign=top>Login: - <A href="/user/user.html.de"><B>$!userLogin</B></A> + <A href="$contextPath/user/user.html.de"><B>$!userLogin</B></A> </TD> <TD align=right valign=top> - <A href="/suche.html.de">Suche</A> - - <A href="/doku/index.html.de">Hilfe</A> - - <A href="/PORTAL?cmd=logout">Logout</a> + <A href="$contextPath/suche.html.de">Suche</A> - + <A href="$contextPath/doku/index.html.de">Hilfe</A> - + <A href="$contextPath/PORTAL?cmd=logout">Logout</a> <div style="margin:2px;">$portalPresenter.printLang($portalRequest,"de,en")</div> #else <TD align=left valign=top> - <A href="/user/login.html.de"><B>Login</B></A> - <A href="/user/register.html.de"><B>Neuer Benutzer</B></A> + <A href="$contextPath/user/login.html.de"><B>Login</B></A> + <A href="$contextPath/user/register.html.de"><B>Neuer Benutzer</B></A> </TD> <TD align=right valign=top> - <A href="/suche.html.de">Suche</A> - - <A href="/doku/index.html.de">Hilfe</A> - <div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> + <A href="$contextPath/suche.html.de">Suche</A> - + <A href="$contextPath/doku/index.html.de">Hilfe</A> + <div style="margin:2px;">$portalPresenter.printLang($portalRequest,"de,en")</div> #end </TD> </TR> @@ -74,7 +74,7 @@ <tr> <td colspan=3><font size="-1">Sie sind hier: <a -href="/index.html">Startseite</a> +href="$contextPath/index.html">Startseite</a> $portalPresenter.printNavigationPath($portalRequest)</font></td> </tr> @@ -94,6 +94,8 @@ <table width ="100%" border=0 cellSpacing=1 cellPadding=15> <tr> #if ( $print != "true" ) +<TD vAlign=top width=150 bgColor=#e0e0e0 > $portalPresenter.parse("navigation.html.de",$portalRequest,"/navigation.html.de") +</td> #end <td valign="top"> \ No newline at end of file Index: pageheader.html.en =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/pageheader.html.en,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pageheader.html.en 6 Oct 2006 12:36:31 -0000 1.2 +++ pageheader.html.en 6 Nov 2006 09:13:43 -0000 1.3 @@ -19,13 +19,13 @@ <TBODY> <TR> <TD vAlign=center align=left> - <A href="/index.html"><IMG height=50 - src="/images/abakus50x50.gif" width=50 border=0></A> </TD> + <A href="$contextPath/index.html"><IMG height=50 + src="$contextPath/images/abakus50x50.gif" width=50 border=0></A> </TD> <TD vAlign=center align=middle><FONT color=#a1a1a1 size=+3>Department of </FONT> <FONT color="#0075cf" size=+3>Informatics</FONT><BR><FONT color=#bfbfbf size=+1>Technische Universität München</FONT> </TD> <TD vAlign=center align=right><A href="http://www.tum.de/"><IMG height=32 - src="/images/tum-logo60x32.gif" width=60 border=0></A></TD> + src="$contextPath/images/tum-logo60x32.gif" width=60 border=0></A></TD> </TR> </TBODY> </TABLE> @@ -33,10 +33,10 @@ <TBODY> <TR> <TD vAlign=center noWrap align=middle><font size="+1"> - <a href="/index.html">HOME</a> | <a href="/studium/index.html">ACADEMIC</a> | - <a href="/forschung/index.html">RESEARCH</a> | <a href="/fakultaet/index.html">DEPARTMENT</a> | - <a href="/dienste/index.html">SERVICE</a> | <a href="/info/index.html">INFORMATION</a> | - <a href="/alumni/index.html">ALUMNI</a> + <a href="$contextPath/index.html">HOME</a> | <a href="$contextPath/studium/index.html">ACADEMIC</a> | + <a href="$contextPath/forschung/index.html">RESEARCH</a> | <a href="$contextPath/fakultaet/index.html">DEPARTMENT</a> | + <a href="$contextPath/dienste/index.html">SERVICE</a> | <a href="$contextPath/info/index.html">INFORMATION</a> | + <a href="$contextPath/alumni/index.html">ALUMNI</a> </font> </TD> </TR> @@ -47,23 +47,23 @@ <TR> #if ($!userLogin != "anonymous") <TD align=left valign=top>Login: - <A href="/user/user.html"><B>$!userLogin</B></A> + <A href="$contextPath/user/user.html"><B>$!userLogin</B></A> </TD> <TD align=right valign=top> - <A href="/suche.html">Search</A> - - <A href="/doku/index.html">Help</A> - - <A href="/PORTAL?cmd=logout">Logout</a> + <A href="$contextPath/suche.html">Search</A> - + <A href="$contextPath/doku/index.html">Help</A> - + <A href="$contextPath/PORTAL?cmd=logout">Logout</a> <div style="margin:2px;">$portalPresenter.printLang($portalRequest,"de,en")</div> #else <TD align=left valign=top> - <A href="/user/login.html"><B>Login</B></A> - <A href="/user/register.html"><B>New User</B></A> + <A href="$contextPath/user/login.html"><B>Login</B></A> + <A href="$contextPath/user/register.html"><B>New User</B></A> </TD> <TD align=right valign=top> - <A href="/suche.html">Search</A> - - <A href="/doku/index.html">Help</A> - <div style="margin:2px;">$portalPresenter.printLang($portalRequest)</div> + <A href="$contextPath/suche.html">Search</A> - + <A href="$contextPath/doku/index.html">Help</A> + <div style="margin:2px;">$portalPresenter.printLang($portalRequest,"de,en")</div> #end </TD> </TR> @@ -74,7 +74,7 @@ <tr> <td colspan=3><font size="-1">You are here: <a -href="/index.html">Home</a> +href="$contextPath/index.html">Home</a> $portalPresenter.printNavigationPath($portalRequest)</font></td> </tr> @@ -96,6 +96,8 @@ <table width ="100%" border=0 cellSpacing=1 cellPadding=15> <tr> #if ( $print != "true" ) +<TD vAlign=top width=150 bgColor=#e0e0e0 > $portalPresenter.parse("navigation.html",$portalRequest,"/navigation.html") +</td> #end <td valign="top"> \ No newline at end of file --- about.html.de DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-11-06 09:13:47
|
Update of /cvsroot/cobricks/drehscheibe-in/web/WEB-INF/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6033/WEB-INF/lib Added Files: commons-codec-1.3.jar Removed Files: xindice-1.1b4.jar Log Message: --- xindice-1.1b4.jar DELETED --- --- NEW FILE: commons-codec-1.3.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Wolfgang W. <wo...@us...> - 2006-11-03 16:12:46
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15609 Modified Files: PortalPresenter.java Log Message: Index: PortalPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- PortalPresenter.java 26 Oct 2006 10:38:25 -0000 1.49 +++ PortalPresenter.java 3 Nov 2006 16:12:38 -0000 1.50 @@ -1149,5 +1149,17 @@ return result; } + /** + * Returns a substring of the specified string + */ + + public final String substr (String str, int n) + { + if (str.length() > n) + return str.substring (0, n); + return str; + } + + } |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:24:07
|
Update of /cvsroot/cobricks/cobricks2/web/discussion In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12270/discussion Modified Files: index.html Log Message: Index: index.html =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/discussion/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.html 30 May 2006 14:48:06 -0000 1.3 +++ index.html 3 Nov 2006 07:24:04 -0000 1.4 @@ -1,21 +1,26 @@ -#parse ( "pageheader.html" ) -<em>$coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")</em> +$portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) -<h1>$coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")</h1> -#if($coreManager.getProperty("org.cobricks.discussion.settings.forum_descr") != "") +<em><a href="index.html">Discussion Component</a></em> + +<h1>Discussion Component</h1> + +#if("$!coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")" != "") +<h1>$!coreManager.getProperty("org.cobricks.discussion.settings.forum_headline")</h1> +#end +#if("$!coreManager.getProperty("org.cobricks.discussion.settings.forum_descr")" != "") $coreManager.getProperty("org.cobricks.discussion.settings.forum_descr") #end #set( $hasAccess = true ) ## tbd #if (!$discussionManager) - <h2>Couldn't find Discussion Component</h2> + <h2>Could not find Discussion Component</h2> <p> Please make sure, that every part of the component has been loaded without errors. </p> #elseif (!$categoryManager) - <h2>Couldn't find Category Component</h2> + <h2>Could not find Category Component</h2> <p> Please make sure, that every part of the component has been loaded without errors. @@ -55,5 +60,4 @@ #end #end -#parse ( "pagefooter.html" ) - +$portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:24:07
|
Update of /cvsroot/cobricks/cobricks2/web/context In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12270/context Modified Files: create.html.en index.html.en Log Message: Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/context/index.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.html.en 1 Oct 2004 13:42:49 -0000 1.3 +++ index.html.en 3 Nov 2006 07:24:04 -0000 1.4 @@ -64,7 +64,7 @@ <option value="8">uri </select></td></tr> <tr><td>Destinationid</td><td><input name="destinationid" size="10"></td></tr> -<tr><td colspan="2"><input type="checkbox" name="globally" value="true"> search globally</td></tr> +<tr><td colspan="2"><input type="checkbox" name="globally" value="true"> search globally (in all components)</td></tr> <tr><td colspan="2"><input type="submit" class="submit" value="Search"></td></tr> </table> </form> Index: create.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/context/create.html.en,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- create.html.en 1 Oct 2004 13:42:49 -0000 1.3 +++ create.html.en 3 Nov 2006 07:24:04 -0000 1.4 @@ -29,7 +29,7 @@ #end #end </select></td></tr> -<tr><td>Sourceid</td><td><input name="sourceid" size="10" value="$!sourceid"> +<tr><td valign="top">Sourceid</td><td><input name="sourceid" size="10" value="$!sourceid"> <select name="sourcetype"> <option value="15">auto <option value="1">user @@ -39,7 +39,7 @@ </select><br> <em>(if the source type is user you can also specify the user login, if source type is uri then you can provide the uri)</em></td></tr> -<tr><td>Destinationids</td><td><input name="destinationids" size="40" value="$!destinationids"><select name="sourcetype"> +<tr><td valign="top">Destinationids</td><td><input name="destinationids" size="40" value="$!destinationids"><select name="sourcetype"> <option value="15">auto <option value="1">user <option value="2">item |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:24:07
|
Update of /cvsroot/cobricks/cobricks2/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12270/user Modified Files: login.html.en Log Message: Index: login.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/user/login.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- login.html.en 31 May 2006 05:59:45 -0000 1.1 +++ login.html.en 3 Nov 2006 07:24:04 -0000 1.2 @@ -3,19 +3,28 @@ <h1>Login</h1> -#if ($returnCode > 2000) +#if ($returnCode == 1020) + <div class="success"> + New password for $!auserlogin generated and sent to $!email. + </div> +#end +#if ($returnCode > 1999) <div class="error"> - #if ($returnCode == 2001) + #if ($returnCode == 2201) The login name "$luserlogin" is not defined. - #end - #if ($returnCode == 2002) + #elseif ($returnCode == 2202) The password is not correct for login "$luserlogin". + #elseif ($returnCode == 2030) + Failed resetting password. + #elseif ($returnCode == 2031) + No account found for given login and email. + #elseif ($returnCode == 2001) + User login missing. + #elseif ($returnCode == 2003) + Email address missing. + #else + Failed performing function. #end - #if ($returnCode > 2002) - Failed during login. - #end - #if ($returnCode == 1006) - Email is an obligatory field. #end </div> #end |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:24:07
|
Update of /cvsroot/cobricks/cobricks2/web/WEB-INF/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12270/WEB-INF/lib Removed Files: xindice-1.1b4.jar Log Message: --- xindice-1.1b4.jar DELETED --- |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:23:10
|
Update of /cvsroot/cobricks/cobricks2/conf In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12192 Modified Files: localproperties.txt.orig Log Message: Index: localproperties.txt.orig =================================================================== RCS file: /cvsroot/cobricks/cobricks2/conf/localproperties.txt.orig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- localproperties.txt.orig 30 May 2006 14:31:59 -0000 1.8 +++ localproperties.txt.orig 3 Nov 2006 07:23:07 -0000 1.9 @@ -54,3 +54,18 @@ #mail.smtp.host=smtp.domain.com #mail.smtp.user=username #mail.smtp.pw=userpw + + +portal.icon.mimetype.default=/images/mimetype/unknown.gif +portal.icon.mimetype.application/msword=/images/mimetype/msword.gif +portal.icon.mimetype.application/msexcel=/images/mimetype/msexcel.gif +portal.icon.mimetype.application/mspowerpoint=/images/mimetype/msppt.gif +portal.icon.mimetype.application/pdf=/images/mimetype/pdf.gif +portal.icon.mimetype.application/postscript=/images/mimetype/ps.gif +portal.icon.mimetype.application/x-tar=/images/mimetype/tar.gif +portal.icon.mimetype.image=/images/mimetype/image.gif +portal.icon.mimetype.image/gif=/images/mimetype/gif.gif +portal.icon.mimetype.image/jpeg=/images/mimetype/jpeg.gif +portal.icon.mimetype.image/tiff=/images/mimetype/tiff.gif +portal.icon.mimetype.video=/images/mimetype/video.gif +portal.icon.mimetype.audio=/images/mimetype/audio.gif |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:22:58
|
Update of /cvsroot/cobricks/cobricks2 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11864 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/build.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- build.xml 11 Jul 2006 10:27:02 -0000 1.56 +++ build.xml 3 Nov 2006 07:22:55 -0000 1.57 @@ -131,31 +131,11 @@ <fileset dir="${src.home}" excludes="**/*.java"/> </copy> - <antcall target="compilexindice"/> <antcall target="compilejetspeed"/> <antcall target="compilerfid"/> </target> -<target name="compilexindice" depends="prepare" - description="Compile Java sources for Xindice wrapper" - if="xindice.home"> - <javac srcdir="${src.home}" - destdir="${build.home}/webapps/${webappname}/WEB-INF/classes" - debug="${compile.debug}" - deprecation="${compile.deprecation}" - optimize="${compile.optimize}"> - <classpath> - <path refid="compile.classpath"/> - <fileset dir="${xindice.home}"> - <include name="lib/xml*.jar"/> - <exclude name="lib/xmldb-api-sdk*.jar"/> - </fileset> - </classpath> - <include name="org/cobricks/item/xmldb/**/*.java"/> - </javac> -</target> - <target name="compilejetspeed" depends="prepare" description="Compile Java sources for Jetspeed portlet support" if="jetspeed.home"> @@ -247,6 +227,8 @@ <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/core/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/util/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/user/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/item/**" /> @@ -258,16 +240,14 @@ includes="org/cobricks/message/**" /> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/portal/**" /> - </jar> - - <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksVoting.jar"> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/voting/**" /> - </jar> - - <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksCourse.jar"> <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" includes="org/cobricks/course/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/agent/**" /> + <fileset dir="${build.home}/webapps/${webappname}/WEB-INF/classes" + includes="org/cobricks/discussion/**" /> </jar> <jar jarfile="${distbin}/web/WEB-INF/lib/cobricksCwall.jar"> @@ -485,23 +465,11 @@ </fileset> </copy> - <!-- copy xindice libraries --> - <antcall target="copyxindice"/> - <!-- copy rfid libraries --> <antcall target="copyrfid"/> </target> -<target name="copyxindice" if="xindice.home"> - <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> - <fileset dir="${xindice.home}/lib"> - <include name="xml*.jar"/> - <exclude name="xmldb-api-sdk*"/> - </fileset> - </copy> -</target> - <target name="copyrfid" if="rfid.home"> <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib"> <fileset dir="${rfid.home}"> @@ -784,6 +752,20 @@ </java> </target> +<target name="doit" depends="compile"> + <java fork="yes" classname="org.cobricks.util.doIt" + classpathref="exec.classpath"> + <arg line="-c conf"/> + </java> +</target> + +<target name="addrole" depends="compile"> + <java fork="yes" classname="org.cobricks.util.assignUserRole" + classpathref="exec.classpath"> + <arg line="-c conf -u kochm -r admin"/> + </java> +</target> + <target name="updateweb"> <!-- Create build directories as needed --> <mkdir dir="${build.home}"/> |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:22:34
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11847 Modified Files: GeoUtil.java Log Message: Index: GeoUtil.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util/GeoUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GeoUtil.java 26 Oct 2006 10:38:25 -0000 1.2 +++ GeoUtil.java 3 Nov 2006 07:22:29 -0000 1.3 @@ -12,6 +12,7 @@ package org.cobricks.core.util; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -185,11 +186,10 @@ { DBAccess dbAccess = coreManager.getDBAccess(); address = normalizeAddress(address); - address = address.replaceAll("'", "\\\'"); // escape sql ... - String sql = - "select lat, lng from geocoding_cache where address = '" - +address+"'"; - List results = dbAccess.sqlQuery(sql); + String sql = "select lat, lng from geocoding_cache where address = ?"; + List objects = new ArrayList(); + objects.add(address); + List results = dbAccess.sqlQuery(sql, objects, -1); if (results == null || results.size()<1) return null; Map m = (Map)results.iterator().next(); |
|
From: Michael K. <ko...@us...> - 2006-11-03 07:22:18
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/db In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11821 Modified Files: DBAccessImpl.java Log Message: Index: DBAccessImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/db/DBAccessImpl.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- DBAccessImpl.java 30 May 2006 14:32:00 -0000 1.27 +++ DBAccessImpl.java 3 Nov 2006 07:22:13 -0000 1.28 @@ -947,11 +947,10 @@ Object next = i.next(); if (next instanceof Set) { Set nextList = (Set) next; - setPreparedObjects(pstmt, nextList); - + setPreparedObjects(pstmt, nextList); } else{ - setPreparedObject(pstmt, next, pcount++); + setPreparedObject(pstmt, next, pcount++); } } ResultSet rs = pstmt.executeQuery(); |
|
From: Wolfgang W. <wo...@us...> - 2006-11-02 07:17:19
|
Update of /cvsroot/cobricks/drehscheibe-in/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25733 Modified Files: login.html.de user.html.de Log Message: Index: user.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user.html.de,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- user.html.de 18 Oct 2006 16:52:00 -0000 1.14 +++ user.html.de 2 Nov 2006 07:17:12 -0000 1.15 @@ -134,7 +134,9 @@ </td></tr></table><br> <p> +<table border="0" width="100%"><tr><td> <input type="submit" value="Benutzerprofil aktualisieren"> +</td><td width="100%" align="right"> </form> <div align="right"> Index: login.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login.html.de,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- login.html.de 18 Oct 2006 16:52:00 -0000 1.10 +++ login.html.de 2 Nov 2006 07:17:12 -0000 1.11 @@ -5,7 +5,7 @@ #if ($returnCode == 1030) <div class="success"> - Neues Passwort für Benutzerlogin "$!auserlogin" gesetzt und an + Neues Passwort für Benutzerlogin "$!auserlogin" gesetzt und an E-Mail Adresse "$!email" geschickt. </div> #end @@ -21,12 +21,12 @@ #elseif ($returnCode == 2003) Keine oder eine illegale E-Mail-Adresse angegeben. #elseif ($returnCode == 2030) - Fehler beim Zurücksetzen des Passworts. + Fehler beim Zurücksetzen des Passworts. #elseif ($returnCode == 2031) Der angebene Benutzerlogin exisitert nicht oder hat nicht die angegebene E-Mail-Adresse zugeordnet. #else - Fehler bei der Ausführung des Dienstes. + Fehler bei der Ausführung des Dienstes. #end </div> #end @@ -34,10 +34,11 @@ <p class="standard">Bitte geben Sie Ihren Benutzernamen und das für diesen Benutzernamen gewählte Passwort ein um sich anzumelden. Sie können dabei sowohl lokale Kennungen nutzen als -auch Ihre mytum-Kennung. Falls Sie noch keine Kennung auf dieser -Plattform oder auf dem mytum-Portal eingerichtet haben, dann -können Sie jetzt <a href="/user/register.html">eine lokale -Kennung anlegen</a>.</p> +auch Ihre MyTUM-Kennung (z.B. mus...@my...). +<br> +Weitere Informationen zur MyTUM-Kennung finden Sie hier: +<a href="http://portal.mytum.de/onlinehelp/anmeldung/">http://portal.mytum.de/onlinehelp/anmeldung/</a>. +Über das MyTUM-Portal können Sie auch Ihr Passwort ändern.</p> <quote> <form name="loginForm" action="/PORTAL" method="post"> |
|
From: Michael K. <ko...@us...> - 2006-10-26 10:38:31
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14571/core/util Modified Files: GeoUtil.java Log Message: Index: GeoUtil.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/core/util/GeoUtil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GeoUtil.java 18 Oct 2006 16:49:21 -0000 1.1 +++ GeoUtil.java 26 Oct 2006 10:38:25 -0000 1.2 @@ -185,6 +185,7 @@ { DBAccess dbAccess = coreManager.getDBAccess(); address = normalizeAddress(address); + address = address.replaceAll("'", "\\\'"); // escape sql ... String sql = "select lat, lng from geocoding_cache where address = '" +address+"'"; @@ -232,7 +233,12 @@ address = normalizeAddress(address); result = lookupAddress(address, coreManager); if (result == null){ // address was not found in the cache - String q = address.replace(' ', '+'); + String q = address; + try { + q = java.net.URLEncoder.encode(q, "UTF-8"); + } catch (Exception e) { + logger.warn("failed encoding "+q+": "+e.toString()); + } String output = "csv"; String geourl = geocoder + "?q=" + q + "&output=" + output + "&key=" + googleKey; @@ -254,7 +260,7 @@ + "using 8080."); hc.setProxy(proxyHost, 8080); } - hc.setHost("www.openbc.com",-1,"http"); + hc.setHost("maps.google.com",-1,"http"); } String content = null; @@ -276,6 +282,7 @@ } finally { method.releaseConnection(); } + if (content == null) return null; String georesult = content; String[] parsed = georesult.split(","); |
|
From: Michael K. <ko...@us...> - 2006-10-26 10:38:29
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/item In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14571/item Modified Files: ItemPresenter.java ItemSearch.java Log Message: Index: ItemPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemPresenter.java,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- ItemPresenter.java 18 Oct 2006 16:47:50 -0000 1.52 +++ ItemPresenter.java 26 Oct 2006 10:38:25 -0000 1.53 @@ -1620,44 +1620,36 @@ } List itemids = itemManager.searchItems(xpath.toString()); - if (sortby!=null && sortby.length()>0) { if (sortby.equals("title") || sortby.equals("title_de")) { - itemids = itemManager.sortItemsByAttribute(itemids,"title_de"); + itemids = itemManager. + sortItemsByAttribute(itemids,"title_de"); } if (sortby.equals("author")) { - itemids = itemManager.sortItemsByAttribute(itemids,"author"); + itemids = itemManager. + sortItemsByAttribute(itemids,"author"); } if (sortby.equals("creationtime")) { - itemids = itemManager.sortItemsByAttribute(itemids,"creationtime"); + itemids = itemManager. + sortItemsByAttribute(itemids,"creationtime"); } if (sortby.equals("updatetime")) { - itemids = itemManager.sortItemsByAttribute(itemids,"updatetime"); + itemids = itemManager. + sortItemsByAttribute(itemids,"updatetime"); } } List results = new ArrayList(); - Vector itemVector = new Vector(); - if (itemids != null) { - Iterator i = itemids.iterator(); - while (i.hasNext()) { - itemVector.add(i.next()); - } - } - - if (maxrows==0||maxrows>itemVector.size()){ - for(int j=0;j<itemVector.size();j++) { - Item item = (Item)itemVector.get(itemVector.size()-j-1); - if (item != null) results.add(item); + if (maxrows>0 && maxrows<itemids.size()){ + ListIterator li = itemids.listIterator(); + for (int j=0;j<maxrows;j++) { + results.add(li.next()); } } else { - results=itemids; - } - for(int k =0;k<itemVector.size();k++) { - Item item = (Item)itemVector.get(k); + results = itemids; } - itemVector.removeAllElements(); return results; + } catch (Exception e) { logger.error(LogUtil.ex("failed", e)); } Index: ItemSearch.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/item/ItemSearch.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ItemSearch.java 5 Oct 2006 17:57:50 -0000 1.27 +++ ItemSearch.java 26 Oct 2006 10:38:25 -0000 1.28 @@ -1974,7 +1974,6 @@ if (i>0) sql += " AND "; sql += whereArray[i]; } - logger.debug("sql query :" + sql); // execute and postprocess listOfMaps = ((DBAccessImpl)dbAccess).sqlQuerySpecificIdent(sql); |
|
From: Michael K. <ko...@us...> - 2006-10-26 10:38:29
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/portal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14571/portal Modified Files: CalendarPresenter.java InitServlet.java PortalPresenter.java Log Message: Index: PortalPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/PortalPresenter.java,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- PortalPresenter.java 18 Oct 2006 16:47:50 -0000 1.48 +++ PortalPresenter.java 26 Oct 2006 10:38:25 -0000 1.49 @@ -505,11 +505,14 @@ sb.append(ilang); sb.append("\">"); sb.append("<span style=\"margin:2px;\">" - +"<img border=0 alt=\""); - sb.append(tmps); - sb.append("\" src=\"/images/lang-"); + +"<img border=\"0\" alt=\""); sb.append(ilang); - sb.append(".png\"></span>"); + sb.append("\" src=\""); + sb.append(portalRequest.getHttpServletRequest(). + getContextPath()); + sb.append("/images/lang-"); + sb.append(ilang); + sb.append(".png\"/></span>"); sb.append("</a>"); } } Index: CalendarPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/CalendarPresenter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CalendarPresenter.java 18 Oct 2006 16:47:50 -0000 1.5 +++ CalendarPresenter.java 26 Oct 2006 10:38:25 -0000 1.6 @@ -391,13 +391,25 @@ sb.append("</tbody></table>"); sb.append("<p>"); - sb.append("Change View: <a href=\""); + if (lang.equals("de")) { + sb.append("Change View: <a href=\""); + } else { + sb.append("Ansicht wechseln: <a href=\""); + } sb.append(daytemplate); sb.append("01.").append(month).append(".").append(year); - sb.append("\">day</a> | <a href=\""); + if (lang.equals("de")) { + sb.append("\">Tag</a> | <a href=\""); + } else { + sb.append("\">day</a> | <a href=\""); + } sb.append(weektemplate); sb.append("01.").append(month).append(".").append(year); - sb.append("\">week</a>"); + if (lang.equals("de")) { + sb.append("\">Woche</a>"); + } else { + sb.append("\">week</a>"); + } return sb.toString(); } @@ -501,13 +513,25 @@ sb.append("</table>"); sb.append("<p>"); - sb.append("Change View: <a href=\""); + if (lang.equals("de")) { + sb.append("Change View: <a href=\""); + } else { + sb.append("Ansicht wechseln: <a href=\""); + } sb.append(daytemplate); sb.append("01.").append(month).append(".").append(year); - sb.append("\">day</a> | <a href=\""); + if (lang.equals("de")) { + sb.append("\">Tag</a> | <a href=\""); + } else { + sb.append("\">day</a> | <a href=\""); + } sb.append(monthtemplate); sb.append("01.").append(month).append(".").append(year); - sb.append("\">month</a>"); + if (lang.equals("de")) { + sb.append("\">Monat</a>"); + } else { + sb.append("\">month</a>"); + } return sb.toString(); } @@ -592,13 +616,25 @@ sb.append("</table>"); sb.append("<p>"); - sb.append("Change View: <a href=\""); + if (lang.equals("de")) { + sb.append("Change View: <a href=\""); + } else { + sb.append("Ansicht wechseln: <a href=\""); + } sb.append(monthtemplate); sb.append("01.").append(month).append(".").append(year); - sb.append("\">month</a> | <a href=\""); + if (lang.equals("de")) { + sb.append("\">Monat</a> | <a href=\""); + } else { + sb.append("\">month</a> | <a href=\""); + } sb.append(weektemplate); sb.append("01.").append(month).append(".").append(year); - sb.append("\">week</a>"); + if (lang.equals("de")) { + sb.append("\">Woche</a>"); + } else { + sb.append("\">week</a>"); + } return sb.toString(); } Index: InitServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/portal/InitServlet.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- InitServlet.java 18 Oct 2006 16:47:50 -0000 1.12 +++ InitServlet.java 26 Oct 2006 10:38:25 -0000 1.13 @@ -190,18 +190,3 @@ } } - - - - - - - - - - - - - - - |
|
From: Michael K. <ko...@us...> - 2006-10-26 10:38:29
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14571/user Modified Files: UserManagerImpl.java userontology.xml Log Message: Index: UserManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/UserManagerImpl.java,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- UserManagerImpl.java 18 Oct 2006 16:47:50 -0000 1.68 +++ UserManagerImpl.java 26 Oct 2006 10:38:25 -0000 1.69 @@ -1142,8 +1142,13 @@ if (attrs.get(User.USERCLASS) == null) { attrs.put(User.USERCLASS, ontology.getClass("user").getName()); } else { - attrs.put(User.USERCLASS, ontology.getClass( + try { + attrs.put(User.USERCLASS, ontology.getClass( (String) attrs.get(User.USERCLASS)).getName()); + } catch (Exception e) { + attrs.put(User.USERCLASS, + ontology.getClass("user").getName()); + } } // password must be crypted and inserted in the corresponding Index: userontology.xml =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/user/userontology.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- userontology.xml 18 Oct 2006 16:47:50 -0000 1.16 +++ userontology.xml 26 Oct 2006 10:38:25 -0000 1.17 @@ -122,11 +122,25 @@ <description lang="en">Phone (private)</description> </attr> <attr name="basic.contact-priv.telecom.fax" type="string(25)"/> - <attr name="basic.contact-work.postal.comment" type="string(50)"/> - <attr name="basic.contact-work.postal.street" type="string(50)"/> - <attr name="basic.contact-work.postal.city" type="string(30)"/> - <attr name="basic.contact-work.postal.postalcode" type="string(20)"/> - <attr name="basic.contact-work.postal.country" type="string(30)"/> + </attr> + <attr name="basic.contact-work.postal.comment" type="string(50)"> + </attr> + <attr name="basic.contact-work.postal.street" type="string(50)"> + <description lang="de">Strasse</description> + <description lang="en">Street</description> + </attr> + <attr name="basic.contact-work.postal.city" type="string(30)"> + <description lang="de">Stadt</description> + <description lang="en">City</description> + </attr> + <attr name="basic.contact-work.postal.postalcode" type="string(20)"> + <description lang="de">PLZ</description> + <description lang="en">Zip code</description> + </attr> + <attr name="basic.contact-work.postal.country" type="string(30)"> + <description lang="de">Land</description> + <description lang="en">Country</description> + </attr> <attr name="basic.contact-work.online.email" type="string(50)"> <description lang="de">E-Mail (geschaeftlich)</description> <description lang="en">Email (work)</description> @@ -136,6 +150,18 @@ <description lang="de">Homepage (geschäftlich)</description> <description lang="en">Homepage (work)</description> </attr> + <attr name="basic.contact-work.online.messenger.icq" type="string(100)"> + <description lang="de">ICQ ID</description> + <description lang="en">ICQ ID</description> + </attr> + <attr name="basic.contact-work.online.messenger.msn" type="string(100)"> + <description lang="de">MSN ID</description> + <description lang="en">MSN ID</description> + </attr> + <attr name="basic.contact-work.online.messenger.skype" type="string(100)"> + <description lang="de">Skype ID</description> + <description lang="en">Skype ID</description> + </attr> <attr name="basic.contact-work.telecom.mobile" type="string(25)"> <description lang="de">Mobiltelefon (geschaeftlich)</description> <description lang="en">Mobile phone (work)</description> @@ -144,14 +170,20 @@ <description lang="de">Telefon (geschaeftlich)</description> <description lang="en">Phone (work)</description> </attr> - <attr name="basic.contact-work.telecom.fax" type="string(25)"/> - + <attr name="basic.contact-work.telecom.fax" type="string(25)"> + <description lang="de">Fax (geschaeftlich)</description> + <description lang="en">Fax number (work)</description> + </attr> + <attr name="basic.credentials.password.crypt" type="string(30)"/> <attr name="basic.work.companyname" type="string(150)"/> <attr name="basic.work.jobdescription" type="string(50)"/> - <attr name="interests.freetext" type="string(500)"/> + <attr name="interests.freetext" type="string(500)"> + <description lang="de">Interessen</description> + <description lang="en">Interests</description> + </attr> <attr name="interests.categories" type="category[]"> <description lang="de">Interessen</description> <description lang="en">Interests</description> @@ -167,8 +199,12 @@ <contextclass>ContextUserUser</contextclass> </attr> - <attr name="history.org.cobricks.lastlogin" type="date"/> - <attr name="history.org.cobricks.regtime" type="date"/> + <attr name="history.org.cobricks.lastlogin" type="date"> + <description lang="en">Last login</description> + </attr> + <attr name="history.org.cobricks.regtime" type="date"> + <description lang="en">Member since</description> + </attr> <attr name="preference.language" type="string(2)"> <description lang="de">bevorzugte Sprache</description> |
|
From: Michael K. <ko...@us...> - 2006-10-26 10:38:10
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/context In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14132 Modified Files: ContextManagerImpl.java ContextPresenter.java Log Message: Index: ContextManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextManagerImpl.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ContextManagerImpl.java 18 Oct 2006 16:47:49 -0000 1.10 +++ ContextManagerImpl.java 26 Oct 2006 10:38:03 -0000 1.11 @@ -342,7 +342,7 @@ // if a destination id is specified, then query a join of the // context table and the context_destination table else { - String sql = "select cid, classname, sourcetype, sourceid, " + String sql = "select context.cid, classname, sourcetype, sourceid, " +"destinationtype from context, context_destination " +"where context.cid = context_destination.cid and " +"destinationid = "+Integer.toString(destinationid); Index: ContextPresenter.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextPresenter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ContextPresenter.java 6 Oct 2006 13:03:06 -0000 1.3 +++ ContextPresenter.java 26 Oct 2006 10:38:03 -0000 1.4 @@ -71,13 +71,13 @@ if (globally!=null && globally.equals("true")) { List result = contextManager.searchContexts(stype, dtype, - classname, sid, 0, (Map)null); + classname, sid, did, (Map)null); if (result == null) result = new ArrayList(); return result; } else { List result = contextManager.getContexts(stype, dtype, - classname, sid, 0, (Map)null); + classname, sid, did, (Map)null); if (result == null) result = new ArrayList(); return result; } |
|
From: Michael K. <ko...@us...> - 2006-10-18 16:52:08
|
Update of /cvsroot/cobricks/drehscheibe-in/web/user In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24771 Modified Files: index.html.de login-success.html.de login.html.de user-buddylist.html.de user-interests.html.de user.html.de Added Files: user-contact.html Log Message: Index: user-buddylist.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-buddylist.html.de,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- user-buddylist.html.de 22 Sep 2006 17:42:27 -0000 1.4 +++ user-buddylist.html.de 18 Oct 2006 16:52:00 -0000 1.5 @@ -58,6 +58,7 @@ <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="aname" value="pim.network.buddylist" /> <input type="hidden" name="uid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> <p> <table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> @@ -65,8 +66,9 @@ <td> <table border="0" cellpadding="5pt"><tr><td> <em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - +<a href="user-contact.html?auserlogin=$auserlogin">Kontaktdaten</a> - <a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - -<a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - +<a href="user-buddylist.html?auserlogin=$auserlogin"><b>Freundesliste</b></a> - <a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> </td></tr></table></td> <td align="right"> @@ -135,6 +137,7 @@ <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="aname" value="pim.network.buddylist" /> <input type="hidden" name="uid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> Um jemanden zur Freundesliste hinzuzufügen geben Sie bitte hier ihre oder seine Benutzerkennung/Benutzerlogin an. Index: login-success.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login-success.html.de,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- login-success.html.de 22 Sep 2006 17:42:27 -0000 1.8 +++ login-success.html.de 18 Oct 2006 16:52:00 -0000 1.9 @@ -1,7 +1,10 @@ $portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) -<h1>Hallo <b>$luserlogin</b>,</h1> +#set ( $auserid = $userManager.getUserIdForUserLogin($userlogin) ) +#set ($auser = $userManager.getUser($auserid)) + +<h1>Hallo <b>$auser.getName()</b>,</h1> <p><div class="success">Das Anmelden war erfolgreich.</div></p> @@ -15,7 +18,7 @@ <p> <li><a href="/item/">Inhaltsmanagement</a> - Ankündigungen, ... <p> -<li><a href="/item/">Portal-Management</a> - Web-Seiten, ... +<li><a href="/portal/">Portal-Management</a> - Web-Seiten, ... <p> <li><a href="/course/">Course Management</a> - Lehrveranstaltungen, Module, ... </ul> Index: login.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/login.html.de,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- login.html.de 22 Sep 2006 17:42:27 -0000 1.9 +++ login.html.de 18 Oct 2006 16:52:00 -0000 1.10 @@ -78,6 +78,12 @@ </table> </p> #set ($login = "$!auserlogin") +#if ($returnCode == 1030) + <div class="success"> + Neues Passwort gesetzt und an + E-Mail Adresse "$!email" geschickt. + </div> +#end <p><input type=submit value="Neues Passwort anfordern"/></p> <p>Nach dem Überprüfen Ihrer Angaben werden Ihnen Ihre Zugangsdaten für die Plattform an die angegebene E-Mail-Adresse geschickt.</p> Index: user.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user.html.de,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- user.html.de 6 Oct 2006 12:36:32 -0000 1.13 +++ user.html.de 18 Oct 2006 16:52:00 -0000 1.14 @@ -47,14 +47,11 @@ <p>Loginname: $auserlogin (Id: $auserid)</p> <p> -#if ($returnCode == 1020) +#if ($returnCode == 2060) <p><div class="error">Fehler beim Aktualisieren des Benutzerprofils.</div></p> #end -#if ($returnCode == 2001) - <p><div class="info">Ihre Änderungen wirde erfolgreich gespeichert.</div></p> -#end -#if ($returnCode == 2002) - <p><div class="info">Sie haben nicht geändert..</div></p> +#if ($returnCode == 1060) + <p><div class="info">Ihre Änderungen wurden erfolgreich gespeichert.</div></p> #end <p> @@ -63,6 +60,7 @@ <td> <table border="0" cellpadding="5pt"><tr><td> <em><a href="user.html?auserlogin=$auserlogin"><b>Basisdaten</b></a> - +<a href="user-contact.html?auserlogin=$auserlogin">Kontaktdaten</a> - <a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - <a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - <a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> @@ -72,12 +70,13 @@ </td></tr> <tr><td colspan="2"> -<form action="/USER" method="post" enctype="multipart/form-data"> +<form action="/USER" method="post" enctype="multipart/form-data" accept-charset="UTF-8"> <INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> <input type="hidden" name="cmd.success" value="/user/user.html" /> <input type="hidden" name="cmd.error" value="/user/user.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="auserid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> <input type="hidden" name="anames" value="basic.personal.lastname,basic.personal.firstname,basic.personal.title,basic.contact-priv.online.email,basic.contact-priv.online.uri,preference.language,basic.personal.languagesspoken,basic.personal.imageuri,basic.university.status,basic.university.subject,basic.university.graduation" /> <table border="0" cellpadding="8pt"> @@ -97,7 +96,7 @@ <tr><td>$userPresenter.printDescription($auserid, "preference.language", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "preference.language") z.B. "de"</td></tr> <tr><td valign=top>$userPresenter.printDescription($auserid, "basic.personal.languagesspoken", $lang):</td> -<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.languagesspoken") z.B. "de,en,fr"</td></tr> +<td>$userPresenter.printUserAttrInput($auserid, "basic.personal.languagesspoken") z.B. "de;en;fr"</td></tr> <tr><td> </td></tr> <tr><td valign=top>Status:</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.university.status")</td></tr> @@ -134,25 +133,21 @@ <font size="-2">URL (Pfad) zum Bild angeben, z.B. http://www.mein-bild.de/foto.jpg</font></p> </td></tr></table><br> -</form> - <p> -<table border="0" width="100%"><tr><td> <input type="submit" value="Benutzerprofil aktualisieren"> -</td><td width="100%" align="right"> +</form> + <div align="right"> <form action="user-delete.html" method="get"> +<input type="hidden" name="auserlogin" value="$auserlogin" /> <input type="submit" value="Benutzerkennung löschen" /> </form> </div> -</td></tr></table> </td></tr></table> </td></tr></table> -</form> - #end #end #end Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/index.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.de 13 Sep 2006 13:21:20 -0000 1.1 +++ index.html.de 18 Oct 2006 16:52:00 -0000 1.2 @@ -9,8 +9,8 @@ <p>Ihre Benutzerkennung können sie folgendermaÃen verwalten:</p> <ul> -<li><a href="user.html">Benutzerprofil editieren</a> -<li>TBD +<li><a href="/user/user.html">Benutzerprofil + und Interessenseinstellungen editieren</a> <p> <li><a href="change_password.html">Password ändern</a> <p> Index: user-interests.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/user/user-interests.html.de,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- user-interests.html.de 22 Sep 2006 17:42:27 -0000 1.13 +++ user-interests.html.de 18 Oct 2006 16:52:00 -0000 1.14 @@ -32,17 +32,20 @@ <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> #else -#if ($returnCode == 1002) -<p><div class="info">The interest you try to add, is already in your interests list.</div></p> +<p>Loginname: $auserlogin</p> + +#if ($returnCode == 2110) +<p><div class="info">Das Interessensgebiet, das Sie angegeben haben ist leer oder bereits in Ihrer Interessensliste eingetragen.</div></p> #end -#if ($returnCode == 1010) -<p><div class="info">You have choosen nothing to add. </div></p> +#if ($returnCode == 1110) +<p><div class="success">Das Interessensgebiet wurde in Ihre Interessensliste eingetragen.</div></p> #end -#if ($returnCode == 2001) -<p><div class="info">The new entry has been added to your interests list.</div></p> +#if ($returnCode == 2060) +<p><div class="error">Fehler beim Aktualisieren des Benutzerprofils.</div></p> +#end +#if ($returnCode == 1060) +<p><div class="info">Ihre Änderungen wurden erfolgreich gespeichert.</div></p> #end - -<p>Loginname: $auserlogin</p> <form action="/USER" method="post"> <input type="hidden" name="cmd" value="deleteListMember" /> @@ -51,6 +54,7 @@ <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="aname" value="interests.categories" /> <input type="hidden" name="uid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> <p> <table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> @@ -58,6 +62,7 @@ <td> <table border="0" cellpadding="5pt"><tr><td> <em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - +<a href="user-contact.html?auserlogin=$auserlogin">Kontaktdaten</a> - <a href="user-interests.html?auserlogin=$auserlogin"><b>Interessen</b></a> - <a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - <a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> @@ -87,11 +92,13 @@ </tr> #end #else - <tr><td colspan = "3">Ihre Interessenliste hat bisher noch keine Einträge.</td></tr> + <tr><td colspan = "3"><b>Ihre Interessenliste hat bisher noch keine Einträge.</b></td></tr> #end </table> +#if ($result.size() > 0) <br> <input type="submit" value="Ausgewählte Einträge löschen"> +#end </form> <p> @@ -103,21 +110,50 @@ <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="aname" value="interests.categories" /> <input type="hidden" name="uid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> Bitte wählen Sie zusätzliche Interessensgebiete aus folgender Liste aus und Klicken Sie den Button "Zur Liste hinzufügen": <select name="cid"> -#foreach( $i in $categoryPresenter.getCategories("community", "") ) +#foreach( $i in $categoryPresenter.getCategories("community", "", "") ) <option value="$i.getId()">$!i.getTitle() </option> #end </select> <br><br> <input type="submit" value="Zur Liste hinzufügen"> +</form> + +<p> + +<b>Benachrichtigungsparameter</b> +<p> + +<p>Die Plattform bietet die Möglichkeit, Sie über neue Mitteilungen zu +Ihren Interessensgebieten zu informieren. Um diese Funktionalität zu +aktivieren wählen Sie bitte in nachfolgender Liste die gewünschte Form +der Benachrichtigung aus:</p> + +<form action="/USER" method="post"> +<INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> +<input type="hidden" name="cmd.success" value="/user/user-interests.html" /> +<input type="hidden" name="cmd.error" value="/user/user-interests.html" /> +<input type="hidden" name="path" value="$portalRequest.getPagePath()"/> +<input type="hidden" name="auserid" value="$auserid" /> +<input type="hidden" name="auserlogin" value="$auserlogin" /> +<input type="hidden" name="anames" value="cobricks.notification" /> +#set ( $cobricks_notification = $auser.getAttribute("cobricks.notification") ) +<input type="hidden" name="oldnotification" value="$!cobricks_notification" /> +#if ("$!cobricks_notification" == "") +#set ( $cobricks_notification = "no" ) +#end +$portalPresenter.printRadioButton("cobricks.notification","no,email,nlday,nlweek","$!cobricks_notification","keine Benachrichtigung,sofortige E-Mail,täglicher Newsletter,wöchentlicher Newsletter","column") +<p> +<input type="submit" value="Benachrichtigungsparameter aktualisieren"> +</form> </td></tr></table> </td></tr></table> -</form> #end --- NEW FILE: user-contact.html --- $portalPresenter.parse("$contextPath/pageheader.html",$portalRequest) #set ( $auserlogin = "$!auserlogin" ) #if ( $auserlogin == "" ) #set ( $auserlogin = $userLogin ) #end #set ( $auserid = $userManager.getUserIdForUserLogin($auserlogin) ) #set ($auser = $userManager.getUser($auserid)) #set ($auserclass = $auser.getUserClass() ) <h1>Benutzerprofil - Kontaktinformation</h1> #set ( $auth = $userPresenter.checkPermission($userId, "user", "read", "userid=$auserid") ) #if ( "$auth" != "true" ) #if ( "$auserlogin" == "$userLogin" ) #set ( $auth = "true" ) #end #end #if ( $auth != "true" ) <div class="error">Sie haben keine ausreichenden Zugriffsrechte um das Benutzerprofil von "$auserlogin" zu lesen.</div> <p>Bitte melden Sie sich als Benutzer mit den entsprechenden Rechten an oder kontaktieren Sie den Plattformadministrator um die notwendigen Rechte zugewiesen zu bekommen.</p> #else #if ($auserid == 0) <p><div class="error">Loginname <b>$auserlogin</b> existiert nicht!</div></p> #else <p>Loginname: $auserlogin</p> <p> #if ($returnCode == 2060) <p><div class="error">Fehler beim Aktualisieren des Benutzerprofils.</div></p> #end #if ($returnCode == 1060) <p><div class="info">Ihre Änderungen wurden erfolgreich gespeichert.</div></p> #end <p> <table border="1pt" width="100%" cellspacing="0pt" cellpadding="0pt"> <tr bgcolor="#eeeeee"> <td> <table border="0" cellpadding="5pt"><tr><td> <em><a href="user.html?auserlogin=$auserlogin">Basisdaten</a> - <a href="user-contact.html?auserlogin=$auserlogin"><b>Kontaktdaten</b></a> - <a href="user-interests.html?auserlogin=$auserlogin">Interessen</a> - <a href="user-buddylist.html?auserlogin=$auserlogin">Freundesliste</a> - <a href="user-roles.html?auserlogin=$auserlogin">Zugriffsrechte</a><em></td> </td></tr></table></td> <td align="right"> <em><a href="change_password.html?auserlogin=$auserlogin">Passwort ändern</a></em> </td></tr> <tr><td colspan="2"> <form action="/USER" method="post" enctype="multipart/form-data" accept-charset="UTF-8"> <INPUT TYPE="hidden" NAME="cmd" VALUE="update" /> <input type="hidden" name="cmd.success" value="/user/user-contact.html" /> <input type="hidden" name="cmd.error" value="/user/user-contact.html" /> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="auserid" value="$auserid" /> <input type="hidden" name="auserlogin" value="$auserlogin" /> <input type="hidden" name="anames" value="basic.contact-priv.postal.street,basic.contact-priv.postal.city,basic.contact-priv.postal.country" /> <table border="0" cellpadding="8pt"> <tr><td> <table border="0"> <tr><td colspan="2"> <p>Sie können in Ihrem Profil Ihren Wohnort und/oder geographische Koordinaten des Wohnorts (WGS84) vermerken. Diese Information wird genutzt um Karten mit den Wohnorten aller Benutzer der Plattform bzw. aller Einträge in der Freundesliste zu zeichnen.</p> </td></tr> <tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.postal.street", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.postal.street")</td></tr> <tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.postal.city", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.postal.city")</td></tr> <tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.postal.country", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.postal.country")</td></tr> <tr><td> </td></tr> <tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.location.geo.lat", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.location.geo.lat")</td></tr> <tr><td>$userPresenter.printDescription($auserid, "basic.contact-priv.location.geo.lng", $lang):</td> <td>$userPresenter.printUserAttrInput($auserid, "basic.contact-priv.location.geo.lng")</td></tr> </table> <p> <input type="submit" value="Benutzerprofil aktualisieren"> </form> </td></tr></table> </td></tr></table> #end #end $portalPresenter.parse("$contextPath/pagefooter.html",$portalRequest) |
