From 866f7fe7ebf27a90902d83dc80fc5f768381ff81 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 9 Apr 2010 22:06:50 +0200 Subject: Added example usage of template.use/define/inherit --- .../plugins/testplugin/controllers/testplugin.js | 15 +++++++------- etherpad/src/plugins/testplugin/templates/page.ejs | 23 ++++++++++++++++++++++ .../plugins/testplugin/templates/testplugin.ejs | 10 +++++++--- 3 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 etherpad/src/plugins/testplugin/templates/page.ejs (limited to 'etherpad') diff --git a/etherpad/src/plugins/testplugin/controllers/testplugin.js b/etherpad/src/plugins/testplugin/controllers/testplugin.js index 0c79e06..da74ade 100644 --- a/etherpad/src/plugins/testplugin/controllers/testplugin.js +++ b/etherpad/src/plugins/testplugin/controllers/testplugin.js @@ -29,7 +29,6 @@ import("sqlbase.sqlbase"); import("sqlbase.sqlcommon"); import("sqlbase.sqlobj"); - function onRequest() { var isPro = pro_utils.isProDomainRequest(); var userId = padusers.getUserId(); @@ -47,11 +46,13 @@ function onRequest() { var isProUser = (isPro && ! padusers.isGuest(userId)); - renderHtml("testplugin.ejs", - { - isPro: isPro, - isProAccountHolder: isProUser, - account: getSessionProAccount(), // may be falsy - }, 'testplugin'); + renderHtml( + "testplugin.ejs", + { + isPro: isPro, + isProAccountHolder: isProUser, + account: getSessionProAccount(), // may be falsy + }, + 'testplugin'); return true; } diff --git a/etherpad/src/plugins/testplugin/templates/page.ejs b/etherpad/src/plugins/testplugin/templates/page.ejs new file mode 100644 index 0000000..71633c0 --- /dev/null +++ b/etherpad/src/plugins/testplugin/templates/page.ejs @@ -0,0 +1,23 @@ +<% /* Copyright 2009 Google Inc. + +Licensed 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. */ %> + +<% template.define('body', function() { var ejs_data=''; %> +
+

Page header

+ <%: template.use('content', function() { var ejs_data=''; %> + Original content + <% return ejs_data; }); %> +
footer
+
+<% return ejs_data; }); %> diff --git a/etherpad/src/plugins/testplugin/templates/testplugin.ejs b/etherpad/src/plugins/testplugin/templates/testplugin.ejs index f70ca8d..69c4453 100644 --- a/etherpad/src/plugins/testplugin/templates/testplugin.ejs +++ b/etherpad/src/plugins/testplugin/templates/testplugin.ejs @@ -24,6 +24,10 @@ limitations under the License. */ %> helpers.addToHead('\n\n'); %> -
- Welcome to the test plugin -
+<% template.inherit('page.ejs') %> + +<% template.define('content', function() { var ejs_data=''; %> +
+ Welcome to the test plugin +
+<% return ejs_data; }); %> -- cgit v1.2.3-1-g7c22