taylor 2004/11/26 17:15:04 Modified: applications/demo/src/webapp/WEB-INF/view bookmark-view.jsp edit-prefs.vm bookmark-help.jsp bookmark-edit.jsp Log: *** keyword substitution change *** Revision Changes Path 1.2 +31 -31 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/bookmark-view.jsp Index: bookmark-view.jsp =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/bookmark-view.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bookmark-view.jsp 19 Nov 2004 21:53:12 -0000 1.1 +++ bookmark-view.jsp 27 Nov 2004 01:15:03 -0000 1.2 @@ -1,32 +1,32 @@ -<%@ page session="false" %>
-<%@ page import="javax.portlet.*"%> -<%@ page import="java.util.Enumeration"%> -<%@ page import="java.util.ResourceBundle"%> -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%> -<portlet:defineObjects/> - -<% -ResourceBundle myText = portletConfig.getResourceBundle(renderRequest.getLocale()); -%> -<br><B><%=myText.getString("available_bookmarks")%></B><br><br> -<% - PortletPreferences prefs = renderRequest.getPreferences(); - Enumeration e = prefs.getNames(); - if (!e.hasMoreElements()) // no bookmarks - { -%> - <%=myText.getString("no_bookmarks")%><BR> -<% - } - while (e.hasMoreElements()) - { - String name = (String)e.nextElement(); - String value = prefs.getValue - (name,"<"+ - myText.getString("undefined")+">"); -%> - <A target="_blank" HREF=<%=value%>><%=name%></A><BR> -<% - } -%> +<%@ page session="false" %> +<%@ page import="javax.portlet.*"%> +<%@ page import="java.util.Enumeration"%> +<%@ page import="java.util.ResourceBundle"%> +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%> +<portlet:defineObjects/> + +<% +ResourceBundle myText = portletConfig.getResourceBundle(renderRequest.getLocale()); +%> +<br><B><%=myText.getString("available_bookmarks")%></B><br><br> +<% + PortletPreferences prefs = renderRequest.getPreferences(); + Enumeration e = prefs.getNames(); + if (!e.hasMoreElements()) // no bookmarks + { +%> + <%=myText.getString("no_bookmarks")%><BR> +<% + } + while (e.hasMoreElements()) + { + String name = (String)e.nextElement(); + String value = prefs.getValue + (name,"<"+ + myText.getString("undefined")+">"); +%> + <A target="_blank" HREF=<%=value%>><%=name%></A><BR> +<% + } +%> <br> 1.2 +13 -13 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/edit-prefs.vm Index: edit-prefs.vm =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/edit-prefs.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- edit-prefs.vm 12 Nov 2004 06:32:31 -0000 1.1 +++ edit-prefs.vm 27 Nov 2004 01:15:03 -0000 1.2 @@ -1,13 +1,13 @@ - -<h2 class="portlet-section-header">Edit Preferences</h2> - -<form action="$renderResponse.createActionURL()" method="post"> -<table> -#foreach ($pref in $prefs) -#prefField($pref.Key $pref.Value "40") -#end -</table> -<input type="submit" name="Save" value="Save" /> -</form> - - + +<h2 class="portlet-section-header">Edit Preferences</h2> + +<form action="$renderResponse.createActionURL()" method="post"> +<table> +#foreach ($pref in $prefs) +#prefField($pref.Key $pref.Value "40") +#end +</table> +<input type="submit" name="Save" value="Save" /> +</form> + + 1.2 +17 -17 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/bookmark-help.jsp Index: bookmark-help.jsp =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/bookmark-help.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bookmark-help.jsp 19 Nov 2004 21:53:12 -0000 1.1 +++ bookmark-help.jsp 27 Nov 2004 01:15:03 -0000 1.2 @@ -1,18 +1,18 @@ -<%@ page session="false" %> -<%@ page import="javax.portlet.*"%> -<%@ page import="java.util.*"%> -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%> - -<portlet:renderURL portletMode="view" var="myCancel"/> - -<portlet:defineObjects/> -<% -ResourceBundle myText = portletConfig.getResourceBundle(request.getLocale()); -%> - -<B><%=myText.getString("help.title")%></B> -<p><%=myText.getString("help.text")%></B></p> -<FORM ACTION="<%=myCancel%>" METHOD="POST"> -<INPUT NAME="cancel" TYPE="submit" - VALUE="<%=myText.getString("cancel")%>"> +<%@ page session="false" %> +<%@ page import="javax.portlet.*"%> +<%@ page import="java.util.*"%> +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%> + +<portlet:renderURL portletMode="view" var="myCancel"/> + +<portlet:defineObjects/> +<% +ResourceBundle myText = portletConfig.getResourceBundle(request.getLocale()); +%> + +<B><%=myText.getString("help.title")%></B> +<p><%=myText.getString("help.text")%></B></p> +<FORM ACTION="<%=myCancel%>" METHOD="POST"> +<INPUT NAME="cancel" TYPE="submit" + VALUE="<%=myText.getString("cancel")%>"> </FORM> 1.2 +79 -79 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/bookmark-edit.jsp Index: bookmark-edit.jsp =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/bookmark-edit.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bookmark-edit.jsp 19 Nov 2004 21:53:12 -0000 1.1 +++ bookmark-edit.jsp 27 Nov 2004 01:15:03 -0000 1.2 @@ -1,80 +1,80 @@ -<%@ page session="false" %> -<%@ page import="javax.portlet.*"%> -<%@ page import="java.util.*"%> -<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%> - -<portlet:actionURL portletMode="edit" var="myAction"> - <portlet:param name="add" value="add"/> -</portlet:actionURL> - -<portlet:renderURL portletMode="view" var="myCancel"/> - -<jsp:useBean id="addUrl" scope="request" - class="java.lang.String" /> -<jsp:useBean id="cancelUrl" scope="request" - class="java.lang.String" /> -<portlet:defineObjects/> -<% -ResourceBundle myText = portletConfig.getResourceBundle(request.getLocale()); -%> -<B><%=myText.getString("available_bookmarks")%></B><br> -<FORM ACTION="<%=myAction%>" METHOD="POST"> -<TABLE CELLPADDING=0 CELLSPACING=4> - <TR> - <TD> - <B><%=myText.getString("name")%></B> - </TD> - <TD> - <B><%=myText.getString("url")%></B> - </TD> - <TD> - </TD> - </TR> -<% -PortletPreferences prefs = renderRequest.getPreferences(); -Enumeration e = prefs.getNames(); -while (e.hasMoreElements()) - { - String name = (String)e.nextElement(); - String value = prefs.getValue(name, - "<" + - myText.getString("undefined") - +">"); -%> - <TR> - <TD> - <%=name%> - </TD> - <TD> - <%=value%> - </TD> - <TD> - <portlet:actionURL var="removeUrl"> - <portlet:param name="remove" value="<%=name%>"/> - </portlet:actionURL> - <A HREF ="<%=removeUrl.toString()%>"> -[<%=myText.getString("delete")%>] - </A> - </TD> - </TR> -<% - } -%> - <TR> - <TD> - <INPUT NAME="name" TYPE="text"> - </TD> - <TD> - <INPUT NAME="value" size='50' TYPE="text"> - </TD> - <TD> - <INPUT NAME="add" TYPE="submit" - value="<%=myText.getString("add")%>"> - </TD> - </TR> -</TABLE> -</FORM> -<FORM ACTION="<%=myCancel%>" METHOD="POST"> -<INPUT NAME="cancel" TYPE="submit" - VALUE="<%=myText.getString("cancel")%>"> +<%@ page session="false" %> +<%@ page import="javax.portlet.*"%> +<%@ page import="java.util.*"%> +<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%> + +<portlet:actionURL portletMode="edit" var="myAction"> + <portlet:param name="add" value="add"/> +</portlet:actionURL> + +<portlet:renderURL portletMode="view" var="myCancel"/> + +<jsp:useBean id="addUrl" scope="request" + class="java.lang.String" /> +<jsp:useBean id="cancelUrl" scope="request" + class="java.lang.String" /> +<portlet:defineObjects/> +<% +ResourceBundle myText = portletConfig.getResourceBundle(request.getLocale()); +%> +<B><%=myText.getString("available_bookmarks")%></B><br> +<FORM ACTION="<%=myAction%>" METHOD="POST"> +<TABLE CELLPADDING=0 CELLSPACING=4> + <TR> + <TD> + <B><%=myText.getString("name")%></B> + </TD> + <TD> + <B><%=myText.getString("url")%></B> + </TD> + <TD> + </TD> + </TR> +<% +PortletPreferences prefs = renderRequest.getPreferences(); +Enumeration e = prefs.getNames(); +while (e.hasMoreElements()) + { + String name = (String)e.nextElement(); + String value = prefs.getValue(name, + "<" + + myText.getString("undefined") + +">"); +%> + <TR> + <TD> + <%=name%> + </TD> + <TD> + <%=value%> + </TD> + <TD> + <portlet:actionURL var="removeUrl"> + <portlet:param name="remove" value="<%=name%>"/> + </portlet:actionURL> + <A HREF ="<%=removeUrl.toString()%>"> +[<%=myText.getString("delete")%>] + </A> + </TD> + </TR> +<% + } +%> + <TR> + <TD> + <INPUT NAME="name" TYPE="text"> + </TD> + <TD> + <INPUT NAME="value" size='50' TYPE="text"> + </TD> + <TD> + <INPUT NAME="add" TYPE="submit" + value="<%=myText.getString("add")%>"> + </TD> + </TR> +</TABLE> +</FORM> +<FORM ACTION="<%=myCancel%>" METHOD="POST"> +<INPUT NAME="cancel" TYPE="submit" + VALUE="<%=myText.getString("cancel")%>"> </FORM> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]