From 4ced84dd08994ea331ac07b77b83cd187f1a7d05 Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Fri, 13 Aug 2010 11:43:38 +0000 Subject: [PATCH] A patch from Karl Pitrich "When editing Portal Pages, Drag & Drop for Portlets does not work" (https://issues.apache.org/jira/browse/OFBIZ-3889) - OFBIZ-3889 When editing Portlet Pages, either in MyPortal or PortalAdm, Drag & Drop of Portlets does not work. Where are several Issues in the MyPortal, some have fixes, none is commited to trunk. Problems: * in myportal.js, function getDestinationInformationPortlets(): DOM ID's are not handled correctly * in framework/webtools/widget/PortalAdmScreens.xml: required javascript + css files are not included JLR: While working on this I have found other issues: the login.ftl files used in hhfacility and myportal were not tenant enabled. They are different but by chance in myportal very close to common so I was finally able to do both at along with Karl's changes. Actually I wanted to do 2 commits but forget to uncheck the files while doing a second attempt to commit. MyPortal * The login process in MyPortal was not tenant enabled, it's done in this commit. * I kept its specificity : newRegisterLogin and wonder why it has not been extended to common? hhfacility The login process in hhfacility was not tenant enabled, it's done in this commit. Doing so, I saw there i18n is not done, not an issue for me... git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985163 13f79535-47bb-0310-9956-ffa450edef68 --- .../webcommon/portal/editPortalPage.ftl | 4 +-- framework/images/webapp/images/myportal.css | 19 ++++++----- framework/images/webapp/images/myportal.js | 33 +++++++++++++++---- .../webtools/widget/PortalAdmScreens.xml | 2 ++ .../hhfacility/webapp/hhfacility/login.ftl | 8 ++++- specialpurpose/myportal/widget/login.ftl | 7 ++++ 6 files changed, 56 insertions(+), 17 deletions(-) diff --git a/framework/common/webcommon/portal/editPortalPage.ftl b/framework/common/webcommon/portal/editPortalPage.ftl index 9c81645737..5d9912c3ff 100644 --- a/framework/common/webcommon/portal/editPortalPage.ftl +++ b/framework/common/webcommon/portal/editPortalPage.ftl @@ -57,8 +57,8 @@ under the License. <#assign portletFields = ''>
- - + +
${portletFields}
<#list portalPages as portalPageList> <#if portalPage.portalPageId != portalPageList.portalPageId> diff --git a/framework/images/webapp/images/myportal.css b/framework/images/webapp/images/myportal.css index 156d88fc30..ff51d04ae8 100644 --- a/framework/images/webapp/images/myportal.css +++ b/framework/images/webapp/images/myportal.css @@ -17,21 +17,24 @@ * under the License. */ +html,body { +height:100%; +margin:0; +} + #loading { +background-color: rgba(0, 0, 0, 0.496094); position: absolute; -background-image: url(/images/myportal_load_bg.png); -background-repeat:repeat; -background-position:top center; -z-index: 100; top: 0px; -left: 10px; -border: 0px !important; -width: 99%; +left: 0px; +width: 100%; height: 100%; +z-index: 9999; } #loaderImg { position: absolute; -top: 200px; +top: 250px; left: 50%; } + diff --git a/framework/images/webapp/images/myportal.js b/framework/images/webapp/images/myportal.js index f3f3c740bc..1b9944cec4 100644 --- a/framework/images/webapp/images/myportal.js +++ b/framework/images/webapp/images/myportal.js @@ -193,13 +193,17 @@ function makeDroppable(id){ //calls ajax request for dropping container on a portlet function getDestinationInformationPortlets(originId, destinationId, mode){ loadingImage(); - - var move = document.forms['freeMove_' + destinationId]; + + // extract integer part of arguments for freeMove_ + var destId = destinationId.replace(/.*_([0-9]+)/, "\$1"); + var origId = originId.replace(/.*_([0-9]+)/, "\$1"); + + var move = document.forms['freeMove_' + destId]; var d_portalPageId = move.elements['portalPageId'].value; var d_portalPortletId = move.elements['portalPortletId'].value; var d_portletSeqId = move.elements['portletSeqId'].value; - var move = document.forms['freeMove_' + originId]; + var move = document.forms['freeMove_' + origId]; var o_portalPageId = move.elements['portalPageId'].value; var o_portalPortletId = move.elements['portalPortletId'].value; var o_portletSeqId = move.elements['portletSeqId'].value; @@ -287,15 +291,32 @@ function onCompleteRequest() { } } +//safely get height of whole document +function getDocHeight() { + var D = document; + return Math.max( + Math.max(D.body.scrollHeight, D.documentElement.scrollHeight), + Math.max(D.body.offsetHeight, D.documentElement.offsetHeight), + Math.max(D.body.clientHeight, D.documentElement.clientHeight) + ); +} + //displays the loading image -function loadingImage() { - var container = document.getElementById("portalContainerId"); +function loadingImage() { var p = document.createElement("div"); - p.setAttribute("id", "loading"); + p.setAttribute("id", "loading"); + p.setAttribute("style", "height: " + getDocHeight() + "px;" ) + var img = document.createElement("img"); img.setAttribute("src", "/images/loader.gif"); img.setAttribute("id", "loaderImg"); + + //place loader image somwhere in the middle of the viewport + img.setAttribute("style", "top: " + (document.viewport.getHeight() / 2 + document.viewport.getScrollOffsets().top - 50) + "px;"); + p.appendChild(img); + + var container = document.getElementById("portalContainerId"); container.appendChild(p); } diff --git a/framework/webtools/widget/PortalAdmScreens.xml b/framework/webtools/widget/PortalAdmScreens.xml index 252e0da862..e5648f91c6 100644 --- a/framework/webtools/widget/PortalAdmScreens.xml +++ b/framework/webtools/widget/PortalAdmScreens.xml @@ -93,6 +93,8 @@ under the License.
+ + diff --git a/specialpurpose/hhfacility/webapp/hhfacility/login.ftl b/specialpurpose/hhfacility/webapp/hhfacility/login.ftl index 70bc2f58ad..063d9bb650 100644 --- a/specialpurpose/hhfacility/webapp/hhfacility/login.ftl +++ b/specialpurpose/hhfacility/webapp/hhfacility/login.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - +<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")> <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))> <#if username != ""> <#assign focusName = false> @@ -62,6 +62,12 @@ under the License. + <#if ("Y" == useMultitenant)> + + TenantId + + + diff --git a/specialpurpose/myportal/widget/login.ftl b/specialpurpose/myportal/widget/login.ftl index db528df7e4..c1fc6a5add 100644 --- a/specialpurpose/myportal/widget/login.ftl +++ b/specialpurpose/myportal/widget/login.ftl @@ -18,6 +18,7 @@ under the License. --> <#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap> +<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")> <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))> <#if username != ""> @@ -41,6 +42,12 @@ under the License. ${uiLabelMap.CommonPassword} + <#if ("Y" == useMultitenant)> + + ${uiLabelMap.CommonTenantId} + + +