Minor stylesheet changes.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1065479 13f79535-47bb-0310-9956-ffa450edef68
author: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2011-01-31 03:57:57 +0000
committer: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> 2011-01-31 03:57:57 +0000
commit: 608b81cdaae88392dcec0bcde2ec9b8fb4ace634 (patch)
tree: a909fdbabae2cb8cd0fcc02e8125bb2531792ec5 /sca-cpp/trunk/modules/edit
parent: 6afef449a6560d469102ab0298d4cc925d76aa0f (diff)
6 files changed, 56 insertions, 22 deletions
diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/index.html b/sca-cpp/trunk/modules/edit/htdocs/app/index.html
index ee07b5d4b7..f5f11137ec 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/app/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/app/index.html
@@ -51,10 +51,7 @@ function editapp(name) {
     if (isNil(name))
         return;
     $('title').innerHTML = 'Editing: ' + name;
-    $('app').innerHTML =
-        '<iframe id="appFrame" style="height: 100%; width: 100%; border: 0px;" scrolling="no" frameborder="0" src="app.html?' +
-        'app=' + name +
-        '"></iframe>';
+    ui.loadiframe('app', 'app.html?app=' + name);
 }
 
 // Display the editor for the current app
diff --git a/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html b/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html
index 29de0e396a..0339f3fa76 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html
@@ -58,9 +58,6 @@
 </div>
 
 <script type="text/javascript">
-// Install the widget
-ui.installwidget();
-
 // Init service references
 var editWidget = sca.component("EditWidget");
 var dashboard = sca.reference(editWidget, "dashboard");
@@ -86,7 +83,7 @@ function getapps(sync) {
 
             apps += '<tr>';
             //apps += '<td><input name="apps" type="checkbox" value="' + name + '">' + '<a href=\"' + '/app/?app=' + name + '\">' + name + '</a></td>';
-            apps += '<td><a href=\"' + '/app/?app=' + name + '\">' + name + '</a></td>';
+            apps += '<td><a href=\"' + '/app/?app=' + name + '\" target=\"_parent\">' + name + '</a></td>';
             apps += '<td class="tdw">' + title + '</td>';
             apps += '</tr>';
         }
diff --git a/sca-cpp/trunk/modules/edit/htdocs/dash/index.html b/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
index 60aafcd12e..d84424e96e 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
@@ -23,6 +23,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes"/>
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
 <link rel="stylesheet" type="text/css" href="/ui.css"/>
+<script type="text/javascript" src="/util.js"></script>
 <script type="text/javascript" src="/ui.js"></script>
 </head>
 <body>
@@ -38,7 +39,7 @@
 ui.loadwidget('menu', '/menu.html');
 
 // Load the dashboard
-ui.loadwidget('dashboard', 'dashboard.html');
+ui.loadiframe('dashboard', 'dashboard.html');
 </script>
 </body>
 </html>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/index.html b/sca-cpp/trunk/modules/edit/htdocs/index.html
index d0736ba295..d47031fa7e 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/index.html
@@ -31,22 +31,11 @@
 
 <br/>
 <h1>App Edit Tools</h1>
-<p>This module implements simple tools to help you create Tuscany apps.</p>
-
-<h2>App Dashboard</h2>
-<p>Try the <a href="dash">App Dashboard</a> to manage your collection of apps.</p>
-
-<h2>App Editor</h2>
-<p>Try the <a href="app/?app=store">App Editor</a> to edit an app.</p>
-
-<h2>Composition Editor</h2>
-<p>Try the <a href="graph/?app=store">Composition Editor</a> to compose an app.</p>
-
-<h2>Page Editor</h2>
-<p>Try the <a href="page/?app=store">Page Editor</a> to draw an app page.</p>
+<div id="main"></div>
 
 <script type="text/javascript">
 ui.loadwidget('menu', '/menu.html');
+ui.loadiframe('main', 'main.html');
 </script>
 </body>
 </html>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/main.html b/sca-cpp/trunk/modules/edit/htdocs/main.html
new file mode 100644
index 0000000000..a9f074c8ae
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/htdocs/main.html
@@ -0,0 +1,42 @@
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<html>
+<head>  
+<link rel="stylesheet" type="text/css" href="/ui.css">
+<script type="text/javascript" src="/util.js"></script>
+<script type="text/javascript" src="/ui.js"></script>
+</head>  
+<body>
+
+<p>This module implements simple tools to help you create Tuscany apps.</p>
+
+<h2>App Dashboard</h2>
+<p>Try the <a href="dash" target="_parent">App Dashboard</a> to manage your collection of apps.</p>
+
+<h2>App Editor</h2>
+<p>Try the <a href="app/?app=store" target="_parent">App Editor</a> to edit an app.</p>
+
+<h2>Composition Editor</h2>
+<p>Try the <a href="graph/?app=store" target="_parent">Composition Editor</a> to compose an app.</p>
+
+<h2>Page Editor</h2>
+<p>Try the <a href="page/?app=store" target="_parent">Page Editor</a> to draw an app page.</p>
+
+</body>
+</html>
diff --git a/sca-cpp/trunk/modules/edit/start b/sca-cpp/trunk/modules/edit/start
index 7750571423..25adffb948 100755
--- a/sca-cpp/trunk/modules/edit/start
+++ b/sca-cpp/trunk/modules/edit/start
@@ -17,7 +17,15 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+here=`readlink -f $0`; here=`dirname $here`
+jsprefix=`readlink -f $here/../js`
+
 ../http/httpd-conf tmp localhost 8090 htdocs
+cat >>tmp/conf/httpd.conf <<EOF
+# Override CSS
+Alias /ui.css $jsprefix/htdocs/uiblue.css
+
+EOF
 ../server/server-conf tmp
 ../python/python-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
author	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2011-01-31 03:57:57 +0000
committer	jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>	2011-01-31 03:57:57 +0000
commit	608b81cdaae88392dcec0bcde2ec9b8fb4ace634 (patch)
tree	a909fdbabae2cb8cd0fcc02e8125bb2531792ec5 /sca-cpp/trunk/modules/edit
parent	6afef449a6560d469102ab0298d4cc925d76aa0f (diff)