mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should go together by tomorrow AM (for me) I'll dig back in. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -38,25 +38,28 @@
|
||||
<!-- Add a URL file to each folder that links back to the web client -->
|
||||
<urlFile>
|
||||
<filename>__AlfrescoClient.url</filename>
|
||||
<webpath>http://localhost:8080/alfresco/</webpath>
|
||||
<webpath>http://${localname}:8080/alfresco/</webpath>
|
||||
</urlFile>
|
||||
|
||||
<!-- Mark locked files as offline -->
|
||||
<offlineFiles/>
|
||||
|
||||
<!-- Desktop actions -->
|
||||
<!-- Uses a client-side application to trigger a server-side action -->
|
||||
<!-- Echo - displays a message echoed from the server -->
|
||||
<!-- URL - launches a URL via the Windows shell -->
|
||||
<!-- CmdLine - launches the Notepad application -->
|
||||
<!-- CheckInOut - checks files in/out, drag and drop files onto the application -->
|
||||
<!-- JavaScript - run a server-side script -->
|
||||
<!-- Uses a client-side application to trigger a server-side action -->
|
||||
<!-- Echo - displays a message echoed from the server -->
|
||||
<!-- URL - launches a URL via the Windows shell -->
|
||||
<!-- CmdLine - launches the Notepad application -->
|
||||
<!-- CheckInOut - checks files in/out, drag and drop files onto the application -->
|
||||
<!-- JavaScript - run a server-side script -->
|
||||
<!-- JavaScriptURL - server-side script that generates a URL to the folder using a ticket -->
|
||||
<!-- to avoid having to logon -->
|
||||
|
||||
<!--
|
||||
<desktopActions>
|
||||
<global>
|
||||
<path>alfresco/desktop/Alfresco.exe</path>
|
||||
<webpath>http://${localname}:8080/alfresco/</webpath>
|
||||
</global>
|
||||
|
||||
<action>
|
||||
<class>org.alfresco.filesys.smb.server.repo.desk.EchoDesktopAction</class>
|
||||
<name>Echo</name>
|
||||
@@ -85,6 +88,14 @@
|
||||
<attributes>anyFiles, multiplePaths , allowNoParams</attributes>
|
||||
<preprocess>confirm, copyToTarget</preprocess>
|
||||
</action>
|
||||
<action>
|
||||
<class>org.alfresco.filesys.smb.server.repo.desk.JavaScriptDesktopAction</class>
|
||||
<name>JavaScriptURL</name>
|
||||
<filename>__AlfrescoDetails.exe</filename>
|
||||
<script>alfresco/desktop/showDetails.js</script>
|
||||
<attributes>anyFiles</attributes>
|
||||
<preprocess>copyToTarget</preprocess>
|
||||
</action>
|
||||
|
||||
</desktopActions>
|
||||
-->
|
||||
|
Reference in New Issue
Block a user