r9685 - in helma-ng/trunk/apps/demo: . skins

Author: hannes
Date: 2009-04-28 11:01:17 +0200 (Tue, 28 Apr 2009)
New Revision: 9685

Added:
   helma-ng/trunk/apps/demo/macros.js
   helma-ng/trunk/apps/demo/skins/skins.txt
   helma-ng/trunk/apps/demo/skins/welcome.txt
Removed:
   helma-ng/trunk/apps/demo/skins/index.html
   helma-ng/trunk/apps/demo/skins/skins.html
Modified:
   helma-ng/trunk/apps/demo/actions.js
   helma-ng/trunk/apps/demo/config.js
   helma-ng/trunk/apps/demo/skins/base.html
   helma-ng/trunk/apps/demo/webmodule.js
Log:
Start transition to markup based pages.

Details at http://dev.helma.org/trac/helma/changeset/9685

Modified: helma-ng/trunk/apps/demo/actions.js
===================================================================
--- helma-ng/trunk/apps/demo/actions.js	2009-04-28 09:01:12 UTC (rev 9684)
+++ helma-ng/trunk/apps/demo/actions.js	2009-04-28 09:01:17 UTC (rev 9685)
@@ -8,10 +8,9 @@
 
 // the main action is invoked for http://localhost:8080/
 function index(req) {
-    return new SkinnedResponse('skins/index.html', { title: 'Welcome to Helma NG' });
+    return new SkinnedResponse('skins/welcome.txt', {title: 'Welcome to Helma NG'});
 }
 
-
 // additional path elements are passed to the action as arguments,
 // e.g. /extra.path/2008/09
 function extra_path(req, year, month) {
@@ -20,7 +19,7 @@
 
 // demo for skins, macros, filters
 function skins(req) {
-    return new SkinnedResponse('skins/skins.html', {
+    return new SkinnedResponse('skins/skins.txt', {
         title: 'Skins',
         name: 'Luisa',
         names: ['Benni', 'Emma', 'Luca', 'Selma']

Modified: helma-ng/trunk/apps/demo/config.js
===================================================================
--- helma-ng/trunk/apps/demo/config.js	2009-04-28 09:01:12 UTC (rev 9684)
+++ helma-ng/trunk/apps/demo/config.js	2009-04-28 09:01:17 UTC (rev 9685)
@@ -13,5 +13,10 @@
     'helma/logging',
 ];
 
+exports.macros = [
+    'macros',
+    'helma/filters'
+];
+
 exports.charset = 'UTF-8';
 exports.contentType = 'text/html';

Added: helma-ng/trunk/apps/demo/macros.js

Modified: helma-ng/trunk/apps/demo/skins/base.html
===================================================================
--- helma-ng/trunk/apps/demo/skins/base.html	2009-04-28 09:01:12 UTC (rev 9684)
+++ helma-ng/trunk/apps/demo/skins/base.html	2009-04-28 09:01:17 UTC (rev 9685)
@@ -22,11 +22,11 @@
         <ul>
             <li><a href="/">home</a></li>
             <li><a href="/skins">skins</a></li>
+            <li><a href="/storage/">storage</a></li>
             <li><a href="/mount/point/">modules</a></li>
             <li><a href="/continuation">continuations</a></li>
             <li><a href="/logging">logging</a></li>
             <li><a href="/profiler">profiler</a></li>
-            <!-- <li><a href="/storage">storage</a></li> -->
         </ul>
     </div>
     <div id="footer"><% footer %></div>

Deleted: helma-ng/trunk/apps/demo/skins/index.html

Deleted: helma-ng/trunk/apps/demo/skins/skins.html

Added: helma-ng/trunk/apps/demo/skins/skins.txt

Added: helma-ng/trunk/apps/demo/skins/welcome.txt


Property changes on: helma-ng/trunk/apps/demo/skins/welcome.txt
___________________________________________________________________
Name: svn:executable
   + *

Modified: helma-ng/trunk/apps/demo/webmodule.js
===================================================================
--- helma-ng/trunk/apps/demo/webmodule.js	2009-04-28 09:01:12 UTC (rev 9684)
+++ helma-ng/trunk/apps/demo/webmodule.js	2009-04-28 09:01:17 UTC (rev 9685)
@@ -6,7 +6,7 @@
 function index(req, res) {
     var context = {
         title: 'Modules',
-        href: req.path
+        href: req.pathDecoded
     };
     return new SkinnedResponse('skins/modules.html', context);
 }