summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-07-11 07:02:40 (EDT)
committerStephan Born2013-09-23 04:52:43 (EDT)
commit82d81a00fdd347e4ac6937a140bad85c05ddd109 (patch)
treefcbfd902b43acb8ff630dd7e3d2ae4610fe716c5
parent29e35e1713ab7724b3e5109d1250f25224bf0980 (diff)
downloadorg.eclipse.stardust.ui.web-82d81a00fdd347e4ac6937a140bad85c05ddd109.zip
org.eclipse.stardust.ui.web-82d81a00fdd347e4ac6937a140bad85c05ddd109.tar.gz
org.eclipse.stardust.ui.web-82d81a00fdd347e4ac6937a140bad85c05ddd109.tar.bz2
Jira-ID: CRNT-28362
Converted the Perspective MenuBar to Iframe Removed JavascriptContext.addJavascriptCall() from perspectiveMenuIframeHandler.openPopup git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@65962 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PerspectiveMenuIframeHandler.java6
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java9
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/perspectiveMenuIframePopup.xhtml20
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanels.xhtml83
4 files changed, 69 insertions, 49 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PerspectiveMenuIframeHandler.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PerspectiveMenuIframeHandler.java
index f15fb7f..749546b 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PerspectiveMenuIframeHandler.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PerspectiveMenuIframeHandler.java
@@ -65,7 +65,6 @@ public class PerspectiveMenuIframeHandler implements Serializable
+ getPopupArgs() + ");";
PortalApplication.getInstance().addEventScript(script);
- JavascriptContext.addJavascriptCall(FacesContext.getCurrentInstance(), script);
open = true;
}
}
@@ -75,8 +74,9 @@ public class PerspectiveMenuIframeHandler implements Serializable
*/
public String getPopupArgs()
{
- String advanceArgs = "{anchorId:'ippPerspectiveMenuAnchor', width:100, height:110,"
- + "openOnRight:true, anchorXAdjustment:-3, anchorYAdjustment:18, zIndex:1000, border:'none', noUnloadWarning: 'true'}";
+ // For Panama, appended the parentIframe for Anchor name i.e parentIframe:AnchorName
+ String advanceArgs = "{anchorId:'modelerLaunchPanels:ippPerspectiveMenuAnchor', width:100, height:110,"
+ + "openOnRight:true, anchorXAdjustment:-3, anchorYAdjustment:27, zIndex:1000, border:'none', noUnloadWarning: 'true'}";
return advanceArgs;
}
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java
index 2406ca0..3ec0d17 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalUiController.java
@@ -414,23 +414,24 @@ public class PortalUiController
*/
private void processPerspectiveChange(String perspectiveId) throws AbortProcessingException
{
+ // Avoiding accessing PortalApplication statically in this class
+ // So using bean name and get bean from context directly
+ PortalApplication portalApplication = (PortalApplication) FacesUtils.getBeanFromContext("ippPortalApp");
+
for (IPerspectiveDefinition perspective : perspectives.values())
{
if (areEqual(perspectiveId, perspective.getName()) && (currentPerspective != perspective))
{
setPerspective(perspective);
- // Avoiding accessing PortalApplication statically in this class
- // So using bean name and get bean from context directly
- PortalApplication portalApplication = (PortalApplication)FacesUtils.getBeanFromContext("ippPortalApp");
if (portalApplication.isPinViewOpened() && null != portalApplication.getPinView())
{
broadcastNonVetoableViewEvent(portalApplication.getPinView(), ViewEventType.PERSPECTIVE_CHANGED);
}
- portalApplication.renderPortalSession();
break;
}
}
+ portalApplication.renderPortalSession();
perspectiveMenuIframeHandler.closeIframePopup();
}
diff --git a/portal-common/src/main/resources/META-INF/xhtml/perspectiveMenuIframePopup.xhtml b/portal-common/src/main/resources/META-INF/xhtml/perspectiveMenuIframePopup.xhtml
index f795bf6..e05159b 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/perspectiveMenuIframePopup.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/perspectiveMenuIframePopup.xhtml
@@ -36,16 +36,26 @@
advanceArgs.width = document.documentElement.scrollWidth;
advanceArgs.height = document.documentElement.scrollHeight+0.5;
- if (parent.ippPortalMain.InfinityBpm.Core.isFF())
+ var firefox = false;
+ if (parent.BridgeUtils)
{
- advanceArgs.anchorYAdjustment = advanceArgs.anchorYAdjustment - 24;
+ firefox = parent.BridgeUtils.Util.isFF();
}
else
- {
+ {
+ firefox = parent.ippPortalMain.InfinityBpm.Core.isFF();
+ }
+
advanceArgs.anchorYAdjustment = advanceArgs.anchorYAdjustment - 24;
+
+ if (parent.BridgeUtils)
+ {
+ parent.BridgeUtils.FrameManager.resizeAndReposition(iFrameId, advanceArgs);
+ }
+ else
+ {
+ parent.ippPortalMain.InfinityBpm.ProcessPortal.resizeAndRepositionContentFrame(iFrameId, advanceArgs);
}
-
- parent.ippPortalMain.InfinityBpm.ProcessPortal.resizeAndRepositionContentFrame(iFrameId, advanceArgs);
}
}
diff --git a/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanels.xhtml b/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanels.xhtml
index 0ceff30..214127a 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanels.xhtml
+++ b/portal-common/src/main/resources/META-INF/xhtml/portalSingleViewLaunchPanels.xhtml
@@ -6,44 +6,53 @@
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:pc="http://www.sungard.de/carnot/web/portal-plugin/portalcommon">
-<ice:panelGroup>
- <div class="toolbar">
- <ice:form partialSubmit="false">
- <table>
- <tr>
- <td style="width: 99%; text-align: right;">
- <ice:menuBar styleClass="topMenuBar">
- <pc:automationTag value="auto-FW-PerspectiveMenu" />
- <ice:menuItem value="" icon="/plugins/common/images/icons/trigger-perspective.png">
- <c:forEach items="#{ippPortalUi.perspectiveItems}" var="mnuItm">
- <ice:menuItem value="#{mnuItm.value}" id="#{mnuItm.id}"
- icon="#{ (mnuItm.title eq ippPortalUi.perspective.label) ? '/plugins/common/images/icons/ui-check-box.png' : '/plugins/common/images/icons/ui-check-box-uncheck.png'}"
- title="#{mnuItm.title}"
- actionListener="#{ippPortalUi.processPerspectiveMenuAction}">
- </ice:menuItem>
- </c:forEach>
- </ice:menuItem>
- </ice:menuBar>
- </td>
- </tr>
- </table>
- </ice:form>
- </div>
-
- <div class="content">
- <c:forEach items="#{ippPortalUi.perspective.launchPanels}" var="launchPanel">
- <ice:form partialSubmit="false">
- <ice:panelGroup>
- <ui:include src="portalUserDefinedInclude.xhtml">
- <ui:param name="includeFilePath" value="#{launchPanel.include}" />
- </ui:include>
- <ice:panelGroup styleClass="clearing" />
- </ice:panelGroup>
+ <ice:panelGroup>
+ <div class="topMenu" style="line-height:16px;">
+ <ice:form partialSubmit="true">
+ <table>
+ <tr>
+ <td class="topMenuTd">
+ <ice:panelGroup styleClass="topMenuIframeBar">
+ <ice:panelGrid columns="2" styleClass="menuItm">
+ <ice:commandLink
+ action="#{ippPortalUi.perspectiveMenuIframeHandler.togglePopup}"
+ style="margin-right:3px;">
+ <ice:panelGroup style="padding-top: 1px; padding-right: 2px;">
+ <ice:graphicImage
+ value="/plugins/common/images/icons/trigger-perspective.png" />
+ </ice:panelGroup>
+ </ice:commandLink>
+ <ice:commandLink value="#{ippPortalUi.perspective.label}"
+ action="#{ippPortalUi.perspectiveMenuIframeHandler.togglePopup}"
+ style="margin-right:3px;">
+ <pc:automationTag value="auto-FW-PerspectiveMenu"
+ standAlone="false" />
+ </ice:commandLink>
+ </ice:panelGrid>
+ <!-- Anchor to include the Iframe -->
+ <div id="ippPerspectiveMenuAnchor"></div>
+ </ice:panelGroup>
+ </td>
+ </tr>
+ </table>
</ice:form>
- </c:forEach>
- </div>
+ </div>
+
+ <div class="content">
+ <c:forEach items="#{ippPortalUi.perspective.launchPanels}"
+ var="launchPanel">
+ <ice:form partialSubmit="false">
+ <ice:panelGroup>
+ <ui:include src="portalUserDefinedInclude.xhtml">
+ <ui:param name="includeFilePath" value="#{launchPanel.include}" />
+ </ui:include>
+ <ice:panelGroup styleClass="clearing" />
+ </ice:panelGroup>
+ </ice:form>
+ </c:forEach>
+ </div>
- <div id="ippPortalEndLP"></div>
-</ice:panelGroup>
+ <div id="ippPortalEndLP"></div>
+ </ice:panelGroup>
</f:view> \ No newline at end of file