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

Missing image resolving support in AbstractWebScript, improvement to video plugin support in FireFox ajax pop-up node panel

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-03-15 15:46:50 +00:00
parent bc055cc60e
commit ad668e7cb9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/templates/client/summary_panel.ftl
View File

@@ -28,8 +28,8 @@
<param name="UIMode" value="none" />
<param name="URL" value="${absurl(node.url)}" />
<param name="autoStart" value="true" />
<#--<embed width="320" height="240" src="${absurl(node.url)}" bgcolor="#ffffff" border="0" pluginspage="http://windowsmedia.com/download/"></embed>-->
<embed type="application/x-mplayer2" pluginspage="http://www.microsoft.com/windows95/downloads/contents/wurecommended/s_wufeatured/mediaplayer/default.asp" src="${absurl(node.url)}" name="MediaPlayer2" showcontrols="1" showdisplay="0" showstatusbar="0" autosize="1" autoplay="0" autoStart="0" height="240" width="320"></embed>
<#--<embed type="application/x-mplayer2" pluginspage="http://microsoft.com/windows/mediaplayer/en/download/" src="${absurl(node.url)}" showcontrols="1" showdisplay="0" showstatusbar="0" autosize="1" autoplay="0" autoStart="0" height="240" width="320"></embed>-->
<embed width="320" height="240" src="${absurl(node.url)}" border="0" showcontrols="1" showdisplay="0" showstatusbar="0" autosize="1" autoplay="0" autoStart="0"></embed>
</object>
<#else>
<table cellspacing=0 cellpadding=0 border=0>

11
source/java/org/alfresco/web/scripts/AbstractWebScript.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.ScriptLocation;
import org.alfresco.service.cmr.repository.TemplateExtensionImplementation;
import org.alfresco.service.cmr.repository.TemplateImageResolver;
import org.alfresco.service.cmr.repository.TemplateNode;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.web.scripts.WebScriptDescription.RequiredAuthentication;
@@ -245,6 +246,8 @@ public abstract class AbstractWebScript implements WebScript
// create template model
Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
TemplateImageResolver tr = getWebScriptRegistry().getTemplateImageResolver();
// add repository context
if (getDescription().getRequiredAuthentication() != RequiredAuthentication.none &&
getDescription().getRequiredTransaction() != RequiredTransaction.none)
@@ -252,13 +255,13 @@ public abstract class AbstractWebScript implements WebScript
NodeRef companyHome = scriptContext.getCompanyHome();
if (companyHome != null)
{
model.put("companyhome", new TemplateNode(scriptContext.getCompanyHome(), serviceRegistry, null));
model.put("companyhome", new TemplateNode(scriptContext.getCompanyHome(), serviceRegistry, tr));
}
NodeRef person = scriptContext.getPerson();
if (person != null)
{
model.put("person", new TemplateNode(person, serviceRegistry, null));
model.put("userhome", new TemplateNode(scriptContext.getUserHome(person), serviceRegistry, null));
model.put("person", new TemplateNode(person, serviceRegistry, tr));
model.put("userhome", new TemplateNode(scriptContext.getUserHome(person), serviceRegistry, tr));
}
}
@@ -276,7 +279,7 @@ public abstract class AbstractWebScript implements WebScript
// the extensions include custom root helper objects and custom template method objects
for (TemplateExtensionImplementation ext : serviceRegistry.getTemplateService().getExtensions())
{
ext.setTemplateImageResolver(getWebScriptRegistry().getTemplateImageResolver());
ext.setTemplateImageResolver(tr);
model.put(ext.getExtensionName(), ext);
}