summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/edit
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-01-17 07:26:48 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-01-17 07:26:48 +0000
commit7a003f5bbf49082dcf24105aa6f7bc8c6650c255 (patch)
treece7f534a8b74dff0f5c280ccaa7b862a29b27023 /sca-cpp/trunk/modules/edit
parentf90791f2f7b48d7e08ce08f7ead498e1191a96b8 (diff)
Use a common stylesheet in all samples.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1059769 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-cpp/trunk/modules/edit/Makefile.am4
-rw-r--r--sca-cpp/trunk/modules/edit/edit.composite8
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/dash/index.html2
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/graph/graph.html10
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/graph/graph.js9
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/graph/index.html2
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/index.html1
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/login/index.html11
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/logout/index.html10
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/page/index.html2
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/page/page.html11
-rw-r--r--sca-cpp/trunk/modules/edit/log.py24
-rwxr-xr-xsca-cpp/trunk/modules/edit/start2
13 files changed, 81 insertions, 15 deletions
diff --git a/sca-cpp/trunk/modules/edit/Makefile.am b/sca-cpp/trunk/modules/edit/Makefile.am
index f2827ee8c5..5b456ea4ca 100644
--- a/sca-cpp/trunk/modules/edit/Makefile.am
+++ b/sca-cpp/trunk/modules/edit/Makefile.am
@@ -17,6 +17,6 @@
moddir = $(prefix)/modules/edit
-nobase_dist_mod_DATA = htdocs/*.html htdocs/dash/*.html htdocs/edit/*.html htdocs/edit/*.js htdocs/login/*.html htdocs/logout/*.html
-EXTRA_DIST = htdocs/*.html htdocs/dash/*.html htdocs/edit/*.html htdocs/edit/*.js htdocs/login/*.html htdocs/logout/*.html
+nobase_dist_mod_DATA = htdocs/*.html htdocs/dash/*.html htdocs/graph/*.html htdocs/graph/*.js htdocs/page/*.html htdocs/page/*.js htdocs/login/*.html htdocs/logout/*.html
+EXTRA_DIST = htdocs/*.html htdocs/dash/*.html htdocs/graph/*.html htdocs/graph/*.js htdocs/page/*.html htdocs/page/*.js htdocs/login/*.html htdocs/logout/*.html
diff --git a/sca-cpp/trunk/modules/edit/edit.composite b/sca-cpp/trunk/modules/edit/edit.composite
index 90d53b56b6..c5996e2db1 100644
--- a/sca-cpp/trunk/modules/edit/edit.composite
+++ b/sca-cpp/trunk/modules/edit/edit.composite
@@ -42,6 +42,7 @@
<reference name="palettes" target="Palettes"/>
<reference name="apps" target="Apps"/>
<reference name="pages" target="Pages"/>
+ <reference name="log" target="Log"/>
</component>
<component name="Dashboard">
@@ -145,4 +146,11 @@
<property name="servers">localhost:11211</property>
</component>
+ <component name="Log">
+ <t:implementation.python script="log.py"/>
+ <service name="Log">
+ <t:binding.http uri="log"/>
+ </service>
+ </component>
+
</composite>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/dash/index.html b/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
index b9ad29b235..3b3dcc0cd5 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
@@ -28,7 +28,9 @@
<body>
<div id="menu"></div>
+<br/>
<h1>Welcome to your App Dashboard!</h1>
+<br/>
<div id="dashboard"></div>
<script type="text/javascript">
diff --git a/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
index a7d185da42..fd9ae694a7 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
@@ -30,16 +30,18 @@
</head>
<body>
-<div>
-<span style="position: absolute; left: 0px; top: 0px"><h2>Palette</h2></span>
-<span style="position: absolute; left: 350px; top: 0px"><h2>App</h2></span>
-</div>
+<table style="position: absolute; top: 0px; left: 0px;" width="100%">
+<tr><th style="width: 338px;">Palette</th><th>App</th></tr>
+</table>
<script type="text/javascript">
var editWidget = sca.component("EditWidget");
var palettes = sca.reference(editWidget, "palettes");
var apps = sca.reference(editWidget, "apps");
+// Setup remote log
+rconsole = sca.defun(sca.reference(editWidget, "log"), "log");
+
/**
* Return the current app name.
*/
diff --git a/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
index 1d3b730539..c391afaf23 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
+++ b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
@@ -378,6 +378,7 @@ if (ui.isIE()) {
div.style.position = 'absolute';
div.style.left = pos.xpos();
div.style.top = pos.ypos();
+ // -webkit-user-select: none;
document.body.appendChild(div);
var svg = document.createElementNS(graph.svgns, 'svg');
@@ -428,11 +429,19 @@ if (ui.isIE()) {
window.top.onmouseup = window.onmouseup;
window.ontouchend = window.onmouseup;
+ window.gestureend = window.onmouseup;
+ window.top.gestureend = window.onmouseup;
window.top.ontouchend = window.onmouseup;
+ window.ontouchcancel = window.onmouseup;
+ window.top.ontouchcancel = window.onmouseup;
window.onmousemove = function(e) {
if (graph.dragging == null)
return false;
+ if (e.preventDefault)
+ e.preventDefault();
+ else
+ e.returnValue = false;
var pmatrix = graph.dragging.parentNode.getCTM();
var matrix = graph.dragging.getCTM();
var curX = pmatrix != null? (Number(matrix.e) - Number(pmatrix.e)): Number(matrix.e);
diff --git a/sca-cpp/trunk/modules/edit/htdocs/graph/index.html b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html
index c02f7b44d0..aebc0ece68 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/graph/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html
@@ -29,7 +29,9 @@
<body>
<div id="menu"></div>
+<br/>
<h1><span id="title"></span></h1>
+</br/>
<div id="graph"></div>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/index.html b/sca-cpp/trunk/modules/edit/htdocs/index.html
index a9e149c7b1..4dde5b543d 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/index.html
@@ -29,6 +29,7 @@
<body>
<div id="menu"></div>
+<br/>
<h1>App Edit Tools</h1>
<p>This module implements simple tools to help you create Tuscany apps.</p>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/login/index.html b/sca-cpp/trunk/modules/edit/htdocs/login/index.html
index 3f312e4ca4..095ed80521 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/login/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/login/index.html
@@ -17,7 +17,16 @@
under the License.
-->
-<html><body><h1>Sign in</h1>
+<html>
+<head>
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/>
+<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"/>
+</head>
+<body>
+<h1>Sign in</h1>
+<br/>
<script type="text/javascript">
function submitFormSignin() {
diff --git a/sca-cpp/trunk/modules/edit/htdocs/logout/index.html b/sca-cpp/trunk/modules/edit/htdocs/logout/index.html
index 02a92d1b31..81991aa7c1 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/logout/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/logout/index.html
@@ -17,8 +17,16 @@
under the License.
-->
-<html><body>
+<html>
+<head>
+<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0"/>
+<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"/>
+</head>
+<body>
<h1>Sign out</h1>
+<br/>
<form name="signout" action="/login" method="GET">
<script type="text/javascript">
diff --git a/sca-cpp/trunk/modules/edit/htdocs/page/index.html b/sca-cpp/trunk/modules/edit/htdocs/page/index.html
index 839c246122..92f286fdc6 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/page/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/page/index.html
@@ -29,7 +29,9 @@
<body>
<div id="menu"></div>
+<br/>
<h1><span id="title"></span></h1>
+</br>
<div id="page"></div>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/page/page.html b/sca-cpp/trunk/modules/edit/htdocs/page/page.html
index ca2d51af19..0e0441b4c0 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/page/page.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/page/page.html
@@ -30,15 +30,14 @@
</head>
<body>
-<div>
-<span style="position: absolute; left: 0px; top: 0px;"><h2>Palette</h2></span>
-<span style="position: absolute; left: 350px; top: 0px;"><h2>Page</h2></span>
-</div>
+<table style="position: absolute; top: 0px; left: 0px;" width="100%">
+<tr><th style="width: 338px;">Palette</th><th>Page</th></tr>
+</table>
<div id="page" style="position: absolute; top: 60px; left: 0px; width: 5000px; height: 5000px;">
-<span id="palette:h1" style="position: absolute; left: 0px; top: 0px;"><h1 style="margin: 0px;">Header1</h1></span>
-<span id="palette:h2" style="position: absolute; left: 0px; top: 40px;"><h2 style="margin: 0px;">Header2</h2></span>
+<span id="palette:h1" style="position: absolute; left: 0px; top: 0px;"><h1>Header1</h1></span>
+<span id="palette:h2" style="position: absolute; left: 0px; top: 40px;"><h2>Header2</h2></span>
<span id="palette:button" style="position: absolute; left: 0px; top: 80px;"><input type="button" value="button"/></span>
<span id="palette:entry" style="position: absolute; left: 0px; top: 120px;"><input type="text" value="field" size="5"/></span>
<span id="palette:password" style="position: absolute; left: 0px; top: 160px;"><input type="password" value="password" size="5"/></span>
diff --git a/sca-cpp/trunk/modules/edit/log.py b/sca-cpp/trunk/modules/edit/log.py
new file mode 100644
index 0000000000..0b13569c2d
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/log.py
@@ -0,0 +1,24 @@
+# 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.
+
+# User info service component
+from sys import stderr
+
+# Log a message
+def log(msg):
+ print >> stderr, msg
+
diff --git a/sca-cpp/trunk/modules/edit/start b/sca-cpp/trunk/modules/edit/start
index 7750571423..fe5d039a4b 100755
--- a/sca-cpp/trunk/modules/edit/start
+++ b/sca-cpp/trunk/modules/edit/start
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-../http/httpd-conf tmp localhost 8090 htdocs
+../http/httpd-conf tmp 10.1.1.62 8090 htdocs
../server/server-conf tmp
../python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 12:16:27 +0000