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

Merged V3.1 to HEAD

Browse Source 
12895: Merged DEV/LIVECYCLE-3.1 to V3.1 
      12858: Merged V2.1-A to DEV/LIVECYCLE-3.1 
         8275: *Record Only* Bootstrap and patch for Office add-in installers into Adobe repo 
         8276: *Record Only* Forgot to bump the schema number after officeAddin patch commit 
         8665: *Record Only* Added favicon.ico. Added two <link> tags to PageTag.java - both required so that old IE versions are supported. 
         9064: ACT 2836 - Office plugins not able to autheticate properly with LiveCycle Content Services 
         9065: ACT 2836 - Long, xml-based tickets not supported in Office webscripts 
         9078: Further fixes for ACT 2836 
            Adobe tickets are too long for Internet Explorer GET URLs (2048 limit vs. 2426 encoded length). 
            WebClientAuthenticator modified to also look for ticket within HTTP header (if not found on URL). 
            Office add-ins updated to support header-based ticket passing. 
         9109: More updates for ACT 2836 
         9118: More Adobe rebranding (No rebranding merged - strings externalised only) 
         9131: Workaround for PowerPoint WebDAV/ticket bug 
         9132: *Record Only* Fix for Office add-in search page regression 
         9133: Update long ticket/Office fix to pass ticket if the entire URL is < 255 characters. Pop-up login dialog cancellation returns to config panel. 
         9294: Workaround for ACT 3093 - Limitations of Win32 API when using WebDAV paths 
   ___________________________________________________________________ 
   Modified: svn:mergeinfo 
      Merged /alfresco/BRANCHES/V2.1-A:r8275-8276,8665,9064-9065,9078,9109,9118,9131-9133,9294 
      Merged /alfresco/BRANCHES/V3.1:r12895 
      Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12858


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-10 13:37:53 +00:00
parent 3f76223714
commit 8107dd3ae4
6 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
View File

@@ -157,10 +157,10 @@
<#assign versionRow=versionRow+1> <#assign versionRow=versionRow+1>
<tr class="${(versionRow % 2 = 0)?string("odd", "even")}"> <tr class="${(versionRow % 2 = 0)?string("odd", "even")}">
<td valign="top"> <td valign="top">
<a title="Download ${record.versionLabel}" href="${url.context}${record.url}?ticket=${session.ticket}"><img src="${url.context}/images/office/document.gif" alt="Open ${record.versionLabel}" /></a> <a title="Download ${record.versionLabel}" href="${url.context}${record.url}"><img src="${url.context}/images/office/document.gif" alt="Open ${record.versionLabel}" /></a>
</td> </td>
<td> <td>
<a title="Download ${record.versionLabel}" href="${url.context}${record.url}?ticket=${session.ticket}"><span style="font-weight:bold;">${record.versionLabel}</span></a><br /> <a title="Download ${record.versionLabel}" href="${url.context}${record.url}"><span style="font-weight:bold;">${record.versionLabel}</span></a><br />
Author: ${record.creator}<br /> Author: ${record.creator}<br />
Date: ${record.createdDate?datetime}<br /> Date: ${record.createdDate?datetime}<br />
<#if record.description?exists> <#if record.description?exists>
@@ -239,7 +239,7 @@
</li> </li>
</#if> </#if>
<li> <li>
<a href="${url.context}/navigate/showDocDetails/workspace/SpacesStore/${d.id}?ticket=${session.ticket}" rel="_blank"> <a href="${url.context}/navigate/showDocDetails/workspace/SpacesStore/${d.id}" rel="_blank">
<img src="${url.context}/images/office/document_details.gif" alt="Open Full Details" /> <img src="${url.context}/images/office/document_details.gif" alt="Open Full Details" />
Open Full Details Open Full Details
</a> </a>

4
config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
View File

@@ -57,7 +57,7 @@
<#if child.name?ends_with(extn) || child.name?ends_with(extnx)> <#if child.name?ends_with(extn) || child.name?ends_with(extnx)>
<a href="#" onclick="window.external.openDocument('${relativePath}')" title="Open ${child.name?html}" style="font-weight: bold;">${child.name?html}</a><br /> <a href="#" onclick="window.external.openDocument('${relativePath}')" title="Open ${child.name?html}" style="font-weight: bold;">${child.name?html}</a><br />
<#else> <#else>
<a href="${url.context}${child.url}?ticket=${session.ticket}" target="_blank" title="Open ${child.name?html}" style="font-weight: bold;">${child.name?html}</a><br /> <a href="${url.context}${child.url}" target="_blank" title="Open ${child.name?html}" style="font-weight: bold;">${child.name?html}</a><br />
</#if> </#if>
<#if child.properties.description?exists> <#if child.properties.description?exists>
<#if (child.properties.description?length > 0)> <#if (child.properties.description?length > 0)>
@@ -150,7 +150,7 @@
<br />Create a new Collaboration Space in the Alfresco Repository <br />Create a new Collaboration Space in the Alfresco Repository
</li> </li>
<li> <li>
<a title="Launch Alfresco" href="${url.context}/navigate/browse?ticket=${session.ticket}" rel="_blank"> <a title="Launch Alfresco" href="${url.context}/navigate/browse" rel="_blank">
<img src="${url.context}/images/logo/AlfrescoLogo16.gif" alt="Launch Alfresco" /> <img src="${url.context}/images/logo/AlfrescoLogo16.gif" alt="Launch Alfresco" />
Launch Alfresco Launch Alfresco
</a> </a>

8
config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
View File

@@ -12,7 +12,7 @@
<tr> <tr>
<td width="32" valign="top"><img src="${url.context}/images/office/task_item.gif" alt="Task item" /></td> <td width="32" valign="top"><img src="${url.context}/images/office/task_item.gif" alt="Task item" /></td>
<td> <td>
<span style="font-weight: bold;">${task.description!""?html}</span> <span style="font-weight: bold;">${(task.description!"")?html}</span>
<br /> <br />
<table style="margin-top: 4px;"> <table style="margin-top: 4px;">
<tr> <tr>
@@ -52,9 +52,9 @@
<td> <td>
<a href="#" onclick="window.external.openDocument('${relativePath}')" title="Open ${res.name?html}">${res.name?html}</a> <a href="#" onclick="window.external.openDocument('${relativePath}')" title="Open ${res.name?html}">${res.name?html}</a>
<#else> <#else>
<td width="16" valign="top"><a href="${url.context}${res.url}?ticket=${session.ticket}" target="_blank" title="Open ${res.name?html}"><img src="${url.context}${res.icon16}" alt="${res.name?html}"></a></td> <td width="16" valign="top"><a href="${url.context}${res.url}" target="_blank" title="Open ${res.name?html}"><img src="${url.context}${res.icon16}" alt="${res.name?html}"></a></td>
<td> <td>
<a href="${url.context}${res.url}?ticket=${session.ticket}" target="_blank">${res.name?html}</a> <a href="${url.context}${res.url}" target="_blank">${res.name?html}</a>
</#if> </#if>
<br /> <br />
Modified: ${res.properties.modified?datetime} (${(res.size / 1024)?int}Kb)<br /> Modified: ${res.properties.modified?datetime} (${(res.size / 1024)?int}Kb)<br />
@@ -88,7 +88,7 @@
</#list> </#list>
</span> </span>
<span class="taskManage"> <span class="taskManage">
<span class="taskAction" onclick="OfficeAddin.openWindowCallback('${url.context}/command/ui/managetask?id=${task.id}&amp;type=${task.qnameType}&amp;container=plain&amp;ticket=${session.ticket}', OfficeMyTasks.refreshPage);">Manage...</span> <span class="taskAction" onclick="OfficeAddin.openWindowCallback('${url.context}/command/ui/managetask?id=${task.id}&amp;type=${task.qnameType}&amp;container=plain', OfficeMyTasks.refreshPage);">Manage...</span>
</span> </span>
</div> </div>
</#if> </#if>

4
config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
View File

@@ -156,14 +156,14 @@
<#if child.name?ends_with(extn) || child.name?ends_with(extnx)> <#if child.name?ends_with(extn) || child.name?ends_with(extnx)>
<a href="#" onclick="window.external.openDocument('${relativePath}')"><img src="${url.context}${child.icon32}" alt="Open ${child.name?html}" /></a> <a href="#" onclick="window.external.openDocument('${relativePath}')"><img src="${url.context}${child.icon32}" alt="Open ${child.name?html}" /></a>
<#else> <#else>
<a href="${url.context}${child.url}?ticket=${session.ticket}" rel="_blank"><img src="${url.context}${child.icon32}" alt="Open ${child.name?html}" /></a> <a href="${url.context}${child.url}" rel="_blank"><img src="${url.context}${child.icon32}" alt="Open ${child.name?html}" /></a>
</#if> </#if>
</span> </span>
<span class="documentItemDetails"> <span class="documentItemDetails">
<#if child.name?ends_with(extn) || child.name?ends_with(extnx)> <#if child.name?ends_with(extn) || child.name?ends_with(extnx)>
<a href="#" onclick="window.external.openDocument('${relativePath}')"><span class="bold ${isVersionable?string("versionable", "notVersionable")}">${child.name?html}</span></a> <a href="#" onclick="window.external.openDocument('${relativePath}')"><span class="bold ${isVersionable?string("versionable", "notVersionable")}">${child.name?html}</span></a>
<#else> <#else>
<a href="${url.context}${child.url}?ticket=${session.ticket}" rel="_blank"><span class="bold">${child.name?html}</span></a> <a href="${url.context}${child.url}" rel="_blank"><span class="bold">${child.name?html}</span></a>
</#if> </#if>
<br /> <br />
<#if child.properties.description?exists> <#if child.properties.description?exists>

2
config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
View File

@@ -26,7 +26,7 @@
<#assign openURL = "#"> <#assign openURL = "#">
<#assign hrefExtra = " onClick=\"window.external.openDocument('${relativePath}')\""> <#assign hrefExtra = " onClick=\"window.external.openDocument('${relativePath}')\"">
<#else> <#else>
<#assign openURL = "${url.context}${child.url}?ticket=${session.ticket}"> <#assign openURL = "${url.context}${child.url}">
<#assign hrefExtra = " target=\"_blank\""> <#assign hrefExtra = " target=\"_blank\"">
</#if> </#if>
<#else> <#else>

6
source/java/org/alfresco/repo/webdav/auth/AuthenticationFilter.java
View File

@@ -202,12 +202,6 @@ public class AuthenticationFilter implements Filter
ticket = ticket.substring(0, ticket.length() - PPT_EXTN.length()); ticket = ticket.substring(0, ticket.length() - PPT_EXTN.length());
} }
// vtiIgnore argument may find its way onto the ticket due to a double-encoding issue with Office
if (ticket.endsWith(VTI_IGNORE))
{
ticket = ticket.substring(0, ticket.length() - VTI_IGNORE.length());
}
// Debug // Debug
if ( logger.isDebugEnabled()) if ( logger.isDebugEnabled())