Menu
▾
▴
[Cobricks-cvscommit] drehscheibe-in/web/course cdelete.html.de clsearch.html.de cmcreateres.txt cmdelete.html.de crcreate.html.de crsearch.html.de csearch.html.de cupdate.html.de index.html.de
|
From: Michael K. <ko...@us...> - 2006-05-30 14:14:41
|
Update of /cvsroot/cobricks/drehscheibe-in/web/course In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10733/web/course Modified Files: cdelete.html.de clsearch.html.de cmcreateres.txt cmdelete.html.de crcreate.html.de crsearch.html.de csearch.html.de cupdate.html.de index.html.de Log Message: Index: cmdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmdelete.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmdelete.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cmdelete.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -54,6 +54,9 @@ #end <p> +Bitte bestätigen Sie das Löschen. + +<p> <form action="/COURSE" method="post"> <input type="hidden" name="cmd" value="deletecoursemodule" /> <input type="hidden" name="cmd.success" value="/course/index.html" /> Index: csearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/csearch.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- csearch.html.de 29 May 2006 07:13:31 -0000 1.1 +++ csearch.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -45,10 +45,10 @@ $courseModule.getType() </td> <td align="center"> -<a href="/COURSE?cmd=addcoursett&cid=$c.getId()&uid=$auserid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">add to timetable</a> +<a href="/COURSE?cmd=addcoursett&cid=$c.getId()&uid=$auserid&cmd.success=/course/timetable.html&cmd.error=/course/timetable.html">zum Stundenplan</a> #if ( "$!acc" == "true" ) | <a href="cupdate.html?cid=$c.getId()">edit</a> | -<a href="cdelete.html?cid=$c.getId()">delete</a> +<a href="cdelete.html?cid=$c.getId()">löschen</a> #end </td> </tr> @@ -176,7 +176,7 @@ <option value="">alle</option> #foreach( $i in ["pf","wp","wa","ko","vt","er","gr","ke"] ) #set ($sel = "") - #if ( $i == $!coursetype ) + #if ( "$!i" == "$!coursetype" ) #set ($sel = 'selected="1"') #end <option value="$i" $!sel>$i </option> Index: cmcreateres.txt =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cmcreateres.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmcreateres.txt 29 May 2006 07:13:31 -0000 1.1 +++ cmcreateres.txt 30 May 2006 14:14:31 -0000 1.2 @@ -13,10 +13,10 @@ #else beantragt: #end -- $!cmsid -- $!cmname -- $!cmtype -- $!courseManager.getLecturer($cm.getResponsible()).getName2() +- Id: $!cmsid +- Name: $!cmname +- Typ: $!cmtype +- Modulverantwortlicher: $!courseManager.getLecturer($cm.getResponsible()).getName2() $!portal_baseurl/course/cm.html?id=$!cmsid Index: crsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crsearch.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- crsearch.html.de 29 May 2006 07:13:31 -0000 1.1 +++ crsearch.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -28,7 +28,7 @@ <tr class="resulttitle"> <td>Name</td> <td>Information</td> -<td>Contact</td> +<td>Kontakt</td> <td> </td> </tr> #foreach ( $c in $results ) @@ -54,7 +54,7 @@ <table border="0"> <form action="crsearch.html" method="post"> <tr> - <td>Name</td> + <td>Name (Substring)</td> <td><input name="crname" size="20" value="$!{crname}"></td> </tr> Index: cdelete.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cdelete.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cdelete.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cdelete.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -1,28 +1,32 @@ $portalPresenter.parse("$!contextPath/pageheader.html.de",$portalRequest) -<h1>Veranstaltung löschen</h1> +<h1>Veranstaltung löschen</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.checkRole("$auserid", "admin-course") ) #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 +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 einer Veranstaltung.</font><p> +<font color="red">Fehler beim Löschen einer Veranstaltung.</font><p> #end -<p>Bitte bestätigen Sie, dass die Veranstaltung mit der Id $!cid -wirklich gelöscht werden soll.</p> +#set ($cid = "$!cid") +#set( $course = $coursePresenter.getCourse($cid) ) + +<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"> <input type="hidden" name="cmd" value="deletecourse" /> @@ -33,8 +37,7 @@ <input type="hidden" name="cid" value="$cid" /> -<input type="button" class="submit" value="Back" onClick="javascript:history.go(-1)"/> -<input type="submit" class="submit" value="Veranstaltung löschen"/> +<input type="submit" class="submit" value="Veranstaltung löschen"/> </form> #end Index: crcreate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/crcreate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- crcreate.html.de 29 May 2006 07:13:31 -0000 1.1 +++ crcreate.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -31,7 +31,8 @@ <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <tr> <td>Name</td> - <td><input name="crname" size="50" value=""></td> + <td><input name="crname" size="50" value=""><br> +z.B. MI HS 1, MI 00.08.038, MW 00011<</td> </tr> <tr> <td>Information</td> @@ -49,8 +50,8 @@ <td>Sichtbarkeit</td> <td> <select name="crhidden"> - <option value="0" selected="1">nicht sichtbar</option> - <option value="1">sichtbar</option> + <option value="0">nicht sichtbar</option> + <option value="1" selected="1">sichtbar</option> </select> </td> </tr> Index: index.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/index.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.html.de 29 May 2006 07:13:31 -0000 1.1 +++ index.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -87,7 +87,7 @@ #else #set ( $tmps = $userPresenter.checkRole("$auserid", "admin-course") ) #if ( "$!tmps" == "true" ) -- Editieren von Veranstaltungen und eingeschränktes Editieren von Modulen +- Editieren von Veranstaltungen #end #end </div></p> Index: clsearch.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/clsearch.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- clsearch.html.de 29 May 2006 07:13:31 -0000 1.1 +++ clsearch.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -11,7 +11,11 @@ #set ( $acc = $userPresenter.checkRole("$auserid", "admin-course") ) #end -#set ($query = "lfirstname=$!{lfirstname}&llastname=$!{llastname}<yp=$!{ltyp}&lgroup=$!{lgroup}") +#set ($tmps = "$!lfirstname$!llastname$!ltyp") +#set ($query = "lfirstname=$!{lfirstname}&llastname=$!{llastname}<yp=$!{ltyp}") +#if ("$!tmps" == "") +#set ($query = "ltyp=p") +#end <h1>Dozentensuche</h1> @@ -28,14 +32,13 @@ Die Suche hat $rcount Ergebnisse geliefert:<p> <table id="result" width="90%" align="center"> <tr class="resulttitle"> -<td>ID</td> <td>Nachname</td> +<td>Vorname</td> <td>Typ</td> <td> </td> </tr> #foreach ( $c in $results ) <tr> -<td>$!c.getId()</td> <td>$!c.getLastName()</td> <td>$!c.getFirstName()</td> <td>$!c.getType() @@ -43,7 +46,7 @@ <td> #if ( "$!acc" == "true" ) <a href="clupdate.html?lid=$!c.getId()">edit</a> | -<a href="cldelete.html?lid=$!c.getId()">delete</a> +<a href="cldelete.html?lid=$!c.getId()">löschen</a> #end </td> </tr> Index: cupdate.html.de =================================================================== RCS file: /cvsroot/cobricks/drehscheibe-in/web/course/cupdate.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cupdate.html.de 29 May 2006 07:13:31 -0000 1.1 +++ cupdate.html.de 30 May 2006 14:14:31 -0000 1.2 @@ -18,7 +18,7 @@ #else -#set ($cid = $!cid) +#set ($cid = "$!cid") #set( $course = $coursePresenter.getCourse($cid) ) #set( $courseModule = $course.getCourseModule() ) |
