|
From: Michael K. <ko...@us...> - 2006-02-10 11:33:40
|
Update of /cvsroot/cobricks/cobricks2/web/portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10360/portal Modified Files: create.html.en edit.html.en index.html.en list.html.en listwiki.html.en Added Files: createbin.html.en editbin.html.en listbin.html.en Log Message: new ui for creating and editing binary web objects Index: list.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/portal/list.html.en,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- list.html.en 16 Jan 2006 09:26:54 -0000 1.7 +++ list.html.en 10 Feb 2006 11:33:21 -0000 1.8 @@ -16,9 +16,7 @@ List of HTML pages stored in the item database: <ul> -#foreach( $i in $itemManager.searchItems("/item[itemclass='portalpagehtml']") ) -$i -<br> +#foreach( $i in $itemManager.searchItems("/item[itemclass='portalpage']") ) <li><a href="$i.getPagePath()$i.getPageName()">$i.getAttribute("name")</a>, id=$i.getId() - <a href="edit.html?itemid=$i.getId()">edit</a> - <a href="delete.html?itemid=$i.getId()">delete</a></li> Index: edit.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/portal/edit.html.en,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- edit.html.en 31 Jan 2006 20:04:42 -0000 1.11 +++ edit.html.en 10 Feb 2006 11:33:21 -0000 1.12 @@ -91,7 +91,7 @@ <a href="wikihelp.html" target="_blank">Help for Wiki</a> </p> #if ($userId == $page.getAttributeAsString("creator")) -<input type="checkbox" name="newContentVersion" checked="true" value="true"> Should be created a new content version? +<input type="checkbox" name="newContentVersion" checked="true" value="true"> Should a new content version be created? #else <input type="hidden" name="newContentVersion" value="true"> It will be created a new content version #end Index: create.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/portal/create.html.en,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- create.html.en 2 Feb 2006 17:08:29 -0000 1.16 +++ create.html.en 10 Feb 2006 11:33:21 -0000 1.17 @@ -1,7 +1,6 @@ $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) - <em><a href="index.html">Portal Component</a> - <a href="create.html">Create Page</a></em> @@ -19,7 +18,7 @@ #end #end -<form action="$contextPath/PORTAL" method="post"> +<form action="$contextPath/PORTAL" method="post" enctype="multipart/form-data"> <input type="hidden" name="cmd" value="create"> <input type="hidden" name="cmd.noaccess" value="$contextPath/noaccess.html"> <input type="hidden" name="cmd.success" value="$contextPath/portal/index.html"> Index: listwiki.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/portal/listwiki.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- listwiki.html.en 16 Jan 2006 09:26:54 -0000 1.1 +++ listwiki.html.en 10 Feb 2006 11:33:21 -0000 1.2 @@ -16,7 +16,7 @@ List of Wiki pages stored in the item database: <ul> -#foreach( $i in $itemManager.searchItems("/item[itemclass='wikipage']") ) +#foreach( $i in $itemManager.searchItems("/item[itemclass~'wikipage']") ) <li><a href="$i.getPagePath()$i.getPageName()">$i.getAttribute("name")</a>, id=$i.getId() - <a href="edit.html?itemid=$i.getId()">edit</a> - <a href="delete.html?itemid=$i.getId()">delete</a></li> Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/portal/index.html.en,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- index.html.en 31 Jan 2006 20:13:48 -0000 1.8 +++ index.html.en 10 Feb 2006 11:33:21 -0000 1.9 @@ -6,11 +6,11 @@ <h1>Portal Component</h1> #if ( $returnCode == 1101 ) -<div class="success">Successfully created new portal page.</div><p> +<div class="success">Successfully created/updated portal object.</div><p> #elseif ( $returnCode == 1104 ) -<div class="success">Successfully created new portal folder.</div><p> +<div class="success">Successfully created portal folder.</div><p> #elseif ( $returnCode > 1999 ) -<div class="error">Failed with something ...</div><p> +<div class="error">Failed with something ($returnCode) ...</div><p> #end <p>The Portal Component implements functionality for providing a Web-based @@ -32,7 +32,8 @@ <ul> <li><a href="list.html">List HTML pages</a> <li><a href="listwiki.html">List Wiki pages</a> -<li><a href="list.html?op=useronly">List Portal Objects (editable by user)</a> +<li><a href="list.html?op=useronly">List HTML pages (editable by user)</a> +<li><a href="listbin.html">List binary objects</a> <li><a href="browse.html">List and browse Portal Folders</a> <p> </ul> --- NEW FILE: editbin.html.en --- $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) <em><a href="index.html">Portal Component</a> - <a href="createbin.html">Create Object</a></em> <h1>Update Portal Object</h1> #if ( $returnCode == 1101 ) <div class="success">Successfully/updated created portal object.</div><p> #elseif ( $returnCode > 1999 ) <div class="error">Failed creating portal object.</div><p> #if ($errors) <div class="error">The following error(s) ocurred: <ul>#foreach($error in $errors) <li>$corePresenter.printErrorMessage($error, "$!lang")</li> #end</ul></div><br/> #end #end #set($item = $itemPresenter.getItem($itemid)) #if ("$!pname"=="") #set ($pname = $item.getAttribute("name")) #end #if ("$!plang"=="") Language versions: #foreach ( $l in $portalPresenter.getBinaryLangs($corePresenter.parseInt($itemid))) <a href="editbin.html?itemid=$itemid&plang=$l">$l</a> - #set ($plang = $l) #end #end <form action="$contextPath/PORTAL" method="post" enctype="multipart/form-data"> <input type="hidden" name="cmd" value="updatebin"> <input type="hidden" name="cmd.noaccess" value="$contextPath/noaccess.html"> <input type="hidden" name="cmd.success" value="$contextPath/portal/index.html"> <input type="hidden" name="cmd.error" value="$contextPath/portal/createbin.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> <input type="hidden" name="itemid" value="$!itemid"/> Path: TBD show the paths <p> Page Name (if no name is given, the filename is taken; if no extension is given, the extension from the filename is append to the page name):<br> <input name="pname" size="50" value="$!pname"> <p> Language: $!plang <p> <input type="file" name="_file" value="$_file"> <p> <input type="submit" value="Update Object"> </form> $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) --- NEW FILE: listbin.html.en --- $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) <em><a href="index.html">Portal Component</a> - <a href="list.html">List Binary Objects</a></em> <h1>List Binary Portal Objects</h1> #if ( $returnCode == 1010 ) <p><div class="success">Successfully deleted portal object.</div></p> #end List of binary objects stored in the item database: <ul> #foreach( $i in $itemManager.searchItems("/item[itemclass='portalfile']") ) <li><a href="$i.getPagePath()$i.getPageName()">$i.getAttribute("name")</a>, id=$i.getId() - <a href="editbin.html?itemid=$i.getId()">edit</a> - <a href="delete.html?itemid=$i.getId()">delete</a></li> #end </ul> <p> <a href="create.html">Create new HTML Portal Object</a> $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) --- NEW FILE: createbin.html.en --- $portalPresenter.parse("$contextPath/pageheader.html", $portalRequest) <em><a href="index.html">Portal Component</a> - <a href="createbin.html">Create Object</a></em> <h1>Create Portal Object</h1> #if ( $returnCode == 1101 ) <div class="success">Successfully created portal object.</div><p> #elseif ( $returnCode > 1999 ) <div class="error">Failed creating portal object.</div><p> #if ($errors) <div class="error">The following error(s) ocurred: <ul>#foreach($error in $errors) <li>$corePresenter.printErrorMessage($error, "$!lang")</li> #end</ul></div><br/> #end #end <form action="$contextPath/PORTAL" method="post" enctype="multipart/form-data"> <input type="hidden" name="cmd" value="createbin"> <input type="hidden" name="cmd.noaccess" value="$contextPath/noaccess.html"> <input type="hidden" name="cmd.success" value="$contextPath/portal/index.html"> <input type="hidden" name="cmd.error" value="$contextPath/portal/createbin.html"> <input type="hidden" name="path" value="$portalRequest.getPagePath()"/> Path: <select name="ppath"> #foreach ($p in $portalManager.getPortalFolderPaths()) <option value="$p">$p #end </select> <a href="createfolder.html">Create New Folder</a> <p> Page Name (if no name is given, the filename is taken; if no extension is given, the extension from the filename is appended to the page name):<br> <input name="pname" size="50" value="$!pname"> <p> Language: <select name="plang"> $portalPresenter.printLanguageOptions("$!plang") </select> <p> <input type="file" name="_file" value="$_file"> <p> <input type="checkbox" name="storedb" checked="checked"> Store object in database (otherwise the file will be stored in the file system and cannot be edited) </p> <p> <input type="submit" value="Create Object"> </form> $portalPresenter.parse("$contextPath/pagefooter.html", $portalRequest) |