You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ra...@apache.org on 2001/07/22 22:32:47 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html ConfirmRegistration.vm Customize.vm EditAccount.vm Home.vm Login.vm NewAccount.vm
raphael 01/07/22 13:32:47
Modified: webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column.vm
multicolumn-customize.vm row.vm
webapp/WEB-INF/templates/vm/controls/html jetspeed-menu.vm
jetspeed-tab.vm
webapp/WEB-INF/templates/vm/navigations/html left.vm top.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset.vm hello-customize.vm
webapp/WEB-INF/templates/vm/screens/html
ConfirmRegistration.vm Customize.vm EditAccount.vm
Home.vm Login.vm NewAccount.vm
Log:
Update customization features:
- remove static PortalState class and refactor layout flow
- upgrade functionalities for multicolumn and paned controller
(Works only in Velocity mode right now)
Revision Changes Path
1.3 +18 -23 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm
Index: card-customize.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- card-customize.vm 2001/07/08 21:01:51 1.2
+++ card-customize.vm 2001/07/22 20:32:47 1.3
@@ -2,39 +2,34 @@
#foreach ($entry in $portlets)
#set ($position = $velocityCount - 1)
<tr>
- <td><a href="$jlink.setAction("controls.Customize").setPortlet($entry.Name)">$!entry.Title</a></td>
- <td>
+ <td valign="top" width="60%">
+ <b>$!entry.Metainfo.Title</b>
+ </td>
+ <td valign="top" align="center" width="40%">
<form action="$jlink" method="post">
#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
-#if ($!paneid) <input type="hidden" name="paneid" value="$paneid" /> #end
<input type="hidden" name="position" value="$position" />
- <input type="submit" name="eventSubmit_doDelete" value="Delete" />
- <input type="submit" name="eventSubmit_doDown" value="<--" />
- <input type="submit" name="eventSubmit_doUp" value="-->" />
- </form>
- </td>
- </tr>
+ <input type="image" border="0" alt="Delete" src="images/close.gif" name="eventSubmit_doDelete" />
+#if ($velocityCount < $portlets.size())
+ <input type="image" border="0" alt="Move down" src="images/down.gif" name="eventSubmit_doUp" />
+#else
+ <img src="images/dot.gif" width=14" height="14" border="0" />
#end
-<!--
- <tr>
- <td colspan="2">
- <form action="$jlink" method="post">
-#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
-#if ($!paneid) <input type="hidden" name="paneid" value="$paneid" /> #end
- <input type="text" name="title" size="20" />
- <input type="submit" name="eventSubmit_doAdd" value="Add" />
+#if ($position > 0)
+ <input type="image" border="0" src="images/up.gif" alt="Move up" name="eventSubmit_doDown" />
+#else
+ <img src="images/dot.gif" width=14" height="14" border="0" />
+#end
</form>
</td>
</tr>
- <tr>
- <td colspan="2" align="right">
+#end
+ <tr height="50">
+ <td colspan="2" align="right" valign="middle" height="50">
<form action="$jlink" method="post">
#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
-#if ($!paneid) <input type="hidden" name="paneid" value="$paneid" /> #end
- <input type="submit" name="eventSubmit_doSave" value="Save" />
- <input type="submit" name="eventSubmit_doApply" value="Save & Apply" />
+ <input type="submit" name="eventSubmit_doApply" value="Done" />
</form>
</td>
</tr>
--->
</table>
1.3 +3 -2 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column.vm
Index: column.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- column.vm 2001/06/25 11:32:38 1.2
+++ column.vm 2001/07/22 20:32:47 1.3
@@ -1,7 +1,8 @@
<table border="0" cellpadding="2" cellspacing="0" width="100%">
#foreach ( $portlet in $portlets )
-#if ($!sizes.size() >= $velocityCount)
- #set ($height = $!sizes.elementAt($velocityCount-1))
+#if ($sizes.size() >= $velocityCount)
+ #set ($idx = $velocityCount - 1 )
+ #set ($height = $!sizes.elementAt($idx))
#end
<tr height="$!height">
<td height="$!height">
1.3 +18 -13 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm
Index: multicolumn-customize.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multicolumn-customize.vm 2001/07/11 09:36:04 1.2
+++ multicolumn-customize.vm 2001/07/22 20:32:47 1.3
@@ -1,11 +1,14 @@
<table border="0" cellpadding="2" cellspacing="0" width="100%">
<tr>
#set ($col = 0)
-#set ($width = 100 / $colNum )
#foreach ( $column in $portlets )
#set ($row = 0)
- <td valign="top" width="${width}%">
- <table width="100%" cellspacing="2" cellpadding="0" border="0">
+#if ($sizes.size() >= $velocityCount)
+ #set ($idx = $velocityCount - 1 )
+ #set ($width = $!sizes.elementAt($idx))
+#end
+ <td valign="top" width="$width">
+ <table width="100%" cellspacing="1" cellpadding="1" border="0">
#foreach ( $portlet in $column )
<tr>
<td width="100%">
@@ -18,19 +21,17 @@
<table width="100%" cellspacing="0" cellpadding="0" bgcolor="$!{skin.TitleBackgroundColor}">
<tr bgcolor="$!{skin.TitleBackgroundColor}">
<td bgcolor="$!{skin.TitleBackgroundColor}" valign="top" >
- <input type="image" src="images/close.gif" border="0" name="eventSubmit_doDelete" />
- <input type="image" src="images/left.gif" border="0" name="eventSubmit_doLeft" />
- <input type="image" src="images/up.gif" border="0" name="eventSubmit_doUp" />
- <input type="image" src="images/down.gif" border="0" name="eventSubmit_doDown" />
- <input type="image" src="images/right.gif" border="0" name="eventSubmit_doRight" />
+ <input type="image" src="images/close.gif" alt="Close" border="0" name="eventSubmit_doDelete" />
+ <input type="image" src="images/left.gif" alt="Move left" border="0" name="eventSubmit_doLeft" />
+ <input type="image" src="images/up.gif" alt="Move up" border="0" name="eventSubmit_doUp" />
+ <input type="image" src="images/down.gif" alt="Move down" border="0" name="eventSubmit_doDown" />
+ <input type="image" src="images/right.gif" alt="Move right" border="0" name="eventSubmit_doRight" />
</td>
</tr>
#set ($title = $titles.get($portlet.Parent) )
<tr height="50">
<td height="50" valign="middle" bgcolor="$!{skin.BackgroundColor}" align="center">
- <a href="$jlink.setAction("controls.Customize").setPortlet($!portlet.Parent)">
- <b>#if ($title) $title #else $portlet.Parent #end</b>
- </a>
+ <b>#if ($title) $title #else $portlet.Parent #end</b>
</td>
</tr>
</table>
@@ -44,6 +45,10 @@
</table>
</td>
#set ($col = $col + 1)
+#if ($col != $colNum)
+ <td valign="top" width="2">
+ </td>
+#end
#end
</tr>
</table>
@@ -51,8 +56,8 @@
#if ($action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
<table border="0" cellpadding="2" cellspacing="0" width="100%">
<tr>
- <td valign="right" width="100%">
- <input type="submit" name="eventSubmit_doSave" value="Save" />
+ <td align="right" width="100%">
+ <input type="submit" name="eventSubmit_doSave" value="Save & Apply" />
</td>
</tr>
</table>
1.2 +2 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row.vm
Index: row.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- row.vm 2001/06/10 08:41:02 1.1
+++ row.vm 2001/07/22 20:32:47 1.2
@@ -2,7 +2,8 @@
<tr>
#foreach ( $portlet in $portlets )
#if ($sizes.size() >= $velocityCount)
- #set ($width = $!sizes.elementAt($velocityCount-1))
+ #set ($idx = $velocityCount - 1 )
+ #set ($width = $!sizes.elementAt($idx))
#end
<td valign="top" width="$!width">
$!portlet.getContent($data)
1.2 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-menu.vm
Index: jetspeed-menu.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-menu.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jetspeed-menu.vm 2001/06/25 11:33:11 1.1
+++ jetspeed-menu.vm 2001/07/22 20:32:47 1.2
@@ -1,4 +1,4 @@
-#if (! $customized )
+#if (! $data.Customized )
#if ( ! $tabs )
#parse ("jetspeed.vm")
#else
1.2 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-tab.vm
Index: jetspeed-tab.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-tab.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jetspeed-tab.vm 2001/06/25 11:33:11 1.1
+++ jetspeed-tab.vm 2001/07/22 20:32:47 1.2
@@ -1,4 +1,4 @@
-#if (! $customized )
+#if (! $data.Customized )
#if ( ! $tabs )
#parse ("jetspeed.vm")
#else
1.2 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/left.vm
Index: left.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/left.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- left.vm 2001/02/11 22:54:01 1.1
+++ left.vm 2001/07/22 20:32:47 1.2
@@ -1,7 +1,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<td>
- <a href="$jlink">
+ <a href="$link">
<small>Home</small>
</a>
</td>
1.3 +39 -5 jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm
Index: top.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- top.vm 2001/07/08 21:01:54 1.2
+++ top.vm 2001/07/22 20:32:47 1.3
@@ -1,13 +1,47 @@
<div>
- Welcome to Jetspeed -> <a href="$jlink">Home</a> <br />
#if ($data.User.hasLoggedIn())
- <a href="$jlink.setPage("Customize")">Customize</a>
+<table cellspacing="2" border="0">
+<tr>
+ <td align="center">
+ Welcome to Jetspeed -> <a href="$link">Home</a> <br />
+ <!-- this is a temporary link while the profile customization is not in place -->
+ <a href="$link.setAction("controls.Customize")">Customize</a>
- <a href="$jlink.setAction("LogoutUser")">Logout</a>
+ <a href="$link.setPage("EditAccount")">Edit Account ($data.User.UserName)</a>
- <a href="$jlink.setPage("EditAccount")">Edit Account ($data.User.UserName)</a>
+ <a href="$link.setAction("LogoutUser")">Logout</a>
+ </td>
+</tr>
+</table>
#else
- <a href="$jlink.setPage("Login")">Please login to Jetspeed</a>
+<table cellspacing="2" border="0">
+<tr>
+ <td valign="middle">
+ Welcome to Jetspeed -> <a href="$link">Home</a><br />
+ <small><a href="$link.setPage("NewAccount")">Create a new account</a></small>
+ </td>
+ <td valign="middle">
+ <form method="POST" action="$link" enctype="application/x-www-form-urlencoded">
+ <input name="$jlink.ActionKey" type="hidden" value="$config.getString("action.login")" />
+ <table border="0" cellspacing="2" cellpadding="1">
+ <tr>
+ <td><small>Username:</small></td>
+ <td><small><input size="10" value="$!data.Parameters.getString("username")" name="username" maxlength="25" type="text" /></small></td>
+ </tr>
+ <tr>
+ <td><small>Password:</small></td>
+ <td><small><input size="10" value="" name="password" maxlength="25" type="password" /></small></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <small><input name="submit" type="submit" value="Login" /></small>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+</tr>
+</table>
#end
</div>
1.4 +14 -142 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm
Index: customizer-portletset.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- customizer-portletset.vm 2001/07/11 09:36:05 1.3
+++ customizer-portletset.vm 2001/07/22 20:32:47 1.4
@@ -1,146 +1,18 @@
-#set ($tab = $data.Parameters.getString("mode") )
-#if (!$tab)
- #set ($tab = $data.User.getTemp("cmode") )
- #if (!$tab) #set ($tab = "layout") #end
-#end
-$data.User.setTemp("cmode",$tab)
-<table cellpadding="0" cellspacing="1" border="0" width="100%">
-<tr>
- <td align="center" width="33%">
- <a href="$jlink.setPortlet($set.Name).addPathInfo("mode","layout")">Edit layout</a>
- </td>
- <td align="center" width="34%">
- <a href="$jlink.setPortlet($set.Name).addPathInfo("mode","add")">Add a new element</a>
- </td>
- <td align="center" width="33%">
- <a href="$jlink.setPortlet($set.Name).addPathInfo("mode","general")">Edit general properties</a>
- </td>
-</tr>
-</table>
-#if ( $tab == "layout" )
-$!set.Controller.getContent($data)
-#end
-#if ( $tab == "add" )
-#set ($start = $data.Parameters.getInt("start",0))
-#set ($size = 15)
-#if ($browser)
-<form action="$jlink" method="post">
-#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
-<table width="80%" cellspacing="1" cellpadding="0" align="center">
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}" align="left"><font color="$!{skin.TitleColor}">Select ?</font></td>
- <td bgcolor="$!{skin.TitleBackgroundColor}" align="left"><font color="$!{skin.TitleColor}"><b>Title</b></font></td>
- <td bgcolor="$!{skin.TitleBackgroundColor}" align="left"><font color="$!{skin.TitleColor}"><b>Description</b></font></td>
- </tr>
-#foreach ($portlet in $browser)
-#if ( ($velocityCount > $start) && ( $velocityCount <= $start + $size ))
- <tr>
- <td><input type="checkbox" name="pname" value="$portlet.Name" /></td>
- <td valign="top" align="left">
-#if ($portlet.Title) $portlet.Title #else $portlet.Name #end
- </td>
- <td valign="top" align="left">
-#if ($portlet.Description) $portlet.Description #else Unavailable #end
- </td>
- </tr>
-#end
-#end
-</table>
-<table width="80%" align="center" cellspacing="1" cellpadding="0">
- <tr>
- <td align="center">
-#if ($velocityCount > $start)
- <input type="submit" name="eventSubmit_doAdd" value="Prev" />
-#end
-#if ($velocityCount > $start + $size)
- <input type="submit" name="eventSubmit_doAdd" value="Next" />
-#end
- </td>
- <td align="right">
- <input type="submit" name="eventSubmit_doAdd" value="Add" />
- </td>
- </tr>
-</table>
-</form>
-#else
-<form action="$jlink" method="post">
-#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
-<table width="100%" cellspacing="1" cellpadding="0">
- <tr>
- <td width="100%">
- Type the name of the pane to add:
- <br />
- <input type="text" name="pane" value="">
- </td>
- </tr>
- <tr>
- <td align="right">
- <input type="submit" name="eventSubmit_doAddset" value="Add" />
- </td>
- </tr>
-</table>
-</form>
-#end
-#end
-#if ( $tab == "general" )
-<form action="$jlink" method="post">
-#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
<table width="100%" cellspacing="0" cellpadding="0">
- <tr height="15"><td height="15"> </td></tr>
<tr>
- <td>
- Set a title for this pane :<br />
- <input type="text" name="title" value="$!set.Title" />
- </td>
- </tr>
-#if ($controllers)
- <tr height="15"><td height="15"> </td></tr>
- <tr>
- <td>
- Select a layout for this pane :<br />
- <select name="controller">
-#foreach ($controller in $controllers)
- <option #if ($controller.Name == $currentController) SELECTED #end>
-#if ($controller.Title) $controller.Title #else $controller.Name #end
-#end
- </select>
- </td>
- </tr>
-#end
-#if ($controls)
- <tr height="15"><td height="15"> </td></tr>
- <tr>
- <td>
- Select a decoration for this pane :<br />
- <select name="control">
-#foreach ($control in $controls)
- <option #if ($control.Name == $currentControl) SELECTED #end>
-#if ($control.Title) $control.Title #else $control.Name #end
-#end
- </select>
- </td>
- </tr>
-#end
-#if ($skins)
- <tr height="15"><td height="15"> </td></tr>
- <tr>
- <td>
- Select a color scheme for this pane :<br />
- <select name="skin">
-#foreach ($skin in $skins)
- <option #if ($skin.Name == $currentSkin) SELECTED #end>
-#if ($skin.Title) $skin.Title #else $skin.Name #end
-#end
- </select>
- </td>
- </tr>
-#end
- <tr height="50">
- <td valign="middle" align="right" height="50">
- <input type="submit" name="eventSubmit_doSave" value="Save" />
- <input type="submit" name="eventSubmit_doApply" value="Save & Apply" />
+ <td align="left" nowrap>
+ <a href="$jlink.addPathInfo("mode","layout")">Layout</a>
+ |
+#if ($allowportlet)
+ <a href="$jlink.addPathInfo("mode","add")">Add portlet</a>
+ |
+#end
+#if ($allowpane)
+ <a href="$jlink.addPathInfo("mode","addset")">Add pane</a>
+ |
+#end
+ <a href="$jlink.addPathInfo("mode","addset")">Properties</a>
</td>
</tr>
-</table>
-</form>
-#end
\ No newline at end of file
+</table>
+#parse ($feature)
\ No newline at end of file
1.2 +0 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/hello-customize.vm
Index: hello-customize.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/hello-customize.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hello-customize.vm 2001/06/25 11:33:51 1.1
+++ hello-customize.vm 2001/07/22 20:32:47 1.2
@@ -2,7 +2,6 @@
#set ( $text = "HelloWorld" )
#end
<form action="$jlink" method="post">
- <input type="hidden" name="$jlink.ActionKey" value="controls.CustomizeDone" />
<p>Please Enter the new text for this portlet:
<br /><input name="text" value="$text" size="30" />
<input type="submit" name="eventSubmit_doUpdate" value="OK" />
1.4 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ConfirmRegistration.vm
Index: ConfirmRegistration.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ConfirmRegistration.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfirmRegistration.vm 2001/07/03 17:14:56 1.3
+++ ConfirmRegistration.vm 2001/07/22 20:32:47 1.4
@@ -1,7 +1,7 @@
<div align="left">
<form accept-charset="UTF-8, ISO-8859-1"
method="POST"
- action="$jlink"
+ action="$link"
enctype="application/x-www-form-urlencoded">
<input name="username" type="hidden" value="$!data.Parameters.getString("username")" />
<input name="password" type="hidden" value="$!data.Parameters.getString("password")" />
1.2 +2 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Customize.vm
Index: Customize.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Customize.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Customize.vm 2001/02/11 22:54:04 1.1
+++ Customize.vm 2001/07/22 20:32:47 1.2
@@ -1 +1,2 @@
-$jetspeed.getPane("customize")
\ No newline at end of file
+$data.setMode("customize")
+$jetspeed.getCustomizer($data.Customized).getContent($data)
\ No newline at end of file
1.3 +2 -2 jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/EditAccount.vm
Index: EditAccount.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/EditAccount.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EditAccount.vm 2001/03/12 11:54:14 1.2
+++ EditAccount.vm 2001/07/22 20:32:47 1.3
@@ -1,7 +1,7 @@
<div align="left">
<form accept-charset="UTF-8, ISO-8859-1"
method="POST"
- action="$jlink"
+ action="$link"
enctype="application/x-www-form-urlencoded">
<input name="$jlink.ActionKey" type="hidden" value="UpdateAccount" />
<input name="username" type="hidden" value="$!data.User.UserName" />
@@ -10,7 +10,7 @@
<td>
<h2><u>Edit your account details</u></h2>
#if ($data.Message)
- <p><b>$data;Message</b></p>
+ <p><b>$data.Message</b></p>
#end
<table cellpadding="0" cellspacing="0" border="0">
<tr>
1.2 +1 -0 jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Home.vm
Index: Home.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Home.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Home.vm 2001/02/11 22:54:05 1.1
+++ Home.vm 2001/07/22 20:32:47 1.2
@@ -1 +1,2 @@
+$data.setMode("default")
$jetspeed.getPane("default")
1.2 +2 -2 jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Login.vm
Index: Login.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Login.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Login.vm 2001/02/11 22:54:05 1.1
+++ Login.vm 2001/07/22 20:32:47 1.2
@@ -1,6 +1,6 @@
<div align="left">
<form method="POST"
- action="$jlink"
+ action="$link"
enctype="application/x-www-form-urlencoded">
<input name="$jlink.ActionKey" type="hidden" value="$config.getString("action.login")" />
@@ -21,7 +21,7 @@
</tr>
<tr>
<td colspan="2" align="center">
- <small><a href="$jlink.setPage("NewAccount.vm")">Create a new account</a></small>
+ <small><a href="$link.setPage("NewAccount")">Create a new account</a></small>
</td>
</tr>
</table>
1.3 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm
Index: NewAccount.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewAccount.vm 2001/03/12 11:54:15 1.2
+++ NewAccount.vm 2001/07/22 20:32:47 1.3
@@ -1,7 +1,7 @@
<div align="left">
<form accept-charset="UTF-8, ISO-8859-1"
method="POST"
- action="$jlink.setPage("ConfirmRegistration.vm")"
+ action="$link.setPage("ConfirmRegistration")"
enctype="application/x-www-form-urlencoded">
<input name="$jlink.ActionKey" type="hidden" value="CreateNewUserAndConfirm" />
<table cellpadding="4" cellspacing="0" border="0">
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org