diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
index f18f40b74f..2849bd0071 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/documentDetails.get.html.ftl
@@ -20,7 +20,7 @@
-
+
@@ -105,7 +105,7 @@
<#assign versionRow=versionRow+1>
-
+
|
${record.versionLabel}
@@ -182,7 +182,7 @@
#if>
-
+
Open Full Details
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
index 3548a94de7..14ac3410a3 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myAlfresco.get.html.ftl
@@ -21,7 +21,7 @@
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
index 681c346623..1ff84dbcba 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasks.get.html.ftl
@@ -24,7 +24,7 @@
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
index 78a132d828..67b2997f01 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/myTasksDetail.get.html.ftl
@@ -43,14 +43,25 @@
<#list task.packageResources as res>
+ <#if res.isDocument>
+ <#if res.name?ends_with(".doc")>
+ <#assign webdavPath = (res.displayPath?substring(13) + '/' + res.name)?url('ISO-8859-1')?replace('%2F', '/')?replace('\'', '\\\'') />
 |
- <#if res.isDocument>
- ${res.name}
- <#else>
- ${res.name}
- #if>
+ ${res.name}
|
+ <#else>
+  |
+
+ ${res.name}
+ |
+ #if>
+ <#else>
+  |
+
+ ${res.name}
+ |
+ #if>
#list>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
index aad789cc5e..b1a2fb2002 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.html.ftl
@@ -12,7 +12,7 @@
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.js b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.js
index 6bfc490cd7..7eabc466cf 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/navigation.get.js
@@ -19,12 +19,12 @@ else if ((args.p) && (args.p != ""))
}
else
{
- model.node = companyhome;
+ model.node = userhome;
}
}
}
else
{
- model.node = companyhome;
+ model.node = userhome;
}
model.path = args.p;
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl
index 299c45144f..a99f4e7bc5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/search.get.html.ftl
@@ -11,7 +11,7 @@
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
index f1806e449c..da55622c17 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/office/searchResults.get.html.ftl
@@ -31,7 +31,7 @@
<#assign openURL = "#">
<#assign hrefExtra = " onClick=\"window.external.openDocument('${webdavPath}')\"">
<#else>
- <#assign openURL = "${url.context}${child.url}">
+ <#assign openURL = "${url.context}${child.url}?ticket=${session.ticket}">
<#assign hrefExtra = " target=\"_blank\"">
#if>
<#else>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl
index 3ba8f40da5..0c0489f6d6 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl
@@ -2,7 +2,7 @@
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
index c3ad4a9012..cdfe129c79 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
@@ -2,7 +2,7 @@
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl
index d94eadae6a..95f0aee34d 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks.get.html.ftl
@@ -2,7 +2,7 @@
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl
index 483c564c83..875d6b2223 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl
@@ -2,7 +2,7 @@
-
+
diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
index 6b70f020e0..a3203f62cf 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
@@ -183,7 +183,7 @@ public class PageTag extends TagSupport
// mootools
out.write("");
+ out.write("/scripts/ajax/mootools.v1.11.js\">");
// common Alfresco util methods
out.write(" |