paulsp 02/04/14 09:51:09
Modified: webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column-customize.vm
multicolumn-customize.vm
webapp/WEB-INF/templates/vm/navigations/html top.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portlet.vm customizer-portletset-add.vm
customizer-portletset-addset.vm
customizer-portletset-general.vm
customizer-portletset-layout.vm
customizer-portletset.vm hello-customize.vm
hello.vm
Log:
Part of PEID implementation
(Big commit part 2 of 2)
o JetspeedLinkFactory now uses Turbine's Factory Services to instanciate
objects
o TestJetspeedLinkFactory now verify class name created by
JetspeedLinkFactory is the same as one for the tool jlink
o Non default pages, including pages that are not in the user's
PSML tree, can be customize
o Converted some template from $jlink to $jslink
o JLogout now redirect to the home page.
o Removed deprecated stuff from BaseVelocityLink.java and
JetspeedLink.java
o JetspeedTemplateLink.java no longer implements JetspeedLink
o Various test cleanups
o Various import cleanups
Revision Changes Path
1.8 +4 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- card-customize.vm 1 Apr 2002 18:07:22 -0000 1.7
+++ card-customize.vm 14 Apr 2002 16:51:09 -0000 1.8
@@ -68,8 +68,8 @@
#end
</td>
<td valign="top" align="center">
- <form action="$jlink" method="post">
-#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action"> #end
+ <form action="$jslink.Template" method="post">
+#if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action"> #end
<input type="hidden" name="position" value="$position" />
<input type="image" border="0" alt="Delete" src="images/close.gif"
name="eventSubmit_doDelete">
#if ($velocityCount < $portlets.size())
@@ -97,8 +97,8 @@
<table cellspacing="2">
<tr>
<td>
- <form action="$jlink" method="post">
- #if ($!action) <input type="hidden" name="$jlink.ActionKey"
value="$action" > #end
+ <form action="$jslink.Template" method="post">
+ #if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action" > #end
<table cellspacing="2">
<tr>
<td>
1.6 +5 -5
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm
Index: column-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- column-customize.vm 1 Apr 2002 18:07:22 -0000 1.5
+++ column-customize.vm 14 Apr 2002 16:51:09 -0000 1.6
@@ -61,7 +61,7 @@
<td valign="top">
#if (!$FF)
- <a
href="$link.setAction("controls.Customize").addQueryData("js_peid",$entry.Id)">
+ <a
href="$jslink.setAction("controls.Customize").addQueryData("js_peid",$entry.Id)">
<b>$title</b>
</a>
#else
@@ -69,8 +69,8 @@
#end
</td>
<td valign="top" align="center" >
- <form action="$jlink" method="post">
- #if ($!action) <input type="hidden" name="$jlink.ActionKey"
value="$action"> #end
+ <form action="$jslink.Template" method="post">
+ #if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action"> #end
<input type="hidden" name="position" value="$position">
<input type="image" border="0" alt="$l10n.CUSTOMIZER_DELETE"
src="images/close.gif" name="eventSubmit_doDelete">
#if ($velocityCount < $portlets.size())
@@ -98,8 +98,8 @@
<table cellspacing="2">
<tr>
<td>
- <form action="$jlink" method="post">
- #if ($!action) <input type="hidden" name="$jlink.ActionKey"
value="$action" > #end
+ <form action="$jslink.Template" method="post">
+ #if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action" > #end
<table cellspacing="2">
<tr>
<td>
1.8 +4 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- multicolumn-customize.vm 9 Jan 2002 11:36:32 -0000 1.7
+++ multicolumn-customize.vm 14 Apr 2002 16:51:09 -0000 1.8
@@ -18,8 +18,8 @@
#foreach ( $portlet in $column )
<tr>
<td width="100%">
- <form action="$jlink" method="post">
-#if ($action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
+ <form action="$jslink.Template" method="post">
+#if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" /> #end
<input type="hidden" name="col" value="$col" />
<input type="hidden" name="row" value="$row" />
<table width="95%" cellpadding="1" cellspacing="0" #if(
${skin.PortletStyleClass}) class="$!{skin.PortletStyleClass}" #end
#if(${skin.TitleBackgroundColor}) style="background-color:
${skin.TitleBackgroundColor}" #end >
@@ -79,8 +79,8 @@
</tr>
</table>
<br>
-<form action="$jlink" method="post">
- #if ($action) <input type="hidden" name="$jlink.ActionKey" value="$action" > #end
+<form action="$jslink.Template" method="post">
+ #if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
<center>
<input type="submit" name="eventSubmit_doSave"
value="$l10n.CUSTOMIZER_SAVEAPPLY" >
</center>
1.14 +8 -8
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- top.vm 9 Feb 2002 18:42:51 -0000 1.13
+++ top.vm 14 Apr 2002 16:51:09 -0000 1.14
@@ -44,18 +44,18 @@
<tr>
<td align="right" style="font-size:10">
$l10n.TOP_CUSTOMIZE:
- <a href="$link.setAction("controls.Customize")?reset=on"
style="font-size:10">HTML</a>
- <a href="$link.setAction("controls.Customize")?reset=on&mtype=wml"
style="font-size:10">WML</a>
+ <a href="$jslink.setAction("controls.Customize")?reset=on"
style="font-size:10">HTML</a>
+ <a href="$jslink.setAction("controls.Customize")?reset=on&mtype=wml"
style="font-size:10">WML</a>
</td>
</tr>
<tr>
<td align="right" style="font-size:10">
- <a href="$link.setPage("EditAccount")"
style="font-size:10">$l10n.TOP_EDITACCOUNT $data.User.UserName</a>
+ <a href="$jslink.setTemplate("EditAccount")"
style="font-size:10">$l10n.TOP_EDITACCOUNT $data.User.UserName</a>
</td>
</tr>
<tr>
<td align="right" style="font-size:10">
- <a href="$link.setAction($config.getString("action.logout"))"
style="font-size:10">$l10n.TOP_LOGOUT</a>
+ <a href="$jslink.setAction($config.getString("action.logout"))"
style="font-size:10">$l10n.TOP_LOGOUT</a>
</td>
</tr>
## Leave space between last line and content
@@ -76,7 +76,7 @@
## Display the company logo with link back to the the portal home page
##
<td align="left" width="30%">
- <a href="$link">
+ <a href="$jslink.Template">
<img border="0" alt="$l10n.HOME" src="$LogoURI">
</a>
</td>
@@ -94,7 +94,7 @@
#if( $config.getBoolean("topnav.user_login.enable") == true)
<td align="right" valign="bottom" width="30%">
<form method="POST" action="$link"
enctype="application/x-www-form-urlencoded">
- <input name="$jlink.ActionKey" type="hidden"
value="$config.getString("action.login")">
+ <input name="$jslink.ActionKey" type="hidden"
value="$config.getString("action.login")">
<table border="0" cellspacing="2" cellpadding="0">
<tr>
<td style="font-size:10">$l10n.USERFORM_USERNAMEMSG</td>
@@ -122,10 +122,10 @@
<tr>
<td align="center" colspan="3">
#if( $config.getBoolean("topnav.user_creation.enable") == true)
- <a href="$link.setPage("NewAccount")"
style="font-size:10">$l10n.TOP_CREATENEWACCOUNT</a>
+ <a href="$jslink.setPage("NewAccount")"
style="font-size:10">$l10n.TOP_CREATENEWACCOUNT</a>
|
#end
- <a href="$link.setPage("LoginHelp")"
style="font-size:10">$l10n.TOP_LOGINHELP</a>
+ <a href="$jslink.setPage("LoginHelp")"
style="font-size:10">$l10n.TOP_LOGINHELP</a>
</td>
</tr>
## Leave space between last line and content
1.4 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm
Index: customizer-portlet.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- customizer-portlet.vm 9 Jan 2002 11:36:32 -0000 1.3
+++ customizer-portlet.vm 14 Apr 2002 16:51:09 -0000 1.4
@@ -1,8 +1,8 @@
<br>
#set ($config = $portlet.PortletConfig)
-<form action="$jlink" method="post">
+<form action=" $jslink.Template" method="post">
#if ($action)
- <input name="$jlink.ActionKey" type="hidden" value="$action">
+ <input name="$jslink.ActionKey" type="hidden" value="$action">
#end
#if ($parameters.size() == 0)
<br>
1.5 +4 -4
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm
Index: customizer-portletset-add.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customizer-portletset-add.vm 22 Dec 2001 03:01:05 -0000 1.4
+++ customizer-portletset-add.vm 14 Apr 2002 16:51:09 -0000 1.5
@@ -1,6 +1,6 @@
<br>
-<form action="$jlink" method="post">
- #if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" > #end
+<form action="$jslink.Template" method="post">
+ #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" >
#end
<center>
<table width="80%" border="1" cellspacing="0">
<tr>
@@ -76,7 +76,7 @@
<tr>
<td>
#if ($prev)
- <a href="$jlink.addPathInfo("start",$prev)">$l10n.CUSTOMIZER_PREVIOUSBTN</a>
+ <a
href="$jslink.addPathInfo("start",$prev)">$l10n.CUSTOMIZER_PREVIOUSBTN</a>
#else
#end
@@ -89,7 +89,7 @@
</td>
<td>
#if ($next)
- <a href="$jlink.addPathInfo("start",$next)">$l10n.CUSTOMIZER_NEXTBTN</a>
+ <a href="$jslink.addPathInfo("start",$next)">$l10n.CUSTOMIZER_NEXTBTN</a>
#else
#end
1.4 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addset.vm
Index: customizer-portletset-addset.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addset.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- customizer-portletset-addset.vm 22 Dec 2001 03:01:05 -0000 1.3
+++ customizer-portletset-addset.vm 14 Apr 2002 16:51:09 -0000 1.4
@@ -1,6 +1,6 @@
<br>
-<form action="$jlink" method="post">
- #if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action"> #end
+<form action="$jslink.Template" method="post">
+ #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"> #end
<table width="100%" cellspacing="2" cellpadding="0">
<tr>
<td align="left" nowrap width="20%">
1.4 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-general.vm
Index: customizer-portletset-general.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-general.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- customizer-portletset-general.vm 22 Dec 2001 03:01:05 -0000 1.3
+++ customizer-portletset-general.vm 14 Apr 2002 16:51:09 -0000 1.4
@@ -1,6 +1,6 @@
<br>
-<form action="$jlink" method="post">
- #if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action"> #end
+<form action="$jslink.Template" method="post">
+ #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"> #end
<table cellspacing="2" cellpadding="0">
<tr>
<td>
1.5 +6 -6
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm
Index: customizer-portletset-layout.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customizer-portletset-layout.vm 22 Dec 2001 03:01:05 -0000 1.4
+++ customizer-portletset-layout.vm 14 Apr 2002 16:51:09 -0000 1.5
@@ -8,9 +8,9 @@
$l10n.CUSTOMIZER_LAYOUT :
</td>
<td valign="middle">
- <form name="controllers" action="$jlink" method="post">
+ <form name="controllers" action="$jslink.Template" method="post">
#if ($action)
- <input name="$jlink.ActionKey" type="hidden" value="$action">
+ <input name="$jslink.ActionKey" type="hidden" value="$action">
#end
<input type="hidden" name="eventSubmit_doLayout" value="layout">
## No Controller-Selection for WML Profiles
@@ -44,8 +44,8 @@
$l10n.CUSTOMIZER_DECORATION :
</td>
<td valign="middle">
- <form name="controls" action="$jlink" method="post">
- #if ($action) <input name="$jlink.ActionKey" type="hidden"
value="$action"> #end
+ <form name="controls" action="$jslink.Template" method="post">
+ #if ($action) <input name="$jslink.ActionKey" type="hidden"
value="$action"> #end
<input type="hidden" name="eventSubmit_doControl" value="control">
<select name="control" onChange="document.controls.submit()">
#foreach ($control in $controls)
@@ -63,8 +63,8 @@
$l10n.CUSTOMIZER_SKIN :
</td>
<td valign="middle">
- <form name="skins" action="$jlink" method="post">
- #if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action"
> #end
+ <form name="skins" action="$jslink.Template" method="post">
+ #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"
> #end
<input type="hidden" name="eventSubmit_doSkin" value="skin"> ## No
Controller-Selection for WML Profiles
#if (($!mtype=="wml") || ($!mtype=="WML"))
<select name="skin" onChange="document.skins.submit()" disabled>
1.8 +4 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- customizer-portletset.vm 22 Dec 2001 03:01:05 -0000 1.7
+++ customizer-portletset.vm 14 Apr 2002 16:51:09 -0000 1.8
@@ -10,13 +10,13 @@
</td>
<td align="center" width="20%" valign="middle">
- <form action="$jlink.addPathInfo("mode","layout")">
+ <form action=" $jslink.Template.addPathInfo("mode","layout")">
<input type="submit" value="$l10n.CUSTOMIZER_EDITLAYOUT">
</form>
</td>
<td nowrap align="center" width="20%">
- <form action="$jlink.addPathInfo("mode","add")">
+ <form action=" $jslink.Template.addPathInfo("mode","add")">
#if ($allowportlet=="true")
<input type="submit" value="$l10n.CUSTOMIZER_ADDPORTLET" >
#else
@@ -26,7 +26,7 @@
</td>
<td nowrap align="center" width="20%">
- <form action="$jlink.addPathInfo("mode","addset")">
+ <form action=" $jslink.Template.addPathInfo("mode","addset")">
#if ($allowpane=="true")
<input type="submit" value="$l10n.CUSTOMIZER_ADDPANE" >
#else
@@ -36,7 +36,7 @@
</td>
<td nowrap align="center" width="20%">
- <form action="$jlink.addPathInfo("mode","general")">
+ <form action=" $jslink.Template.addPathInfo("mode","general")">
#if ($allowproperties=="true")
<input type="submit" value="$l10n.CUSTOMIZER_EDITPROPERTIES">
#else
1.3 +6 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hello-customize.vm 22 Jul 2001 20:32:47 -0000 1.2
+++ hello-customize.vm 14 Apr 2002 16:51:09 -0000 1.3
@@ -1,9 +1,10 @@
#if (!$text)
#set ( $text = "HelloWorld" )
#end
-<form action="$jlink" method="post">
-<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" />
-</p>
+<form action="$jslink.Template" method="post">
+ <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">
+ </p>
</form>
1.3 +11 -10
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/hello.vm
Index: hello.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/hello.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hello.vm 7 Jan 2002 11:23:43 -0000 1.2
+++ hello.vm 14 Apr 2002 16:51:09 -0000 1.3
@@ -1,16 +1,17 @@
#if (!$text)
#set ( $text = "HelloWorld" )
#end
-<form action="$jlink" method="post">
-<font color="$!{skin.Color}">
-<h2>$text</h2>
+<form action="$jslink.Template" method="post">
+ <font color="$!{skin.Color}">
+ <h2>$text</h2>
#if ($message)
-<b>$message</b>
-<br>
+ <b>$message</b>
+ <br>
#end
-<p>If you want to change this text, please enter it below :
-<br /><input name="text" value="$text" size="30" />
-<input type="submit" name="eventSubmit_doUpdate" value="Update" />
-</p>
-</font>
+ <p>If you want to change this text, please enter it below :
+ <br>
+ <input name="text" value="$text" size="30">
+ <input type="submit" name="eventSubmit_doUpdate" value="Update">
+ </p>
+ </font>
</form>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
