inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Remainder of app now uses dialog framework for delete pages

Browse Source 
- Fixed bug in edit space (any type) where the icon would not be pre-set to the current one

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2005-12-22 14:23:25 +00:00
parent a4564a1a49
commit 62ae60eaf6
8 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/web/jsp/browse/browse.jsp
View File

@@ -107,7 +107,7 @@
<f:param name="id" value="#{NavigationBean.currentNodeId}" id="param6" />
</a:actionLink>
<r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval4">
<a:actionLink value="#{msg.delete_space}" image="/images/icons/delete.gif" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}" id="link2">
<a:actionLink value="#{msg.delete_space}" image="/images/icons/delete.gif" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}" id="link2">
<f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
</a:actionLink>
<a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" id="link6" actionListener="#{ClipboardBean.cutNode}">
@@ -311,7 +311,7 @@
<f:param name="id" value="#{r.id}" />
</a:actionLink>
<r:permissionEvaluator value="#{r}" allow="Delete">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
<f:param name="id" value="#{r.id}" />
</a:actionLink>
</r:permissionEvaluator>
@@ -479,7 +479,7 @@
</a:actionLink>
<r:permissionEvaluator value="#{r}" allow="Delete">
<a:booleanEvaluator value="#{r.locked == false && r.workingCopy == false}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="dialog:deleteFile">
<f:param name="id" value="#{r.id}" />
</a:actionLink>
</a:booleanEvaluator>

2
source/web/jsp/dialog/delete-file.jsp
View File

@@ -127,7 +127,7 @@
<tr><td class="dialogButtonSpacing"></td></tr>
<tr>
<td align="center">
<h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
<h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
</td>
</tr>
</table>

2
source/web/jsp/dialog/delete-space.jsp
View File

@@ -143,7 +143,7 @@
<tr><td class="dialogButtonSpacing"></td></tr>
<tr>
<td align="center">
<h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
<h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
</td>
</tr>
</table>

4
source/web/jsp/dialog/document-details.jsp
View File

@@ -153,7 +153,7 @@
<r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Delete">
<a:booleanEvaluator value="#{DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif"
actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
actionListener="#{BrowseBean.setupContentAction}" action="dialog:deleteFile">
<f:param name="id" value="#{DocumentDetailsBean.id}" />
</a:actionLink>
</a:booleanEvaluator>
@@ -441,7 +441,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr>
<td align="center">
<h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
<h:commandButton value="#{msg.close}" action="dialog:close" styleClass="wizardButton" />
</td>
</tr>
</table>

2
source/web/jsp/dialog/space-details.jsp
View File

@@ -88,7 +88,7 @@
<f:param name="id" value="#{SpaceDetailsBean.id}" />
</a:actionLink>
<r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
<f:param name="id" value="#{SpaceDetailsBean.id}" />
</a:actionLink>
</r:permissionEvaluator>