-
-
+
+
<#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 |
+ |
+
+ #if>
|
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>#if>
+<#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} |
+ |
+
+ #if>
|
|