diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-30 18:58:26 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-30 18:58:26 +0000 |
| commit | 4723a495f0682128a612aa0c59414214a6316554 (patch) | |
| tree | b5a8982afd3db6109bc3ebc0fe9dd40f37895d47 | |
| parent | 5b25a38af216bbf60a0804068678849dca338ff7 (diff) | |
Simplified how widgets get loaded in the domain manager UI iframes. Moved some of the header text from the widgets to the main pages, as in a mashup you don't need these headers in each widget.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681176 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
11 files changed, 51 insertions, 243 deletions
diff --git a/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite b/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite index 8ab19462c9..ba57ea45d1 100644 --- a/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite +++ b/java/sca/modules/domain-manager/src/main/resources/DomainManager.composite @@ -27,19 +27,6 @@ <service name="Widget"> <t:binding.http uri="http://localhost:9990/ui/home"/> </service> - <reference name="toolbarGadget" target="ToolbarGadget"> - <t:binding.http/> - </reference> - <reference name="homeGadget" target="HomeGadget"> - <t:binding.http/> - </reference> - </component> - - <component name="ToolbarGadget"> - <t:implementation.widget location="toolbar-gadget.html"/> - <service name="Widget"> - <t:binding.http uri="http://localhost:9990/ui/toolbar-gadget"/> - </service> </component> <component name="HomeGadget"> @@ -54,12 +41,6 @@ <service name="Widget"> <t:binding.http uri="http://localhost:9990/ui/workspace"/> </service> - <reference name="toolbarGadget" target="ToolbarGadget"> - <t:binding.http/> - </reference> - <reference name="workspaceGadget" target="WorkspaceGadget"> - <t:binding.http/> - </reference> </component> <component name="WorkspaceGadget"> @@ -77,12 +58,6 @@ <service name="Widget"> <t:binding.http uri="http://localhost:9990/ui/files"/> </service> - <reference name="toolbarGadget" target="ToolbarGadget"> - <t:binding.http/> - </reference> - <reference name="filesGadget" target="FilesGadget"> - <t:binding.http/> - </reference> </component> <component name="FilesGadget"> @@ -100,12 +75,6 @@ <service name="Widget"> <t:binding.http uri="http://localhost:9990/ui/composite"/> </service> - <reference name="toolbarGadget" target="ToolbarGadget"> - <t:binding.http/> - </reference> - <reference name="compositeGadget" target="DomainCompositeGadget"> - <t:binding.http/> - </reference> </component> <component name="DomainCompositeGadget"> @@ -126,12 +95,6 @@ <service name="Widget"> <t:binding.http uri="http://localhost:9990/ui/cloud"/> </service> - <reference name="toolbarGadget" target="ToolbarGadget"> - <t:binding.http/> - </reference> - <reference name="cloudGadget" target="CloudGadget"> - <t:binding.http/> - </reference> </component> <component name="CloudGadget"> diff --git a/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html b/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html index c3be5e08eb..ba73f154bb 100644 --- a/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html @@ -318,11 +318,6 @@ <body onload="init()"> <div id="cloudComposite"> - <span class=hd1> - SCA Domain<br><br> - Cloud</b> <a href="/cloud/"><img src="icons/feed-icon.png" border="0"></a> - </span> - <br><br> Here is the list of SCA nodes configured in your SCA domain cloud. <br><br> diff --git a/java/sca/modules/domain-manager/src/main/resources/cloud.html b/java/sca/modules/domain-manager/src/main/resources/cloud.html index 20794e7b6d..df37431ef2 100644 --- a/java/sca/modules/domain-manager/src/main/resources/cloud.html +++ b/java/sca/modules/domain-manager/src/main/resources/cloud.html @@ -20,45 +20,19 @@ <head> <title>SCA Domain - Cloud</title> -<script type="text/javascript" src="../cloud/cloud.js"></script> - -<script language="JavaScript"> - - //@Reference - var toolbarGadget = new Reference("toolbarGadget"); - - //@Reference - var cloudGadget = new Reference("cloudGadget"); - - function toolbarGadget_getResponse(html) { - var gadget = document.getElementById('toolbarGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function cloudGadget_getResponse(html) { - var gadget = document.getElementById('cloudGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function init() { - toolbarGadget.get('', toolbarGadget_getResponse); - cloudGadget.get('', cloudGadget_getResponse); - } - -</script> - <link rel="stylesheet" type="text/css" href="manager.css"> </head> -<body onload="init()"> - <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe> +<body> + <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe> + <br><br> + + <span class=hd1> + SCA Domain<br><br> + Cloud</b> <a href="/cloud/"><img src="icons/feed-icon.png" border="0"></a> + </span> <br> - <iframe id="cloudGadget" style="left: 0px; width: 100%; height: 100%;"></iframe> + + <iframe id="cloudGadget" src="cloud-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe> </body> </html> diff --git a/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html b/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html index 1c78db7597..7eb23a95cb 100644 --- a/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html @@ -219,11 +219,6 @@ <body onload="init()"> <div id="domainComposite"> - <span class=hd1> - SCA Domain<br><br> - Domain Composite <a href="/composite/"><img src="icons/feed-icon.png" border="0"></a> - </span> - <br><br> Here is the list of SCA composites currently included as top-level composites in your SCA domain. <br><br> diff --git a/java/sca/modules/domain-manager/src/main/resources/composite.html b/java/sca/modules/domain-manager/src/main/resources/composite.html index bbf2b172b6..fa6668c693 100644 --- a/java/sca/modules/domain-manager/src/main/resources/composite.html +++ b/java/sca/modules/domain-manager/src/main/resources/composite.html @@ -20,45 +20,19 @@ <head> <title>SCA Domain - Domain Composite</title> -<script type="text/javascript" src="../composite/composite.js"></script> - -<script language="JavaScript"> - - //@Reference - var toolbarGadget = new Reference("toolbarGadget"); - - //@Reference - var compositeGadget = new Reference("compositeGadget"); - - function toolbarGadget_getResponse(html) { - var gadget = document.getElementById('toolbarGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function compositeGadget_getResponse(html) { - var gadget = document.getElementById('compositeGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function init() { - toolbarGadget.get('', toolbarGadget_getResponse); - compositeGadget.get('', compositeGadget_getResponse); - } - -</script> - <link rel="stylesheet" type="text/css" href="manager.css"> </head> -<body onload="init()"> - <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe> +<body> + <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe> + <br><br> + + <span class=hd1> + SCA Domain<br><br> + Domain Composite <a href="/composite/"><img src="icons/feed-icon.png" border="0"></a> + </span> <br> - <iframe id="compositeGadget" style="left: 0px; width: 100%; height: 100%;"></iframe> + + <iframe id="compositeGadget" src="composite-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe> </body> </html> diff --git a/java/sca/modules/domain-manager/src/main/resources/files-gadget.html b/java/sca/modules/domain-manager/src/main/resources/files-gadget.html index d4231ee21a..04a6e6ee03 100644 --- a/java/sca/modules/domain-manager/src/main/resources/files-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/files-gadget.html @@ -77,11 +77,6 @@ <body onload="init()"> <div id="fileServer"> - <span class=hd1> - SCA Domain<br><br> - File Server <a href="/feed/files/"><img src="icons/feed-icon.png" border="0"></a> - </span> - <br><br> This is a simple ATOM-based file server useful to share files if you don't have an FTP, SVN or Maven repository. <br><br> diff --git a/java/sca/modules/domain-manager/src/main/resources/files.html b/java/sca/modules/domain-manager/src/main/resources/files.html index 71b543477a..87f6a0469e 100644 --- a/java/sca/modules/domain-manager/src/main/resources/files.html +++ b/java/sca/modules/domain-manager/src/main/resources/files.html @@ -20,45 +20,19 @@ <head> <title>SCA Domain - Contribution File Server</title> -<script type="text/javascript" src="../files/files.js"></script> - -<script language="JavaScript"> - - //@Reference - var toolbarGadget = new Reference("toolbarGadget"); - - //@Reference - var filesGadget = new Reference("filesGadget"); - - function toolbarGadget_getResponse(html) { - var gadget = document.getElementById('toolbarGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function filesGadget_getResponse(html) { - var gadget = document.getElementById('filesGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function init() { - toolbarGadget.get('', toolbarGadget_getResponse); - filesGadget.get('', filesGadget_getResponse); - } - -</script> - <link rel="stylesheet" type="text/css" href="manager.css"> </head> -<body onload="init()"> - <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe> +<body> + <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe> + <br><br> + + <span class=hd1> + SCA Domain<br><br> + File Server <a href="/feed/files/"><img src="icons/feed-icon.png" border="0"></a> + </span> <br> - <iframe id="filesGadget" style="left: 0px; width: 100%; height: 100%;"></iframe> + + <iframe id="filesGadget" src="files-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe> </body> </html> diff --git a/java/sca/modules/domain-manager/src/main/resources/home-gadget.html b/java/sca/modules/domain-manager/src/main/resources/home-gadget.html index ce7cd08fdf..32a5e15a93 100644 --- a/java/sca/modules/domain-manager/src/main/resources/home-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/home-gadget.html @@ -36,12 +36,6 @@ <body onload="init()"> <div id="home"> - <span class=hd1> - SCA Domain - </span> - - <br><br><br><br><br> - <form> <table border="0" align="center"> <tr><td valign="top"><span style="font-size:150%; color: blue">Search:</span></td><td><input type="text" name="search" size="50"/></td></tr> diff --git a/java/sca/modules/domain-manager/src/main/resources/home.html b/java/sca/modules/domain-manager/src/main/resources/home.html index 0adf5cbcb7..2984ba2afc 100644 --- a/java/sca/modules/domain-manager/src/main/resources/home.html +++ b/java/sca/modules/domain-manager/src/main/resources/home.html @@ -22,43 +22,18 @@ <script type="text/javascript" src="../home/home.js"></script> -<script language="JavaScript"> - - //@Reference - var toolbarGadget = new Reference("toolbarGadget"); - - //@Reference - var homeGadget = new Reference("homeGadget"); - - function toolbarGadget_getResponse(html) { - var gadget = document.getElementById('toolbarGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function homeGadget_getResponse(html) { - var gadget = document.getElementById('homeGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function init() { - toolbarGadget.get('', toolbarGadget_getResponse); - homeGadget.get('', homeGadget_getResponse); - } - -</script> - <link rel="stylesheet" type="text/css" href="manager.css"> </head> -<body onload="init()"> - <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe> - <br> - <iframe id="homeGadget" style="left: 0px; width: 100%; height: 100%;"></iframe> +<body> + <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe> + <br><br> + + <span class=hd1> + SCA Domain + </span> + <br><br><br><br><br><br> + + <iframe id="homeGadget" src="home-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe> </body> </html> diff --git a/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html b/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html index 41e5d6b475..944d63f1c9 100644 --- a/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html @@ -169,14 +169,10 @@ <body onload="init()"> <div id="workspace"> - - <span class=hd1> - SCA Domain<br><br> - Contributions</b> <a href="/workspace/"><img src="icons/feed-icon.png" border="0"></a> </span> - <br><br> + Here is the list of SCA contributions currently available in your SCA domain. <br><br> - + <form name="workspaceForm"> <div id="contributions" ></div> <br> diff --git a/java/sca/modules/domain-manager/src/main/resources/workspace.html b/java/sca/modules/domain-manager/src/main/resources/workspace.html index 9c9a1dc005..b3c4538a40 100644 --- a/java/sca/modules/domain-manager/src/main/resources/workspace.html +++ b/java/sca/modules/domain-manager/src/main/resources/workspace.html @@ -20,45 +20,18 @@ <head> <title>SCA Domain - Contributions</title> -<script type="text/javascript" src="../workspace/workspace.js"></script> - -<script language="JavaScript"> - - //@Reference - var toolbarGadget = new Reference("toolbarGadget"); - - //@Reference - var workspaceGadget = new Reference("workspaceGadget"); - - function toolbarGadget_getResponse(html) { - var gadget = document.getElementById('toolbarGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function workspaceGadget_getResponse(html) { - var gadget = document.getElementById('workspaceGadget'); - var content = gadget.contentWindow.document; - content.open(); - content.write(html); - content.close(); - } - - function init() { - toolbarGadget.get('', toolbarGadget_getResponse); - workspaceGadget.get('', workspaceGadget_getResponse); - } - -</script> - <link rel="stylesheet" type="text/css" href="manager.css"> </head> -<body onload="init()"> - <iframe id="toolbarGadget" style="top: 0px; left: 0px; width: 100%;"></iframe> +<body> + <iframe id="toolbarGadget" src="toolbar-gadget.html" style="top: 0px; left: 0px; width: 100%;"></iframe> + <br><br> + + <span class=hd1> + SCA Domain<br><br> + Contributions</b> <a href="/workspace/"><img src="icons/feed-icon.png" border="0"></a> </span> <br> - <iframe id="workspaceGadget" style="left: 0px; width: 100%; height: 100%;"></iframe> + + <iframe id="workspaceGadget" src="workspace-gadget.html" style="left: 0px; width: 100%; height: 100%;"></iframe> </body> </html> |