jvanzyl 01/09/12 08:08:44
Modified: src/tdk/apps/2/templates/app GlobalMacros.vm
src/tdk/apps/2/templates/app/layouts Default.vm Login.vm
src/tdk/apps/2/templates/app/navigations DefaultTop.vm
Menu.vm
src/tdk/apps/2/templates/app/screens Login.vm
Removed: src/tdk/apps/2/templates/app/screens BSF.vm Error.vm
InvalidState.vm SendMail.vm
Log:
- whacked the 2.x templates when i re-imported the TDK. i put 3.0 templates
using the $renderer into the 2.x app which won't work.
Revision Changes Path
1.2 +1 -1 jakarta-turbine-tdk/src/tdk/apps/2/templates/app/GlobalMacros.vm
Index: GlobalMacros.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/GlobalMacros.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GlobalMacros.vm 2001/09/07 01:40:10 1.1
+++ GlobalMacros.vm 2001/09/12 15:08:44 1.2
@@ -23,7 +23,7 @@
#macro (formTextField $name $value)
<td bgcolor="$ui.formFieldColor">
<font face="$ui.sansSerifFonts">
- <input type="text" size="30" name="$name" value="$!value">
+ <input type="text" size="30" name="$name" value="$value">
</font>
</td>
#end
1.2 +4 -16
jakarta-turbine-tdk/src/tdk/apps/2/templates/app/layouts/Default.vm
Index: Default.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/layouts/Default.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Default.vm 2001/09/07 01:40:10 1.1
+++ Default.vm 2001/09/12 15:08:44 1.2
@@ -1,32 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd";>
-
-<html>
-<head>
- <title>$page.Title</title>
-</head>
-<body bgcolor="$ui.bgcolor">
-
<table width="100%">
<tr>
<td colspan="2">
- $renderer.render("navigations", $data, "/DefaultTop.vm")
+ $navigation.setTemplate("/DefaultTop.vm")
</td>
</tr>
<tr>
<td width="20" align="left" valign="top">
- $renderer.render("navigations", $data, "/Menu.vm")
+ $navigation.setTemplate("/Menu.vm")
</td>
<td align="left" valign="top">
- $renderer.render("screens", $data, $template)
+ $screen_placeholder
</td>
</tr>
<tr>
<td colspan="2">
- $renderer.render("navigations", $data, "/DefaultBottom.vm")
+ $navigation.setTemplate("/DefaultBottom.vm")
</td>
</tr>
</table>
-
-</body>
-</html>
1.2 +3 -15
jakarta-turbine-tdk/src/tdk/apps/2/templates/app/layouts/Login.vm
Index: Login.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/layouts/Login.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Login.vm 2001/09/07 01:40:10 1.1
+++ Login.vm 2001/09/12 15:08:44 1.2
@@ -1,29 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd";>
-
-<html>
-<head>
- <title>$page.Title</title>
-</head>
-<body bgcolor="$ui.bgcolor">
-
<table width="100%">
<tr>
<td colspan="2">
- $renderer.render("navigations", $data, "/DefaultTop.vm")
+ $navigation.setTemplate("/DefaultTop.vm")
</td>
</tr>
<tr>
<td align="left">
- $renderer.render("screens", $data, $template)
+ $screen_placeholder
</td>
</tr>
<tr>
<td colspan="2">
- $renderer.render("navigations", $data, "/DefaultBottom.vm")
+ $navigation.setTemplate("/DefaultBottom.vm")
</td>
</tr>
</table>
-
-</body>
-</html>
1.2 +2 -0
jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultTop.vm
Index: DefaultTop.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultTop.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultTop.vm 2001/09/07 01:40:10 1.1
+++ DefaultTop.vm 2001/09/12 15:08:44 1.2
@@ -1,3 +1,5 @@
+$page.setBgColor("#ffffff")
+
<img src="$content.getURI("images/tdm.jpg")">
<hr>
1.2 +5 -1
jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/Menu.vm
Index: Menu.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/Menu.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Menu.vm 2001/09/07 01:40:10 1.1
+++ Menu.vm 2001/09/12 15:08:44 1.2
@@ -23,13 +23,17 @@
<br>
<a href="$link.setPage("Upload.vm")">Upload Service</a>
<br>
+<a href="$link.setPage("ServletInfo.vm")">Servlet Service</a>
+<br>
+##<a href="">Unique Id Service</a>
+##<br>
##<a href="">XML-RPC Service</a>
##<br>
##<a href="">XSLT Service</a>
<p>
<b>Common Tasks</b>
<br>
-<a href="$link.setPage("SendMail.vm")">Send Mail</a>
+<a href="">User Downloads</a>
<p>
<a href="$link.setPage("Index.vm")">Home</a>
<p>
1.2 +1 -1
jakarta-turbine-tdk/src/tdk/apps/2/templates/app/screens/Login.vm
Index: Login.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/screens/Login.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Login.vm 2001/09/07 01:40:11 1.1
+++ Login.vm 2001/09/12 15:08:44 1.2
@@ -1,7 +1,7 @@
#**
@author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
-@version $Id: Login.vm,v 1.1 2001/09/07 01:40:11 jvanzyl Exp $
+@version $Id: Login.vm,v 1.2 2001/09/12 15:08:44 jvanzyl Exp $
*#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
