summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-05-28 08:14:27 (EDT)
committerStephan Born2013-08-29 04:35:53 (EDT)
commit1460164844acb097da42294e74e6103124b8a50e (patch)
tree5d2d1077b4637bc30e870d8d6ea61374e612fd83
parent1bcc7bc7e084e1b8f7e79a926343e7867753d25c (diff)
downloadorg.eclipse.stardust.ui.web-1460164844acb097da42294e74e6103124b8a50e.zip
org.eclipse.stardust.ui.web-1460164844acb097da42294e74e6103124b8a50e.tar.gz
org.eclipse.stardust.ui.web-1460164844acb097da42294e74e6103124b8a50e.tar.bz2
Jira-ID: CRNT-29167
Merged the changes from CRNT-29162 for main.xhtml , login.xhtml and iDnd.js git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@65150 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/iDnD.js4
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/main.xhtml4
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/login.xhtml3
3 files changed, 8 insertions, 3 deletions
diff --git a/portal-common/src/main/resources/META-INF/xhtml/iDnD.js b/portal-common/src/main/resources/META-INF/xhtml/iDnD.js
index 579ba37..ab27cf5 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/iDnD.js
+++ b/portal-common/src/main/resources/META-INF/xhtml/iDnD.js
@@ -79,8 +79,8 @@ var iDnD = function () {
if ((true == ifDrag) && (dragContentIFrame.style.visibility == "visible"))
{
dragContentIFrame.style.position = 'absolute';
- dragContentIFrame.style.left = (coordinates.x + 10);
- dragContentIFrame.style.top = (coordinates.y + 10);
+ dragContentIFrame.style.left = (coordinates.x + 10) + "px";
+ dragContentIFrame.style.top = (coordinates.y + 10) + "px";
}
else if (true == ifDrag)
{
diff --git a/portal-common/src/main/resources/META-INF/xhtml/main.xhtml b/portal-common/src/main/resources/META-INF/xhtml/main.xhtml
index 25ddad2..2f8d76a 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/main.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/main.xhtml
@@ -1,6 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<f:view xmlns:f="http://java.sun.com/jsf/core"
xmlns:ice="http://www.icesoft.com/icefaces/component">
+<ice:outputDeclaration doctypeRoot="HTML"
+ doctypePublic="-//W3C//DTD HTML 4.01 Transitional//EN"
+ doctypeSystem="http://www.w3.org/TR/html4/loose.dtd" />
<html style="width: 100%; height: 100%">
<head>
diff --git a/views-common/src/main/resources/META-INF/xhtml/login.xhtml b/views-common/src/main/resources/META-INF/xhtml/login.xhtml
index 427971f..d6045f2 100644
--- a/views-common/src/main/resources/META-INF/xhtml/login.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/login.xhtml
@@ -10,6 +10,9 @@
xmlns:pc="http://www.sungard.de/carnot/web/portal-plugin/portalcommon">
<ui:composition>
<f:view>
+ <ice:outputDeclaration doctypeRoot="HTML"
+ doctypePublic="-//W3C//DTD HTML 4.01 Transitional//EN"
+ doctypeSystem="http://www.w3.org/TR/html4/loose.dtd" />
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />