You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by cl...@apache.org on 2005/05/23 21:24:53 UTC
svn commit: r178033 - in
/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF: actions/
tabs/ view/document/ view/folder/ view/security/
Author: clombart
Date: Mon May 23 14:24:51 2005
New Revision: 178033
URL: http://svn.apache.org/viewcvs?rev=178033&view=rev
Log:
Review templates and war structure
Removed:
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/actions/
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/tabs/
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-content.vm
Modified:
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-metadata.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-text.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-upload.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-tab.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-text-html.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-upload.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-browser.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-children.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-metadata.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-tab.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-browser.vm
incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-permission.vm
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-metadata.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-metadata.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-metadata.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-metadata.vm Mon May 23 14:24:51 2005
@@ -21,10 +21,12 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($document = $browserDTO.getCurrentCmsObject())
+#set ($document = $documentDTO.getDocument())
+#set ($browserSession = $renderRequest.getPortletSession().getAttribute("browserSession"))
-#if($browserDTO.isInsert())
- <div class="portlet-menu">$MESSAGES.getString('div.newdocument') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES ) </div>
+
+#if($browserSession.isInsert())
+ <div class="portlet-menu">$MESSAGES.getString('div.newdocument') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderEdit" $renderResponse $MESSAGES ) </div>
<div class="portlet-section-header">General Information</div>
#end
@@ -33,27 +35,25 @@
<!-- div class="portlet-section-header">Folder Info </div -->
<form action="$renderResponse.createActionURL()" method="post">
- <input type="hidden" name="uri" value="$document.getUri()" size="100" maxlength="100"/>
<table border="0" cellspacing="2" cellpadding="3">
- #if($browserDTO.isUpdate())
- #formFieldText('field.name' "$!document.getName()" $MESSAGES $ERRORS)
- #else
+ #if($browserSession.isInsert())
#formFieldInput('field.name' "$!document.getName()" "25" 'name' $MESSAGES $ERRORS)
- #end
-
+ #else
+ #formFieldText('field.name' "$!document.getName()" $MESSAGES $ERRORS)
+ #end
#formFieldInput('field.title' "$!document.getTitle()" "25" 'title' $MESSAGES $ERRORS)
#formFieldInput('field.description' "$!document.getDescription()" "50" 'description' $MESSAGES $ERRORS)
#formFieldInput('field.owner' "$!document.getOwner()" "25" 'owner' $MESSAGES $ERRORS)
- #formFieldSelect('field.language' $browserDTO.getDocumentLanguages() 'language' $MESSAGES $ERRORS )
+ #formFieldSelect('field.language' $documentDTO.getDocumentLanguages() 'language' $MESSAGES $ERRORS )
- #if($browserDTO.isInsert())
- #formFieldSelect('field.type' $browserDTO.getDocumentTypes() 'documentType' $MESSAGES $ERRORS )
+ #if($browserSession.isInsert())
+ #formFieldSelect('field.type' $documentDTO.getDocumentTypes() 'documentType' $MESSAGES $ERRORS )
#end
</table>
<div class="portlet-section-footer">
- #if($browserDTO.isInsert())
- <input type="submit" name="portletAction_document.createContent" value="Next" class="portlet-dlg-icon-label"/>
+ #if($browserSession.isInsert())
+ <input type="submit" name="portletAction_document.updateProperties" value="Next" class="portlet-dlg-icon-label"/>
#else
<input type="submit" name="portletAction_document.save" value="Save" class="portlet-dlg-icon-label"/>
#end
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-text.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-text.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-text.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-text.vm Mon May 23 14:24:51 2005
@@ -21,22 +21,23 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($document = $browserDTO.getCurrentCmsObject())
+#set ($document = $documentDTO.getDocument())
+#set ($browserSession = $renderRequest.getPortletSession().getAttribute("browserSession"))
-#if ($browserDTO.isInsert())
- <div class="portlet-menu">$MESSAGES.getString('div.newdocument') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES ) </div>
+
+#if ($browserSession.isInsert())
+ <div class="portlet-menu">$MESSAGES.getString('div.newdocument') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderEdit" $renderResponse $MESSAGES ) </div>
<div class="portlet-section-header">Text Editor</div>
#end
-
-
-<!-- div class="portlet-section-header">Folder Info </div -->
<form action="$renderResponse.createActionURL()" method="post">
- <input type="hidden" name="uri" value="$document.getUri()" size="100" maxlength="100"/>
#formFieldTextArea($document.getContent().getContentAsString() "documentContent" $MESSAGES $ERRORS)
<div class="portlet-section-footer">
- <input type="submit" name="portletAction_document.save" value="Save" class="portlet-dlg-icon-label"/>
- <!-- input type="submit" name="portletAction_general.cancel" value="Cancel" class="portlet-dlg-icon-label"/ -->
+ #if ($browserSession.isInsert())
+ <input type="submit" name="portletAction_document.insert" value="Insert the document" class="portlet-dlg-icon-label"/>
+ #else
+ <input type="submit" name="portletAction_document.save" value="Save" class="portlet-dlg-icon-label"/>
+ #end
</div>
</form>
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-upload.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-upload.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-upload.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-edit-upload.vm Mon May 23 14:24:51 2005
@@ -21,10 +21,12 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($document = $browserDTO.getCurrentCmsObject())
+#set ($document = $documentDTO.getDocument())
+#set ($browserSession = $renderRequest.getPortletSession().getAttribute("browserSession"))
-#if($browserDTO.isInsert())
- <div class="portlet-menu">$MESSAGES.getString('div.newdocument') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES ) </div>
+
+#if($browserSession.isInsert())
+ <div class="portlet-menu">$MESSAGES.getString('div.newdocument') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderEdit" $renderResponse $MESSAGES ) </div>
<div class="portlet-section-header">Upload Document</div>
#end
@@ -35,8 +37,7 @@
#formFieldFile('file.upload' "" "50" 'file' $MESSAGES $ERRORS)
</table>
<div class="portlet-section-footer">
- <input type="submit" name="portletAction_document.upload" value="Upload" class="portlet-dlg-icon-label"/>
- <!-- input type="submit" name="portletAction_general.cancel" value="Cancel" class="portlet-dlg-icon-label" --/>
+ <input type="submit" name="portletAction_document.upload" value="Upload" class="portlet-dlg-icon-label"/>
</div>
</form>
#ErrorMessages($ERRORS)
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-tab.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-tab.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-tab.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-tab.vm Mon May 23 14:24:51 2005
@@ -21,16 +21,21 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-
+#set ($browserSession = $renderRequest.getPortletSession().getAttribute("browserSession"))
+#set ($cmsObject = $pathDTO.getCmsObject())
<div class="portlet-menu">
- #if($browserDTO.isUpdate())
- $MESSAGES.getString('div.updatedocument')
- #else
+ #if($browserSession.isInsert())
$MESSAGES.getString('div.newdocument')
+ #else
+ $MESSAGES.getString('div.updatedocument')
+ #end
+ #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderEdit" $renderResponse $MESSAGES )
+ #if($browserSession.isUpdate())
+ >> $cmsObject.getName()
#end
- #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES )
+
</div>
-#tab($tabs.get("document-edit") $MESSAGES $renderResponse.createActionURL())
+#tab($tabs.get("document-edit") $renderRequest $MESSAGES $renderResponse.createActionURL())
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-text-html.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-text-html.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-text-html.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-text-html.vm Mon May 23 14:24:51 2005
@@ -21,8 +21,8 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($document = $browserDTO.getCurrentCmsObject())
+#set ($document = $documentDTO.getDocument())
-<div class="portlet-menu">$MESSAGES.getString('div.path') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES ) </div>
+<div class="portlet-menu">$MESSAGES.getString('div.path') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderViewer" $renderResponse $MESSAGES ) >> $document.getName() </div>
<br>
$document.getContent().getContentAsString()
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-upload.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-upload.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-upload.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/document/document-view-upload.vm Mon May 23 14:24:51 2005
@@ -22,10 +22,10 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($document = $browserDTO.getCurrentCmsObject())
+#set ($document = $documentDTO.getDocument())
-<div class="portlet-menu">$MESSAGES.getString('div.path') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES )</div>
+<div class="portlet-menu">$MESSAGES.getString('div.path') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderViewer" $renderResponse $MESSAGES ) >> $document.getName() </div>
-In order to see the document, click on the following link :<br>
+In order to see the document, click on the following link :<br><br><br>
#documentLink($document $graffitoTools $renderResponse)
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-browser.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-browser.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-browser.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-browser.vm Mon May 23 14:24:51 2005
@@ -23,11 +23,11 @@
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-<div class="portlet-menu">$MESSAGES.getString('div.path') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES )</div>
-#if( $browserDTO.isEmpty())
+<div class="portlet-menu">$MESSAGES.getString('div.path') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderViewer" $renderResponse $MESSAGES )</div>
+#if( $folderDTO.isEmpty())
<div class="portlet-msg-info">$MESSAGES.getString('info.nocontent')</div>
#else
- #set ($folders = $browserDTO.getFolders())
+ #set ($folders = $folderDTO.getFolders())
#if($folders.size() > 0)
<!-- div class="portlet-menu">$MESSAGES.getString('div.folders')</div -->
<table border="0">
@@ -37,7 +37,7 @@
<tr>
#foreach ($folder in $folders)
<td>
- <img src="content/tigris/images/folder.gif" border="0"/><a href="$renderResponse.createRenderURL()?uri=$folder.getUri()">$folder.getName()</a>
+ <img src="content/tigris/images/folder.gif" border="0"/><a href="$renderResponse.createActionURL()?uri=$folder.getUri()&portletForward_folderViewer">$folder.getName()</a>
</td>
#end
</tr>
@@ -48,10 +48,8 @@
<!-- /div -->
#end
- #set ($documents = $browserDTO.getDocuments())
+ #set ($documents = $folderDTO.getDocuments())
#if($documents.size() > 0)
- <!-- div class="portlet-menu">$MESSAGES.getString('div.documents')</div -->
-
#foreach ($document in $documents)
#documentLink($document $graffitoTools $renderResponse)
#end
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-children.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-children.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-children.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-children.vm Mon May 23 14:24:51 2005
@@ -25,10 +25,10 @@
<form action="$renderResponse.createActionURL()" method="post">
- #set ($folders = $browserDTO.getFolders())
- #set ($documents = $browserDTO.getDocuments())
+ #set ($folders = $folderDTO.getFolders())
+ #set ($documents = $folderDTO.getDocuments())
#set ($count = 0)
- #if($browserDTO.isEmpty())
+ #if($folderDTO.isEmpty())
<div class="portlet-msg-info">$MESSAGES.getString('info.nocontent')</div>
#else
<table>
@@ -52,7 +52,7 @@
<tr>
<td class="$cssClass"><input type="checkbox" name="uri" value="$folder.getUri()" /></td>
<td class="$cssClass">$MESSAGES.getString('div.folder')</td>
- <td class="$cssClass"><a href="$renderResponse.createRenderURL()?uri=$folder.getUri()">$folder.getName()</a></td>
+ <td class="$cssClass"><a href="$renderResponse.createActionURL()?uri=$folder.getUri()&portletForward_folderEdit=selected">$folder.getName()</a></td>
<td class="$cssClass">$folder.getTitle()</td>
<td class="$cssClass">$folder.getDescription()</td>
<td class="$cssClass">$!folder.getCreationDate()</td>
@@ -71,7 +71,7 @@
<tr>
<td class="$cssClass"><input type="checkbox" name="uri" value="$document.getUri()" /></td>
<td class="$cssClass">$document.getContentType() </td>
- <td class="$cssClass"><a href="$renderResponse.createRenderURL()?uri=$document.getUri()">$document.getName()</a></td>
+ <td class="$cssClass"><a href="$renderResponse.createActionURL()?uri=$document.getUri()&portletForward_documentEdit">$document.getName()</a></td>
<td class="$cssClass">$document.getTitle()</td>
<td class="$cssClass">$document.getDescription()</td>
<td class="$cssClass">$!document.getCreationDate()</td>
@@ -83,8 +83,8 @@
#end
<div class="portlet-menu">
- <input type="submit" name="portletAction_folder.create" value="$MESSAGES.getString('link.addfolder')" class="portlet-dlg-icon-label" />
- <input type="submit" name="portletAction_document.selectDocumentType" value="$MESSAGES.getString('link.adddocument')" class="portlet-dlg-icon-label" />
+ <input type="submit" name="portletForward_folderCreate" value="$MESSAGES.getString('link.addfolder')" class="portlet-dlg-icon-label" />
+ <input type="submit" name="portletForward_documentCreate" value="$MESSAGES.getString('link.adddocument')" class="portlet-dlg-icon-label" />
<input type="submit" name="portletAction_cmsobject.delete" value="$MESSAGES.getString('link.delete')" class="portlet-dlg-icon-label" />
</div>
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-metadata.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-metadata.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-metadata.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-metadata.vm Mon May 23 14:24:51 2005
@@ -21,24 +21,26 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($folder = $browserDTO.getCurrentCmsObject())
+#set ($folder = $folderDTO.getFolder())
+#set ($browserSession = $renderRequest.getPortletSession().getAttribute("browserSession"))
-#if($browserDTO.isInsert())
- <div class="portlet-menu">$MESSAGES.getString('div.newfolder') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES ) </div>
+#if($browserSession.isInsert())
+
+
+ <div class="portlet-menu">$MESSAGES.getString('div.newfolder') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderEdit" $renderResponse $MESSAGES ) </div>
<div class="portlet-section-header">General Information</div>
#end
-#if($browserDTO.getCurrentCmsObject())
+#if($folderDTO.getFolder())
<!-- div class="portlet-section-header">Folder Info </div -->
- <form action="$renderResponse.createActionURL()" method="post">
- <input type="hidden" name="uri" value="$folder.getUri()" size="100" maxlength="100"/>
+ <form action="$renderResponse.createActionURL()" method="post">
<table border="0" cellspacing="2" cellpadding="3">
- #if($browserDTO.isUpdate())
- #formFieldText('field.name' "$!folder.getName()" $MESSAGES $ERRORS)
- #else
+ #if($browserSession.isInsert())
#formFieldInput('field.name' "$!folder.getName()" "25" 'name' $MESSAGES $ERRORS)
+ #else
+ #formFieldText('field.name' "$!folder.getName()" $MESSAGES $ERRORS)
#end
#formFieldInput('field.title' "$!folder.getTitle()" "25" 'title' $MESSAGES $ERRORS)
#formFieldInput('field.description' "$!folder.getDescription()" "50" 'description' $MESSAGES $ERRORS)
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-tab.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-tab.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-tab.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/folder/folder-tab.vm Mon May 23 14:24:51 2005
@@ -24,17 +24,9 @@
<div class="portlet-menu">
- #if($browserDTO.isUpdate())
- $MESSAGES.getString('div.updatefolder')
- #else
- $MESSAGES.getString('div.newfolder')
- #end
- #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES )
+ $MESSAGES.getString('div.updatefolder')
+ #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderEdit" $renderResponse $MESSAGES )
</div>
-#if($browserDTO.isUpdate())
- #tab($tabs.get("folder-edit") $MESSAGES $renderResponse.createActionURL())
-#else
- #parse($templateUtil.getTemplateEditFolder())
-#end
+#tab($tabs.get("folder-edit") $renderRequest $MESSAGES $renderResponse.createActionURL())
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-browser.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-browser.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-browser.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-browser.vm Mon May 23 14:24:51 2005
@@ -21,12 +21,9 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($permissions = $browserDTO.getPermissions())
-#set ($document = $browserDTO.getCurrentCmsObject())
-
+#set ($permissions = $permissionsDTO.getPermissions())
<form action="$renderResponse.createActionURL()" method="post">
- <input type="hidden" name="uri" value="$document.getUri()" size="100" maxlength="100"/>
- #set ($count = 0)
+
#if($permission.isEmpty())
<div class="portlet-msg-info">$MESSAGES.getString('info.nopermission')</div>
#else
@@ -40,9 +37,9 @@
</tr>
#foreach ($permission in $permissions.elements())
- #set ($count = $count + 1)
+
#set ($cssClass = "portlet-section-alternate")
- #if (($count % 2)==0)
+ #if (($velocityCount % 2)==0)
#set ($cssClass = "portlet-section-body")
#end
<tr>
@@ -58,8 +55,8 @@
#end
<div class="portlet-menu">
- <input type="submit" name="portletAction_security.create" value="$MESSAGES.getString('link.addPermission')" class="portlet-dlg-icon-label" />
- <input type="submit" name="portletAction_security.delete" value="$MESSAGES.getString('link.delete')" class="portlet-dlg-icon-label" />
+ <input type="submit" name="portletForward_permissionCreate" value="$MESSAGES.getString('link.addPermission')" class="portlet-dlg-icon-label" />
+ <input type="submit" name="portletAction_permission.delete" value="$MESSAGES.getString('link.delete')" class="portlet-dlg-icon-label" />
</div>
</form>
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-permission.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-permission.vm?rev=178033&r1=178032&r2=178033&view=diff
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-permission.vm (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security-permission.vm Mon May 23 14:24:51 2005
@@ -21,10 +21,12 @@
*#
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($cmsPermission = $securityDTO.getPermission())
+#set ($cmsPermission = $permissionDTO.getPermission())
+#set ($browserSession = $renderRequest.getPortletSession().getAttribute("browserSession"))
-#if($securityDTO.isInsert())
- <div class="portlet-menu">$MESSAGES.getString('div.newpermission') #cmsPathLink($browserDTO.getCurrentServer() $browserDTO.getFolderPath() $renderResponse $MESSAGES ) </div>
+
+#if($browserSession.isInsert())
+ <div class="portlet-menu">$MESSAGES.getString('div.newpermission') #cmsPathLink($pathDTO.getServer() $pathDTO.getPath() "folderEdit" $renderResponse $MESSAGES ) </div>
#end
<div class="portlet-section-header">$MESSAGES.getString('div.permission')</div>
@@ -36,7 +38,7 @@
#formFieldInput('field.permissionPrincipals' "#permissionPrincipals($permission)" "25" 'principal' $MESSAGES $ERRORS)
</table>
<div class="portlet-section-footer">
- <input type="submit" name="portletAction_security.save" value="Save" class="portlet-dlg-icon-label"/>
+ <input type="submit" name="portletAction_permission.save" value="Save" class="portlet-dlg-icon-label"/>
</div>
</form>