From d3bdc051ec4a6499c73d00e80f744aa375a01687 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 13 Jun 2011 07:57:30 +0000 Subject: Minor refactoring and cleanup of edit module and its test composites. Add HTML generation and messaging components and a few more tests. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1135048 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/modules/edit/apps/me360/app.composite | 11 - sca-cpp/trunk/modules/edit/apps/new/app.composite | 12 - .../trunk/modules/edit/apps/new/htdocs/app.html | 6 - .../modules/edit/apps/ourphotos/app.composite | 49 ++- .../modules/edit/apps/shoppingcart/app.composite | 194 +++++++----- .../trunk/modules/edit/apps/slice/app.composite | 336 ++++++++++++++++++++- .../trunk/modules/edit/apps/slice/htdocs/app.html | 24 ++ .../modules/edit/apps/testanimation/app.composite | 187 ++++++++++++ .../modules/edit/apps/testanimation/app.stats | 1 + .../edit/apps/testanimation/htdocs/app.html | 27 ++ .../trunk/modules/edit/apps/testhttp/app.composite | 18 ++ .../trunk/modules/edit/apps/testsms/app.composite | 98 ++++++ sca-cpp/trunk/modules/edit/apps/testsms/app.stats | 1 + .../modules/edit/apps/testsms/htdocs/app.html | 24 ++ .../modules/edit/apps/testwidgets/app.composite | 67 +++- .../modules/edit/apps/testwidgets/htdocs/app.html | 11 +- .../modules/edit/apps/testwidgets2/app.composite | 87 +++--- .../modules/edit/apps/testwidgets2/htdocs/app.html | 12 +- .../modules/edit/apps/testwidgets3/app.composite | 206 +++++++++++++ .../trunk/modules/edit/apps/testwidgets3/app.stats | 1 + .../modules/edit/apps/testwidgets3/htdocs/app.html | 39 +++ .../trunk/modules/edit/apps/twsms/app.composite | 171 +++++++++++ sca-cpp/trunk/modules/edit/apps/twsms/app.stats | 1 + .../trunk/modules/edit/apps/twsms/htdocs/app.html | 33 ++ .../edit/dashboards/jane@localhost/user.apps | 2 +- .../edit/dashboards/jane@sca-store.com/user.apps | 2 +- .../edit/dashboards/john@localhost/user.apps | 2 +- .../edit/dashboards/john@sca-store.com/user.apps | 2 +- .../trunk/modules/edit/htdocs/account/index.html | 45 ++- sca-cpp/trunk/modules/edit/htdocs/app/index.html | 279 +++++++++++------ sca-cpp/trunk/modules/edit/htdocs/graph/index.html | 1 + sca-cpp/trunk/modules/edit/htdocs/page/page.js | 5 +- sca-cpp/trunk/modules/edit/htdocs/store/index.html | 3 +- .../edit/palettes/animation/palette.composite | 45 +++ .../edit/palettes/control/palette.composite | 21 +- .../modules/edit/palettes/math/palette.composite | 5 + .../modules/edit/palettes/talk/palette.composite | 13 +- .../modules/edit/palettes/text/palette.composite | 2 +- sca-cpp/trunk/modules/edit/store/all/store.apps | 2 +- .../trunk/modules/edit/store/featured/store.apps | 2 +- sca-cpp/trunk/modules/edit/store/new/store.apps | 2 +- sca-cpp/trunk/modules/edit/store/top/store.apps | 2 +- 42 files changed, 1741 insertions(+), 310 deletions(-) create mode 100644 sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/testanimation/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testanimation/app.stats create mode 100644 sca-cpp/trunk/modules/edit/apps/testanimation/htdocs/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/testsms/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testsms/app.stats create mode 100644 sca-cpp/trunk/modules/edit/apps/testsms/htdocs/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats create mode 100644 sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html create mode 100644 sca-cpp/trunk/modules/edit/apps/twsms/app.composite create mode 100644 sca-cpp/trunk/modules/edit/apps/twsms/app.stats create mode 100644 sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html create mode 100644 sca-cpp/trunk/modules/edit/palettes/animation/palette.composite (limited to 'sca-cpp/trunk') diff --git a/sca-cpp/trunk/modules/edit/apps/me360/app.composite b/sca-cpp/trunk/modules/edit/apps/me360/app.composite index f7991a117d..8fe4825f8a 100644 --- a/sca-cpp/trunk/modules/edit/apps/me360/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/me360/app.composite @@ -53,12 +53,6 @@ buzzprofile - - - - - - @@ -84,11 +78,6 @@ jsdelfino - - - - https://www.googleapis.com/buzz/v1/people/{0}/@self?alt=json - diff --git a/sca-cpp/trunk/modules/edit/apps/new/app.composite b/sca-cpp/trunk/modules/edit/apps/new/app.composite index 253168ff21..7cfa7629ac 100644 --- a/sca-cpp/trunk/modules/edit/apps/new/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/new/app.composite @@ -31,24 +31,12 @@ me - - - - - time - - - - - - - diff --git a/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html index de39e20956..eeb7becae5 100644 --- a/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/new/htdocs/app.html @@ -24,10 +24,4 @@

=me

 - - The time is: - - - =time - diff --git a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite index 13ed9a2248..e0c5e5ceca 100644 --- a/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/ourphotos/app.composite @@ -37,19 +37,42 @@ - + - - - - - + + + + + + + + + + + + + + + images + + + + + + width + + + + + + + @@ -75,12 +98,6 @@ - - - - - images - @@ -93,22 +110,22 @@ - + - + - + - <img src="{0}" width="320"/> + 320px diff --git a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite index 565bffa371..0d626d09a6 100644 --- a/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/shoppingcart/app.composite @@ -28,17 +28,17 @@ - + - + - + @@ -145,13 +145,13 @@ - + - + @@ -161,7 +161,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -239,6 +239,11 @@ + + + + + @@ -246,6 +251,72 @@ + + + + + catalog + + + + + + Kiwi + + + + + + delresult + + + + + + sendresult + + + + + + total + + + + + + message + + + + + + message + + + + + + cart + + + + + + putresult + + + + + + Mango + + + + + + Passion + @@ -290,7 +361,7 @@ - + @@ -417,83 +488,23 @@ 0 - + - + + + + + + + fruit - - - - - catalog - - - - - - Kiwi - - - - - - delresult - - - - - - sendresult - - - - - - total - - - - - - message - - - - - - message - - - - - - cart - - - - - - putresult - - - - - - Mango - - - - - - Passion - @@ -507,6 +518,11 @@ + + + + + @@ -515,6 +531,12 @@ + + + + + + @@ -532,6 +554,11 @@ xmppsca.1@gmail.com + + + + - + @@ -547,10 +574,10 @@ Your order has been processed. Your total: ${1} - + - <span id="fruit" class="checkbox"><input type="checkbox" value="{0}"/>${1} - {0}</span> + ${1} - {0} @@ -562,7 +589,12 @@ xmpp4sca - + + + + fruit + + @@ -582,7 +614,7 @@ - + fruit diff --git a/sca-cpp/trunk/modules/edit/apps/slice/app.composite b/sca-cpp/trunk/modules/edit/apps/slice/app.composite index 847d9c4892..af61c11d26 100644 --- a/sca-cpp/trunk/modules/edit/apps/slice/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/slice/app.composite @@ -18,23 +18,345 @@ * under the License. --> + + - - - - 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + / + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - slice + + sprite + + + + + + left + + + + + + top + + + + + + src + + + + + + sprite + + + + + + position + + + + + + -webkit-transform + + + + + + onclick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + * + + + + + + + + * + + + + + + + + * + + + + + + + + * + + + + + + + + t + + + + + xpos - + + + + ypos + + + + + angle + + + + + 0 + + + + + 101 + + + + + 25 + + + + + 200 + + + + + 0 + + + + + 30 + + + + + 200 + + + + + 4 + + + + + 20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + rotate({0:g}deg) + + + + + alert('Got it!') + + + + + http://www.apache.org/images/feather-small.gif + + + + + absolute + + + + + + + + + t + + + + + t + + + + + t + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html new file mode 100644 index 0000000000..5bd091cd20 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/slice/htdocs/app.html @@ -0,0 +1,24 @@ + + +
+ + + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite b/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite new file mode 100644 index 0000000000..37ff200ff3 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testanimation/app.composite @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + testdynimg + + + + + + testdynimg + + + + + + -webkit-transform + + + + + + width + + + + + + + + + + + + + + + + + + + + + + + + * + + + + + + + + * + + + + + + + + t + + + + + 0 + + + + + 121 + + + + + 3 + + + + + 20 + + + + + 6 + + + + + 5 + + + + + + + + + + + + + + + + + + + + + + + http://tuscany.apache.org/images/TuscanyLogo.jpg + + + + + rotate({0:g}deg) + + + + + t + + + + + t + + diff --git a/sca-cpp/trunk/modules/edit/apps/testanimation/app.stats b/sca-cpp/trunk/modules/edit/apps/testanimation/app.stats new file mode 100644 index 0000000000..493ef39d1a --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testanimation/app.stats @@ -0,0 +1 @@ +((entry (title "Test animation components") (id "testanimation"))) \ No newline at end of file diff --git a/sca-cpp/trunk/modules/edit/apps/testanimation/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testanimation/htdocs/app.html new file mode 100644 index 0000000000..c9f9420eb0 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testanimation/htdocs/app.html @@ -0,0 +1,27 @@ + + +
+ +

Test animation component

+ + + + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite index 93016ae915..0e4a96466b 100644 --- a/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testhttp/app.composite @@ -1,4 +1,22 @@ + diff --git a/sca-cpp/trunk/modules/edit/apps/testsms/app.composite b/sca-cpp/trunk/modules/edit/apps/testsms/app.composite new file mode 100644 index 0000000000..a5d82a2891 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testsms/app.composite @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + twiliosid + + + + + twiliotoken + + + + + tophone + + + + + fromphone + + + + + Hello Again! + + + + + From={0}&To={1}&Body={2} + + + + + Hello there + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/apps/testsms/app.stats b/sca-cpp/trunk/modules/edit/apps/testsms/app.stats new file mode 100644 index 0000000000..be1fc6d254 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testsms/app.stats @@ -0,0 +1 @@ +((entry (title "Test HTTP components") (id "testhttp"))) \ No newline at end of file diff --git a/sca-cpp/trunk/modules/edit/apps/testsms/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testsms/htdocs/app.html new file mode 100644 index 0000000000..dd8f5f9f26 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testsms/htdocs/app.html @@ -0,0 +1,24 @@ + + +
+ +

Test SMS API

+ +
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite index 690f1761e3..32db9dd428 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/app.composite @@ -19,19 +19,10 @@ --> - - - - - - - - - - - - - + + + + @@ -39,12 +30,30 @@ testpath2 + + + + + testattrs + testh1 + + + + + onclick + + + + + + value + @@ -93,6 +102,28 @@ testsection + + + + + + + + + + + + + + + + + + + + + + @@ -105,6 +136,16 @@ test header 1 + + + + test html attrs + + + + + alert('hey') + diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html index 0b5022513d..d1422c10ac 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets/htdocs/app.html @@ -37,20 +37,13 @@ =testcheckbox - - - =testlink2 - - =testlink - - - =testlink3 - + + =testattrs =testtext diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite index 84d87bf184..45a4bdb153 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/app.composite @@ -19,46 +19,18 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - 2 - - + testframe + + + + + testselect + @@ -95,6 +67,41 @@ b + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + 2 + @@ -107,6 +114,11 @@ test value + + + + test select + @@ -127,4 +139,9 @@ http://www.cnn.com + + + + dynamic checkbox + diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html index a42c96bdff..7efb62d247 100644 --- a/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets2/htdocs/app.html @@ -21,8 +21,8 @@

Test widget components

 - - + +
@@ -35,8 +35,8 @@
=testlist1
- - + +
@@ -49,8 +49,8 @@
=testlist2
- - + +
diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite new file mode 100644 index 0000000000..eb5bbc2439 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.composite @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + testdynimg + + + + + + testdyncheckbox + + + + + + teststyledimg + + + + + + onclick + + + + + + width + + + + + + height + + + + + + id + + + + + + src + + + + + + testdynlink + + + + + + testdynbutton + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://tuscany.apache.org/images/TuscanyLogo.jpg + + + + + testimg + + + + + http://tuscany.apache.org/images/TuscanyLogo.jpg + + + + + alert('hey') + + + + + 320px + + + + + 60px + + + + + http://www.apache.org/ + + + + + Apache + + + + + dynamic button + + + + + dynamic checkbox + + diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats new file mode 100644 index 0000000000..2e772401c9 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets3/app.stats @@ -0,0 +1 @@ +((entry (title "Test HTML generator components") (id "testwidgets3"))) \ No newline at end of file diff --git a/sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html new file mode 100644 index 0000000000..393d63c2d1 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/testwidgets3/htdocs/app.html @@ -0,0 +1,39 @@ + + +
+ +

Test widget components

+ + + =testdynimg + + + =testdynlink + + + =testdynbutton + + + =testdyncheckbox + + + =teststyledimg + +
diff --git a/sca-cpp/trunk/modules/edit/apps/twsms/app.composite b/sca-cpp/trunk/modules/edit/apps/twsms/app.composite new file mode 100644 index 0000000000..45914449e7 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/twsms/app.composite @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sampleurl1 + + + + + + sampleurl2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sid + + + + + + sid + + + + + + token + + + + + + from + + + + + + to + + + + + + msg + + + + + + + + + + + + + + + + + https://{0}:{1}@api.twilio.com/2010-04-01/Accounts/{2}/SMS/Messages + + + + + SMS/Messages + + + + + From={0}&To={1}&Body={2} + + + + + application/x-www-form-urlencoded + + + + + http://{0}/c/send?sid=...& + + + + + token=...&from=...&to=...&msg=... + + diff --git a/sca-cpp/trunk/modules/edit/apps/twsms/app.stats b/sca-cpp/trunk/modules/edit/apps/twsms/app.stats new file mode 100644 index 0000000000..85c97c2457 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/twsms/app.stats @@ -0,0 +1 @@ +((entry (title "SMS send service") (id "twsms"))) \ No newline at end of file diff --git a/sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html new file mode 100644 index 0000000000..d2eaebcdd0 --- /dev/null +++ b/sca-cpp/trunk/modules/edit/apps/twsms/htdocs/app.html @@ -0,0 +1,33 @@ + + +
+ +

SMS Send Service

+ + + To send an SMS use a URL like this: + + + http://twsms..../?sid=...&token=...&from=... + + + &to=...&msg=... + +
diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps b/sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps index 402b4260e4..710de5f62e 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps +++ b/sca-cpp/trunk/modules/edit/dashboards/jane@localhost/user.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb"))) +((entry (title "An empty test app") (id "test"))) diff --git a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps b/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps index 402b4260e4..710de5f62e 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps +++ b/sca-cpp/trunk/modules/edit/dashboards/jane@sca-store.com/user.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb"))) +((entry (title "An empty test app") (id "test"))) diff --git a/sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps b/sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps index 402b4260e4..710de5f62e 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps +++ b/sca-cpp/trunk/modules/edit/dashboards/john@localhost/user.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb"))) +((entry (title "An empty test app") (id "test"))) diff --git a/sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps b/sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps index 402b4260e4..710de5f62e 100644 --- a/sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps +++ b/sca-cpp/trunk/modules/edit/dashboards/john@sca-store.com/user.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb"))) +((entry (title "An empty test app") (id "test"))) diff --git a/sca-cpp/trunk/modules/edit/htdocs/account/index.html b/sca-cpp/trunk/modules/edit/htdocs/account/index.html index 3a3ddad383..8f23b8c59c 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/account/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/account/index.html @@ -58,6 +58,21 @@
=b

+ + + + +
Calendar
+ + + + + + + +
+
+ @@ -70,6 +85,11 @@ + + + + +
Key chain
@@ -115,6 +135,15 @@ function getaccount(name) { var desc = assoc("'description", acct); $('userDescription').innerHTML = isNil(desc) || isNil(cdr(desc))? '' : cadr(desc); + var cal = assoc("'calendar", acct); + reduce(function(i, evt) { + var sched = assoc("'@schedule", evt); + var svc = assoc("'@service", evt); + $('sched' + i).value = isNil(sched)? '' : cadr(sched); + $('service' + i).value = isNil(svc)? '' : cadr(svc); + return i + 1; + }, 1, isNil(cal)? mklist() : cadr(cadr(cal))); + var keys = assoc("'keys", acct); reduce(function(i, key) { var kn = assoc("'@name", key); @@ -146,14 +175,19 @@ function save(entryxml) { function onaccountchange() { var title = $('userTitle').value; var desc = $('userDescription').value; + var cal = map(function(i) { + var sched = $('sched' + i).value; + var svc = $('service' + i).value; + return mklist("'event", mklist("'@schedule", sched), mklist("'@service", svc)); + }, range(1, 6)); var keys = map(function(i) { var kn = $('name' + i).value; var kv = $('value' + i).value; return mklist("'key", mklist("'@name", kn), mklist("'@value", kv)); - }, range(1, 6)); + }, range(1, 11)); var accountentry = mklist("'entry", mklist("'title", title != ''? title : username), mklist("'id", username), - mklist("'content", mklist("'account", mklist("'description", desc), cons("'keys", keys)))); + mklist("'content", mklist("'account", mklist("'description", desc), cons("'keys", keys), cons("'calendar", cal)))); var entryxml = car(atom.writeATOMEntry(valuesToElements(mklist(accountentry)))); if (savedaccountentryxml == entryxml) return false; @@ -164,11 +198,16 @@ function onaccountchange() { $('userTitle').onchange = onaccountchange; $('userDescription').onchange = onaccountchange; +map(function(i) { + $('sched' + i).onchange = onaccountchange; + $('service' + i).onchange = onaccountchange; + return true; +}, range(1, 6)); map(function(i) { $('name' + i).onchange = onaccountchange; $('value' + i).onchange = onaccountchange; return true; -}, range(1, 6)); +}, range(1, 11)); /** * Handle a form submit event. diff --git a/sca-cpp/trunk/modules/edit/htdocs/app/index.html b/sca-cpp/trunk/modules/edit/htdocs/app/index.html index 99a523362f..570d1e00f1 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/app/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/app/index.html @@ -50,17 +50,19 @@ document.title = window.location.hostname.split('.')[0]; var appdiv = $('app'); /** - * Start, stop, timer and location components. + * Start, stop, timer, animation and location components. */ var startcomp = sca.httpclient('start', '/start'); var stopcomp = sca.httpclient('stop', '/stop'); var timercomp = sca.httpclient('timer', '/timer'); +var animationcomp = sca.httpclient('animation', '/animation'); var locationcomp = sca.httpclient('location', '/location'); /** - * Find a named value in a tree of elements. + * Find a named value in a tree of elements. The value name is given + * as a list of ids. */ -function datavalue(l, id) { +function namedvalue(l, id) { if (isNil(l)) return null; var e = car(l); @@ -74,7 +76,7 @@ function datavalue(l, id) { // Search for next id segments in child elements if (!elementHasValue(e)) { - var v = datavalue(elementChildren(e), cdr(id)); + var v = namedvalue(elementChildren(e), cdr(id)); if (v != null) return v; } @@ -82,11 +84,11 @@ function datavalue(l, id) { // Search for id through the whole element tree if (!elementHasValue(e)) { - var v = datavalue(elementChildren(e), id); + var v = namedvalue(elementChildren(e), id); if (v != null) return v; } - return datavalue(cdr(l), id); + return namedvalue(cdr(l), id); } /** @@ -111,84 +113,101 @@ function inputvalue(e) { }; /** - * Set a data value into a widget. + * Set a value into a widget. */ function setwidgetvalue(e, dv) { - - function datatext(dv) { - if (!elementHasValue(dv)) - return ''; - var t = elementValue(dv); - return t == null? '' : t; - } + var htattrs = namedElementChild("'htattrs", dv); + var attrs = append(isNil(htattrs)? mklist() : + map(function(ce) { return mklist(elementName(ce).substring(1), elementHasValue(ce)? elementValue(ce) : elementChildren(ce)); }, elementChildren(htattrs)), + elementHasValue(dv)? mklist(mklist('value', isNil(elementValue(dv))? '' : elementValue(dv))) : mklist()); if (e.className == 'h1' || e.className == 'h2' || e.className == 'text' || e.className == 'section') { - var t = datatext(dv); - car(childElements(e)).innerHTML = t; - return t; + var ce = car(childElements(e)); + return map(function(a) { car(a) == 'value'? ce.innerHTML = cadr(a) : ce.setAttribute(car(a), cadr(a)); }, attrs); } + if (e.className == 'entry' || e.className == 'password') { - var t = datatext(dv); - car(childElements(e)).defaultValue = t; - return t; + var ce = car(childElements(e)); + return map(function(a) { car(a) == 'value'? ce.defaultValue = cadr(a) : ce.setAttribute(car(a), cadr(a)); }, attrs); } + if (e.className == 'button') { - var t = datatext(dv); - car(childElements(e)).value = t; - return t; + var ce = car(childElements(e)); + return map(function(a) { car(a) == 'value'? ce.value = cadr(a) : ce.setAttribute(car(a), cadr(a)); }, attrs); } + if (e.className == 'checkbox') { - var t = datatext(dv); - car(childElements(e)).value = t; - map(function(n) { if (n.nodeName == "SPAN") n.innerHTML = t; return n; }, nodeList(e.childNodes)); - return t; + var ce = car(childElements(e)); + + function setcheckvalue(ce, v) { + ce.value = v; + map(function(n) { if (n.nodeName == "SPAN") n.innerHTML = v; return n; }, nodeList(e.childNodes)); + return true; + } + + var r = map(function(a) { car(a) == 'value'? setcheckvalue(ce, cadr(a)) : ce.setAttribute(car(a), cadr(a)); }, attrs); + return r; } + if (e.className == 'select') { - var t = datatext(dv); var ce = car(childElements(car(childElements(e)))); - ce.value = t; - ce.innerHTML = t; - return t; + + function setselectvalue(ce, v) { + ce.value = v; + ce.innerHTML = v; + return true; + } + + var r = map(function(a) { car(a) == 'value'? setselectvalue(ce, cadr(a)) : ce.setAttribute(car(a), cadr(a)); }, attrs); + return r; } if (e.className == 'list') { - var t = ui.datalist(isNil(dv)? mklist() : mklist(dv)); - e.innerHTML = t; - return t; + var dl = ui.datalist(isNil(dv)? mklist() : mklist(dv)); + e.innerHTML = dl; + return dl; } if (e.className == 'table') { - var t = ui.datatable(isNil(dv)? mklist() : mklist(dv)); - e.innerHTML = t; - return t; + var dl = ui.datatable(isNil(dv)? mklist() : mklist(dv)); + e.innerHTML = dl; + return dl; } if (e.className == 'link') { - var t = datatext(dv); var ce = car(childElements(e)); - ce.href = isList(t)? car(t) : t; - car(childElements(ce)).innerHTML = isList(t)? cadr(t) : t; - return t; + + function setlinkvalue(ce, v) { + if (isList(v)) { + ce.href = car(v); + ce.innerHTML = cadr(v); + return true; + } + ce.href = v; + ce.innerHTML = v; + return true; + } + + return map(function(a) { car(a) == 'value'? setlinkvalue(ce, cadr(a)) : ce.setAttribute(car(a), cadr(a)); }, attrs); } if (e.className == 'img') { - var t = datatext(dv); - var img = car(childElements(e)); - img.setAttribute('src', t); - return t; + var ce = car(childElements(e)); + return map(function(a) { car(a) == 'value'? ce.setAttribute('src', cadr(a)) : ce.setAttribute(car(a), cadr(a)); }, attrs); } if (e.className == 'iframe') { - var t = datatext(dv); - car(childElements(e)).src = t; - return t; + var ce = car(childElements(e)); + return map(function(a) { car(a) == 'value'? ce.setAttribute('src', cadr(a)) : ce.setAttribute(car(a), cadr(a)); }, attrs); } return ''; }; /** - * Display data on the app page. + * Update the app page with the given app data. */ -function displaydata(l) { +function updatepage(l) { + if (isNil(l)) + return true; // Update the widgets values function updatewidget(e) { - var dv = datavalue(l, map(function(t) { return "'" + t; }, e.id.split('.'))); + var dv = namedvalue(l, map(function(t) { return "'" + t; }, e.id.split('.'))); if (dv == null || isNil(dv)) return e; setwidgetvalue(e, dv); @@ -200,22 +219,22 @@ function displaydata(l) { } /** - * Display data from a document on the app page. + * Convert a document to application data. */ -function displaydoc(doc) { +function docdata(doc) { if (isNil(doc)) - return true; + return null; if (json.isJSON(mklist(doc))) - return displaydata(json.readJSON(mklist(doc))); + return json.readJSON(mklist(doc)); if (atom.isATOMEntry(mklist(doc))) - return displaydata(atom.readATOMEntry(mklist(doc))); + return atom.readATOMEntry(mklist(doc)); if (atom.isATOMFeed(mklist(doc))) - return displaydata(atom.readATOMFeed(mklist(doc))); + return atom.readATOMFeed(mklist(doc)); - return displaydata(doc); + return doc; } /** @@ -277,6 +296,18 @@ function initwidget(e) { return e; } +/** + * Get document from a component. + */ +function getdoc(comp, name, uri) { + try { + return comp.get(uri); + } catch(e) { + log('exception on get(' + name + ', ' + uri + ')', e); + return null; + } +} + /** * Get app data from the main app page component. */ @@ -285,8 +316,7 @@ function getpagedata() { // Display component data on the page function displaypage(doc) { - if (!isNil(doc)) - displaydoc(doc); + updatepage(docdata(doc)); // Reveal the page ui.showbody(); @@ -312,42 +342,35 @@ function getpagedata() { } // Get the component app data - var doc = startcomp.get(window.location.search); - try { - var appFrame = $('appFrame'); - if (!isNil(appFrame.contentDocument.body)) { - appdiv.innerHTML = appFrame.contentDocument.body.innerHTML; - } else { - $('appebuffer').appendChild(appFrame.contentDocument.documentElement); - appdiv.innerHTML = appebuffer.innerHTML; - appebuffer.innerHTML = ''; - } + var doc = getdoc(startcomp, 'start', window.location.search); + + // Prepare app HTML page + var appFrame = $('appFrame'); + if (!isNil(appFrame.contentDocument.body)) { + appdiv.innerHTML = appFrame.contentDocument.body.innerHTML; + } else { + $('appebuffer').appendChild(appFrame.contentDocument.documentElement); + appdiv.innerHTML = appebuffer.innerHTML; + appebuffer.innerHTML = ''; + } - // Initial setup of the widgets - map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID(appdiv, 'page').childNodes))); + // Setup the widgets + map(setupwidget, filter(function(e) { return !isNil(e.id); }, nodeList(ui.elementByID(appdiv, 'page').childNodes))); - // Display data on the page - displaypage(doc); + // Display data on the page + displaypage(doc); - // Get and eval the optional timer and location watch setup scripts - evalcompinit(timercomp.get('setup')); - evalcompinit(locationcomp.get('setup')); - return true; + // Get and eval the optional timer, animation and location watch setup scripts + evalcompinit(getdoc(timercomp, 'timer', 'setup')); + evalcompinit(getdoc(animationcomp, 'animation', 'setup')); + evalcompinit(getdoc(locationcomp, 'location', 'setup')); + + return true; - } catch(e) { - log('exception on startcomp.get()', e); - } } catch(e) { log('exception in getpagedata()', e); + return true; } - return true; -} - -/** - * Get app data from a component. - */ -function getcompdata(comp, qs) { - return displaydoc(comp.get(qs)); } /** @@ -380,9 +403,10 @@ function compquery() { */ function buttonClickHandler(id) { try { - return getcompdata(sca.component(id), compquery()); + return updatepage(docdata(getdoc(sca.component(id), 'button', compquery()))); } catch(e) { log('exception in buttonClickHandler()', e); + return true; } } @@ -391,9 +415,10 @@ function buttonClickHandler(id) { */ function intervalHandler() { try { - return getcompdata(timercomp, compquery()); + return updatepage(docdata(getdoc(timercomp, 'timer', compquery()))); } catch(e) { log('exception in intervalHandler()', e); + return true; } } @@ -406,6 +431,76 @@ function setupIntervalHandler(msec) { return setInterval(intervalHandler, msec); } catch(e) { log('exception in setupIntervalHandler()', e); + return true; + } +} + +/** + * Handle an animation event. + */ +var animationData = null; +var currentAnimationData = null; +var animationLoop = 0; +var currentAnimationLoop = 0; + +function animationHandler() { + try { + // Get animation data if necessary + if (isNil(animationData)) { + animationData = docdata(getdoc(animationcomp, 'animation', compquery())); + if (isNil(animationData)) { + // Retry later + return true; + } + currentAnimationData = animationData; + currentAnimationLoop = animationLoop; + } + + // Update page with animation data + updatepage(car(currentAnimationData)); + + // End of animation? + if (isNil(cdr(currentAnimationData))) { + if (currentAnimationLoop == -1) { + // Repeat current animation forever + currentAnimationData = animationData; + return true; + } + + currentAnimationLoop = currentAnimationLoop - 1; + if (currentAnimationLoop <= 0) { + // Get next animation data + currentAnimationData = null; + animationData = null; + return true; + } + + // Repeat animation + currentAnimationData = animationData; + return true; + } + + // Move to the next animation frame + currentAnimationData = cdr(currentAnimationData); + return true; + + } catch(e) { + log('exception in animationHandler()', e); + return true; + } +} + +/** + * Setup an animation. + */ +function setupAnimationHandler(msec, loop) { + animationLoop = loop; + animationHandler(); + try { + return setInterval(animationHandler, msec); + } catch(e) { + log('exception in setupAnimationHandler()', e); + return true; } } @@ -418,7 +513,7 @@ var geoposition = null; function locationHandler(pos) { try { geoposition = pos; - return getcompdata(locationcomp, compquery()); + return updatepage(docdata(getdoc(locationcomp, 'location', compquery()))); } catch(e) { locationErrorHandler(e); } diff --git a/sca-cpp/trunk/modules/edit/htdocs/graph/index.html b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html index 626edf1c52..b8370ec75a 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/graph/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html @@ -384,6 +384,7 @@ installpalette('lists', pos.rmove(0, 35), g, bg, spalette, gpalettes); installpalette('transform', pos.rmove(0, 35), g, bg, spalette, gpalettes); installpalette('text', pos.rmove(0, 35), g, bg, spalette, gpalettes); installpalette('http', pos.rmove(0, 35), g, bg, spalette, gpalettes); +installpalette('animation', pos.rmove(0, 35), g, bg, spalette, gpalettes); installpalette('talk', pos.rmove(0, 35), g, bg, spalette, gpalettes); installpalette('social', pos.rmove(0, 35), g, bg, spalette, gpalettes); installpalette('search', pos.rmove(0, 35), g, bg, spalette, gpalettes); diff --git a/sca-cpp/trunk/modules/edit/htdocs/page/page.js b/sca-cpp/trunk/modules/edit/htdocs/page/page.js index 707788cc64..d316cb72dd 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/page/page.js +++ b/sca-cpp/trunk/modules/edit/htdocs/page/page.js @@ -428,9 +428,8 @@ page.widgetselect = function(n, s, wvalue, wdelete) { // Clear the widget outline if (!isNil(n)) n.cover.style.borderWidth = '0px'; - } - if (isNil(n)) return true; + } // Update the widget value field wvalue.value = page.text(n); @@ -438,7 +437,7 @@ page.widgetselect = function(n, s, wvalue, wdelete) { wdelete.disabled = false; // Outline the widget - n.cover.style.borderWidth = s? '2px' : '0px'; + n.cover.style.borderWidth = '2px'; return true; }; diff --git a/sca-cpp/trunk/modules/edit/htdocs/store/index.html b/sca-cpp/trunk/modules/edit/htdocs/store/index.html index 1d96781801..601a5905b9 100644 --- a/sca-cpp/trunk/modules/edit/htdocs/store/index.html +++ b/sca-cpp/trunk/modules/edit/htdocs/store/index.html @@ -139,7 +139,8 @@ function getapps(category) { function display(doc) { var apps = '
'; var feed = car(elementsToValues(atom.readATOMFeed(mklist(doc)))); - var entries = cadr(assoc("'entry", cdr(feed))); + var aentries = assoc("'entry", cdr(feed)); + var entries = isNil(aentries)? mklist() : isList(car(cadr(aentries)))? cadr(aentries) : mklist(cdr(aentries)); for (var i = 0; i < length(entries); i++) { var entry = entries[i]; var title = cadr(assoc("'title", entry)) diff --git a/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite b/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite new file mode 100644 index 0000000000..6785c0477f --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/animation/palette.composite @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite index d22b9482ee..b2c933eec4 100644 --- a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite @@ -1,11 +1,22 @@ + + + + + + + + + + + @@ -19,7 +30,15 @@ - + + + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite index f8d7ced4b8..3e86647d1d 100644 --- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite @@ -7,6 +7,7 @@ + @@ -57,6 +58,10 @@ + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite index af293b97f5..db125c9793 100644 --- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite @@ -2,7 +2,7 @@ - + @@ -19,12 +19,15 @@ - - - - + + + + + + + diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite index 4b643000ef..925766a32f 100644 --- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite @@ -50,7 +50,7 @@ - + diff --git a/sca-cpp/trunk/modules/edit/store/all/store.apps b/sca-cpp/trunk/modules/edit/store/all/store.apps index 402b4260e4..bdb1552e46 100644 --- a/sca-cpp/trunk/modules/edit/store/all/store.apps +++ b/sca-cpp/trunk/modules/edit/store/all/store.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test SMS API") (id "testsms")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb")) (entry (title "Test HTML generator components") (id "testwidgets3")) (entry (title "Test animation components") (id "testanimation"))) diff --git a/sca-cpp/trunk/modules/edit/store/featured/store.apps b/sca-cpp/trunk/modules/edit/store/featured/store.apps index 7fd59364cf..956dffb9eb 100644 --- a/sca-cpp/trunk/modules/edit/store/featured/store.apps +++ b/sca-cpp/trunk/modules/edit/store/featured/store.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms"))) diff --git a/sca-cpp/trunk/modules/edit/store/new/store.apps b/sca-cpp/trunk/modules/edit/store/new/store.apps index 402b4260e4..956dffb9eb 100644 --- a/sca-cpp/trunk/modules/edit/store/new/store.apps +++ b/sca-cpp/trunk/modules/edit/store/new/store.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "An empty test app") (id "test")) (entry (title "Test values and lists") (id "testvalues")) (entry (title "Test social components") (id "testsocial")) (entry (title "Test URL components") (id "testurl")) (entry (title "Test logic components") (id "testlogic")) (entry (title "Test text processing components") (id "testtext")) (entry (title "Test HTTP components") (id "testhttp")) (entry (title "Test widgets") (id "testwidgets")) (entry (title "Test more widgets") (id "testwidgets2")) (entry (title "Test event components") (id "testevents")) (entry (title "Test search components") (id "testsearch")) (entry (title "Test database components") (id "testdb"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms"))) diff --git a/sca-cpp/trunk/modules/edit/store/top/store.apps b/sca-cpp/trunk/modules/edit/store/top/store.apps index 7fd59364cf..956dffb9eb 100644 --- a/sca-cpp/trunk/modules/edit/store/top/store.apps +++ b/sca-cpp/trunk/modules/edit/store/top/store.apps @@ -1 +1 @@ -((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "My online store") (id "shoppingcart")) (entry (title "Slice") (id "slice"))) +((entry (title "Check my public social data") (id "me360")) (entry (title "Where are my friends") (id "nearme")) (entry (title "Our photos of an event") (id "ourphotos")) (entry (title "Slice") (id "slice")) (entry (title "My online store") (id "shoppingcart")) (entry (title "SMS send service") (id "twsms"))) -- cgit v1.2.3