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 ta...@apache.org on 2001/12/06 07:03:41 UTC
cvs commit: jakarta-jetspeed/webapp/images/wml bullet.wbmp exit.wbmp
taylor 01/12/05 22:03:40
Modified: webapp/WEB-INF web.xml
webapp/WEB-INF/conf JetspeedResources.properties
portlets.xreg
webapp/WEB-INF/psml/user/turbine/wml default.psml
webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column-customize.vm
row-customize.vm
webapp/WEB-INF/templates/vm/controllers/wml column.vm
webapp/WEB-INF/templates/vm/layouts/wml default.vm
webapp/WEB-INF/templates/vm/navigations/html top.vm
webapp/WEB-INF/templates/vm/navigations/wml 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
webapp/WEB-INF/templates/vm/screens/html
ConfirmRegistration.vm EditAccount.vm NewAccount.vm
webapp/css default.css
Added: webapp/WEB-INF/psml/user/admin/wml default.psml
webapp/WEB-INF/templates/vm welcome.vm
webapp/WEB-INF/templates/vm/navigations/wml login.vm
webapp/images blank.gif is_pane.gif ok.gif
webapp/images/html is_portlet.gif
webapp/images/wml bullet.wbmp exit.wbmp
Log:
WML enhancements from Andreas:
Changes in Velocity Templates
- start -
File: templates/vm/controllers/html/card-customize.vm
- Added CSS
- Display icon for portlet type (pane or portlet)
- Pane customization enabled
- Apply and Cancel Button
File: templates/vm/controllers/html/column-customize.vm
- Added CSS
- Display icon for portlet type (pane or portlet)
- Pane customization enabled
- Apply and Cancel Button
File: templates/vm/controllers/html/row-customize.vm
- Added CSS
- Display icon for portlet type (pane or portlet)
- Pane customization enabled
- Apply and Cancel Button
File: templates/vm/controllers/wml/column.vm
- Parse in 'welcom.vm' for menu top
- Display portlet dependend icon or default image (images/wml/bulleet.wbmp) (*changing*)
- Support for links (*changing*)
- Added logout link (images/wml/exit.wbmp)
File: templates/vm/layouts/wml/default.vm
- Load 'login.vm' instead of 'top.vm'
File: templates/vm/navigations/html/top.vm
- Added CSS
- Layout changes (by using tables)
- Added button: customization for WML
- Added button: send mail
File: templates/vm/navigations/wml/login.vm
- Added wml login
File: templates/vm/navigations/wml/top.vm
- removed 'template'
File: templates/vm/portlets/html/customizer-portlet.vm
- Added CSS
File: templates/vm/portlets/html/customizer-portletset.vm
- Added CSS
- Display mediatype ($mtype)
- Show options dependendly on the mediatype
- Display panename if customized ($panename)
File: templates/vm/portlets/html/customizer-portletset-add.vm
- Added CSS
- Display list with two different colors
- Mark already used portlets
- Added a border
- Added message if no entry is available
- Changed layout
File: templates/vm/portlets/html/customizer-portletset-addset.vm
- Added CSS
File: templates/vm/portlets/html/customizer-portletset-general.vm
- Added CSS
- Changed layout (removed do_apply button)
File: templates/vm/portlets/html/customizer-portletset-layout.vm
- Added CSS
- Disabled Controller selection for WML ($mtype)
- Disabled Skin selection for WML ($mtype)
File: templates/vm/screens/html/ConfirmRegistration.vm
- Added CSS
File: templates/vm/screens/html/EditAccount.vm
- Added CSS
File: templates/vm/screens/html/NewAccount.vm
- Added CSS
File: templates/vm/welcome.vm
Used as top of wml menu!
- end -
New images:
blank.gif - empty image for layout creation
is_pane.gif - pane icon
ok.gif - check mark (used portlets)
html/is_portlet.gif - portlet icon
wml/bullet.wbmp - wml link icon
wml/exit.wbmp - wml logout icon
Changes for conf/portlets.xreg:
Because RSS can't be used for wml (in it's current state) I disabled it, so only working portlets are available for the customization process
Changes for conf/JetspeedResources.properties:
Added the 'mail.support' entry this could be used as a contact email address
Changes for default.css:
- New Entries (see file)
Changes for web.xml:
- Added mimetype 'wml'
- Added mimetype 'wbmp'
- Added mimetype 'wmls'
- Added welcome file 'index.wml'
Changes for wml/index.psml format:
- Removed WMLCardController (back to old v1.3a1 psml format)
- No entries by default
Revision Changes Path
1.7 +16 -0 jakarta-jetspeed/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/web.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- web.xml 2001/11/23 22:56:58 1.6
+++ web.xml 2001/12/06 06:03:39 1.7
@@ -39,8 +39,24 @@
</url-pattern>
</servlet-mapping>
+ <mime-mapping>
+ <extension>wbmp</extension>
+ <mime-type>image/vnd.wap.wbmp</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>wml</extension>
+ <mime-type>text/vnd.wap.wml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>wmls</extension>
+ <mime-type>text/vnd.wap.wmlscript</mime-type>
+ </mime-mapping>
+
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.wml</welcome-file>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
1.50 +2 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- JetspeedResources.properties 2001/11/23 22:56:58 1.49
+++ JetspeedResources.properties 2001/12/06 06:03:39 1.50
@@ -1,7 +1,7 @@
################################################################################
# Jetspeed Configuration
# Author: Kevin A. Burton (burton@apache.org)
-# $Id: JetspeedResources.properties,v 1.49 2001/11/23 22:56:58 nacho Exp $
+# $Id: JetspeedResources.properties,v 1.50 2001/12/06 06:03:39 taylor Exp $
################################################################################
# This is the main file you will need to configuration Jetspeed. If there are
# any secondary files they will be pointed to from this file.
@@ -404,6 +404,7 @@
# New User Registration mail support #
#########################################
mail.server=localhost
+mail.support=Support@localhost
# New user registration confirmation email
newuser.confirm.enable=false
newuser.confirm.email.from=Postmaster@localhost
1.14 +0 -2 jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg
Index: portlets.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- portlets.xreg 2001/10/19 21:00:24 1.13
+++ portlets.xreg 2001/12/06 06:03:39 1.14
@@ -50,7 +50,6 @@
</meta-info>
</parameter>
<media-type ref="html"/>
- <media-type ref="wml"/>
</portlet-entry>
<portlet-entry name="WML" hidden="false" type="abstract" application="false">
<classname>org.apache.jetspeed.portal.portlets.WMLFilePortlet</classname>
@@ -98,5 +97,4 @@
<parameter name="bgcolor" value="gray" hidden="false"/>
<media-type ref="html"/>
</portlet-entry>
-
</registry>
1.1 jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/wml/default.psml
Index: default.psml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<portlets xmlns="http://www.apache.org/2000/02/CVS">
<controller name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
<control name="ClearPortletControl"/>
<portlets>
<controller name="ColumnController"/>
<control name="ClearPortletControl"/>
</portlets>
</portlets>
1.3 +9 -24 jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/wml/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/wml/default.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.psml 2001/05/29 23:17:37 1.2
+++ default.psml 2001/12/06 06:03:39 1.3
@@ -1,25 +1,10 @@
-<?xml version="1.0"?>
-<portlets user="turbine" xmlns="http://xml.apache.org/jetspeed/2000/psml">
-
-<controller name="org.apache.jetspeed.portal.controllers.WMLCardController"/>
-
-<portlets>
-<controller name="RowColumnPortletController"/>
-<entry type="ref" parent="Apacheweek">
- <control name="org.apache.jetspeed.portal.controls.TitleControl"/>
- <parameter name="showDescription" value="true"/>
-</entry>
-
-<entry type="ref" parent="XMLHack">
-<control name="org.apache.jetspeed.portal.controls.TitleControl"/>
-</entry>
-
-<entry type="ref" parent="MyWeather">
-<control name="org.apache.jetspeed.portal.controls.TitleControl"/>
-</entry>
-
-<entry type="ref" parent="Stocks">
-<control name="org.apache.jetspeed.portal.controls.TitleControl"/>
-</entry>
+<?xml version="1.0" encoding="UTF-8"?>
+<portlets xmlns="http://www.apache.org/2000/02/CVS">
+ <controller name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <control name="ClearPortletControl"/>
+ <portlets>
+ <controller name="ColumnController"/>
+ <control name="ClearPortletControl"/>
+ </portlets>
</portlets>
-</portlets>
\ No newline at end of file
+
1.1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/welcome.vm
Index: welcome.vm
===================================================================
## Welcome text for wml menu
<p align="center"><b>W</b>elcome <b>t</b>o <b>J</b>etspeed<br/>
Profile for $!data.getUser().getFirstName()</p>
1.5 +50 -7 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- card-customize.vm 2001/07/23 21:45:53 1.4
+++ card-customize.vm 2001/12/06 06:03:39 1.5
@@ -1,14 +1,49 @@
-<table width="100%" cellspacing="1" cellpadding="0">
+
+<table width="100%" cellspacing="1" cellpadding="0" border="0">
+#set ($portletcount = 0)
+#set ($COUNTI="0")
#foreach ($entry in $portlets)
+#set ($COUNTI="1")
#set ($position = $velocityCount - 1)
<tr>
+ <td align="center" valign="top">
+##
+## Retrieve Entrytitle (-name)
+#set ($title="*")
#if ($entry.Parent)
#set ($title = $titles.get($entry.Parent) )
#else
#set ($title = $entry.Metainfo.Title)
#end
+##
+#if ($title=="*")
+ #if ($entry.Parent)
+ #set ($title=$entry.Parent)
+ #else
+ #set ($title=$entry.Name)
+ #end
+#end
+ ## Insert a image for portlets and panes!
+ #set ($FF=false)
+ #foreach ($entr in $runs)
+ #if ($entr.parent == $entry.Parent)
+ #set ($FF=true)
+ <img src="images/html/is_portlet.gif" width=14" height="14" border="0" alt="Portlet" hspace="2" /></TD>
+ #end
+ #end
+
+ ## Portlet is not used - use blank image!
+ #if (!$FF)
+ #set ($portletcount = $portletcount + 1)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><img src="images/is_pane.gif" alt="Pane, click for customization" width=14" height="14" border="0" hspace="2" /></a></TD>
+ #end
+
<td valign="top" width="60%">
- <b>#if ($title) $title #else #if ($entry.Parent) $entry.Parent #else Pane $!entry.Name #end #end</b>
+ #if (!$FF)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><b>$title</b></a>
+ #else
+ <b>$title</b>
+ #end
</td>
<td valign="top" align="center" width="40%">
<form action="$jlink" method="post">
@@ -28,13 +63,21 @@
</form>
</td>
</tr>
+#end
+#if ($!COUNTI="0")
+ <tr><td colspan=3>No entries!<br/><br/></td></tr>
#end
- <tr height="50">
- <td colspan="2" align="right" valign="middle" height="50">
+ <tr>
+ <td colspan="3" align="right" valign="middle">
<form action="$jlink" method="post">
-#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
- <input type="submit" name="eventSubmit_doApply" value="Done" />
- </form>
+ <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
+ <tr><td align="right">
+ #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" class="BUTON"/> #end
+ <input type="submit" name="eventSubmit_doApply" value="Apply" class="BUTON"/>
+ <input type="submit" name="eventSubmit_doCancel" value="Cancel" class="BUTON"/>
+ </td></tr>
+ </table>
+ </form>
</td>
</tr>
</table>
1.3 +47 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- column-customize.vm 2001/07/23 21:45:53 1.2
+++ column-customize.vm 2001/12/06 06:03:39 1.3
@@ -1,14 +1,47 @@
-<table width="100%" cellspacing="1" cellpadding="0">
+<table width="100%" cellspacing="1" cellpadding="0" border="0">
+#set ($portletcount = 0)
+#set ($COUNTI="0")
#foreach ($entry in $portlets)
+#set ($COUNTI="1")
#set ($position = $velocityCount - 1)
<tr>
+ <td align="center" valign="top">
+##
+#set ($title="*")
#if ($entry.Parent)
#set ($title = $titles.get($entry.Parent) )
#else
#set ($title = $entry.Metainfo.Title)
#end
+##
+#if ($title=="*")
+ #if ($entry.Parent)
+ #set ($title=$entry.Parent)
+ #else
+ #set ($title=$entry.Name)
+ #end
+#end
+ ## Insert a image for portlets and panes!
+ #set ($FF=false)
+ #foreach ($entr in $runs)
+ #if ($entr.parent == $entry.Parent)
+ #set ($FF=true)
+ <img src="images/html/is_portlet.gif" width=14" height="14" border="0" alt="Portlet" hspace="2" /></TD>
+ #end
+ #end
+
+ ## Portlet is not used - use the pane image!
+ #if (!$FF)
+ #set ($portletcount = $portletcount + 1)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><img src="images/is_pane.gif" alt="Pane, click for customization" width=14" height="14" border="0" hspace="2" /></a></TD>
+ #end
+
<td valign="top" width="60%">
- <b>#if ($title) $title #else #if ($entry.Parent) $entry.Parent #else Pane $!entry.Name #end #end</b>
+ #if (!$FF)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><b>$title</b></a>
+ #else
+ <b>$title</b>
+ #end
</td>
<td valign="top" align="center" width="40%">
<form action="$jlink" method="post">
@@ -28,12 +61,20 @@
</form>
</td>
</tr>
+#end
+#if ($!COUNTI="0")
+ <tr><td colspan=3>No entries!<br/><br/></td></tr>
#end
- <tr height="50">
- <td colspan="2" align="right" valign="middle" height="50">
+ <tr>
+ <td colspan="3" align="right" valign="middle">
<form action="$jlink" method="post">
-#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
- <input type="submit" name="eventSubmit_doApply" value="Done" />
+ <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
+ <tr><td align="right">
+ #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" class="BUTON"/> #end
+ <input type="submit" name="eventSubmit_doApply" value="Apply" class="BUTON"/>
+ <input type="submit" name="eventSubmit_doCancel" value="Cancel" class="BUTON"/>
+ </td></tr>
+ </table>
</form>
</td>
</tr>
1.3 +49 -5 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm
Index: row-customize.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- row-customize.vm 2001/07/23 21:45:53 1.2
+++ row-customize.vm 2001/12/06 06:03:39 1.3
@@ -1,14 +1,49 @@
<table width="100%" cellspacing="1" cellpadding="0">
+#set ($portletcount = 0)
+#set ($COUNTI="0")
#foreach ($entry in $portlets)
+#set ($COUNTI="1")
#set ($position = $velocityCount - 1)
<tr>
+ <td align="center" valign="top">
+
+## Retrieve Entrytitle (-name)
+#set ($title="*")
#if ($entry.Parent)
#set ($title = $titles.get($entry.Parent) )
#else
#set ($title = $entry.Metainfo.Title)
#end
+##
+#if ($title=="*")
+ #if ($entry.Parent)
+ #set ($title=$entry.Parent)
+ #else
+ #set ($title=$entry.Name)
+ #end
+#end
+
+ ## Insert a image for portlets and panes!
+ #set ($FF=false)
+ #foreach ($entr in $runs)
+ #if ($entr.parent == $entry.Parent)
+ #set ($FF=true)
+ <img src="images/html/is_portlet.gif" width=14" height="14" border="0" alt="Portlet" hspace="2" /></TD>
+ #end
+ #end
+
+ ## Portlet is not used - use blank image!
+ #if (!$FF)
+ #set ($portletcount = $portletcount + 1)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><img src="images/is_pane.gif" alt="Pane, click for customization" width=14" height="14" border="0" hspace="2" /></a></TD>
+ #end
+
<td valign="top" width="60%">
- <b>#if ($title) $title #else #if ($entry.Parent) $entry.Parent #else Pane $!entry.Name #end #end</b>
+ #if (!$FF)
+ <a href="$link.setAction("controls.Customize")?portlet=$portletcount"><b>$title</b></a>
+ #else
+ <b>$title</b>
+ #end
</td>
<td valign="top" align="center" width="40%">
<form action="$jlink" method="post">
@@ -28,12 +63,21 @@
</form>
</td>
</tr>
+#end
+#if ($!COUNTI="0")
+ <tr><td colspan=3>No entries!<br/><br/></td></tr>
#end
- <tr height="50">
- <td colspan="2" align="right" valign="middle" height="50">
+ <tr>
+ <td colspan="3" align="right" valign="middle">
+
<form action="$jlink" method="post">
-#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
- <input type="submit" name="eventSubmit_doApply" value="Done" />
+ <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
+ <tr><td align="right">
+ #if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action" class="BUTON"/> #end
+ <input type="submit" name="eventSubmit_doApply" value="Apply" class="BUTON"/>
+ <input type="submit" name="eventSubmit_doCancel" value="Cancel" class="BUTON"/>
+ </td></tr>
+ </table>
</form>
</td>
</tr>
1.2 +20 -4 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/wml/column.vm
Index: column.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/wml/column.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- column.vm 2001/09/13 06:22:15 1.1
+++ column.vm 2001/12/06 06:03:40 1.2
@@ -1,8 +1,24 @@
-<card title="Jetspeed WML">
- <p>
- #foreach ( $portlet in $portlets )
- <a href="#_$!portlet.Name">$!portlet.Title</a><br/>
+##modified: Andreas Kempf, 11/15/01
+##---------------------------------
+<card title="User Home">
+ #parse("welcome.vm")
+ <p><br/>
+ #foreach ( $portlet in $portlets )
+#set ($img="")
+#set ($img=$!portlet.getPortletConfig().getInitParameter("imgwml"))
+#if ((!$img) || ($img==""))
+ #set ($img="bullet.wbmp")
+#end
+## Insert external link
+#set ($newlink=$!portlet.getPortletConfig().getInitParameter("isLink"))
+#if ($newlink)
+ <img src="$clink.getExternal()images/wml/$img" alt=""/><a href="$!newlink">$!portlet.Title</a><br/>
+## Insert deck link
+#else
+ <img src="$clink.getExternal()images/wml/$img" alt=""/><a href="#_$!portlet.Name">$!portlet.Title</a><br/>
+#end
#end
+ <img src="$clink.getExternal()images/wml/exit.wbmp" alt=""/><b><a href="$link.setAction("LogoutUser")">Logout</a></b><br/>
</p>
</card>
#foreach ( $portlet in $portlets )
1.3 +1 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/wml/default.vm
Index: default.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/wml/default.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.vm 2001/09/13 06:22:15 1.2
+++ default.vm 2001/12/06 06:03:40 1.3
@@ -4,6 +4,6 @@
<wml>
$navigation.setTemplate("wml/top.vm")
- $screen_placeholder
+ $navigation.setTemplate("wml/login.vm")
$navigation.setTemplate("wml/bottom.vm")
</wml>
1.5 +59 -27 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- top.vm 2001/11/25 20:50:18 1.4
+++ top.vm 2001/12/06 06:03:40 1.5
@@ -1,47 +1,79 @@
<div>
#if ($data.User.hasLoggedIn())
-<table cellspacing="2" border="0">
+<table cellspacing="2" border="0" width="100%">
+<tr valign=top>
+ <td align="left" width="100%">
+ <FONT class=welcome>$l10n.TOP_TITLE</font><br/>
+## <sup>Logged in since: $!data.getUser().getLastLogin()</sup>
+ </td>
+ <td align=center>
+ <table cellpadding=1 cellspacing=3 border=0 width=100%>
+ <tr>
+ <td align=center class=MENUBUTTON><NOBR> <a href="mailto:$!config.getString("mail.support")" tabindex="4">Contact</a> </NOBR></td>
+ <td align=center class=MENUBUTTON><NOBR> <a href="$link" tabindex="4">$l10n.HOME</a> </NOBR></td>
+ </tr>
+ </table>
+ </td>
+</tr>
<tr>
- <td align="center">
- $l10n.TOP_TITLE<a href="$link">$l10n.HOME</a> <br />
- <!-- this is a temporary link while the profile customization is not in place -->
- <a href="$link.setAction("controls.Customize")">$l10n.TOP_CUSTOMIZE</a>
-
- <a href="$link.setPage("EditAccount")">$l10n.TOP_EDITACCOUNT ($data.User.UserName)</a>
-
- <a href="$link.setAction("LogoutUser")">$l10n.TOP_LOGOUT</a>
-
+ <td colspan=2 >
+ <table cellpadding=1 cellspacing=3 border=0 CLASS=MENUBAR width=100%>
+ <tr>
+ <td align=center class=MENUBUTTON><a href="$link.setAction("controls.Customize")?reset=on">$l10n.TOP_CUSTOMIZE HTML</a></td>
+ <td align=center class=MENUBUTTON><a href="$link.setAction("controls.Customize")?reset=on&mtype=wml">$l10n.TOP_CUSTOMIZE WML</a></td>
+ <td align=center class=MENUBUTTON><a href="$link.setPage("EditAccount")">$l10n.TOP_EDITACCOUNT ($data.User.UserName)</a></td>
+ <td align=center class=MENUBUTTON><a href="$link.setAction("LogoutUser")">$l10n.TOP_LOGOUT</a></td>
+ </tr>
+ </table>
</td>
</tr>
</table>
+<HR size=1 color=NAVY>
#else
-<table cellspacing="2" border="0">
-<tr>
- <td valign="middle">
- $l10n.TOP_TITLE<a href="$link">$l10n.HOME</a><br />
- <small><a href="$link.setPage("NewAccount")">$l10n.TOP_CREATENEWACCOUNT</a></small>
+
+<table cellspacing="2" border="0" width="100%">
+<tr valign="top">
+ <td>
+ <h2><nobr>$l10n.TOP_TITLE</nobr></h2>
+
+ <table cellpadding=1 cellspacing=3 border=0>
+ <tr>
+ <td>
+ <table cellpadding=1 cellspacing=3 border=0 class=MENUBAR>
+ <tr>
+ <td class=MENUBUTTON><a href="$link.setPage("NewAccount")">$l10n.TOP_CREATENEWACCOUNT</a></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
</td>
- <td valign="middle">
+ <td align="right">
<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>$l10n.USERFORM_USERNAMEMSG</small></td>
- <td><small><input size="10" value="$!data.Parameters.getString("username")" name="username" maxlength="25" type="text" /></small></td>
- </tr>
+ <table border="0" cellspacing="2" cellpadding="1" width="100%" bgcolor=#FFFFFF class=INPUTFORM>
<tr>
- <td><small>$l10n.USERFORM_PASSWORDMSG</small></td>
- <td><small><input size="10" value="" name="password" maxlength="25" type="password" /></small></td>
+ <td>$l10n.USERFORM_USERNAMEMSG </td>
+<!-- for username value: $!data.Parameters.getString("username") -->
+ <td><input size="10" value="" name="username" maxlength="25" type="text" tabindex="1"/></td>
+ <td rowspan=2 align=center><small><input name="submit" type="submit" value="Login" tabindex="3" class="BUTON"/></td>
</tr>
<tr>
- <td colspan="2" align="center">
- <small><input name="submit" type="submit" value="$l10n.TOP_LOGINBTN" /></small>
- </td>
+ <td>$l10n.USERFORM_PASSWORDMSG </small></td>
+ <td><input size="10" value="" name="password" maxlength="25" type="password" tabindex="2"/></td>
</tr>
</table>
</form>
</td>
+ <td align=center>
+ <table cellpadding=1 cellspacing=3 border=0 width=100%>
+ <tr>
+ <td align=center class=MENUBUTTON><NOBR> <a href="$link" tabindex="4">$l10n.HOME</a> </NOBR></td>
+ </tr>
+ </table>
+ </td>
</tr>
-</table>
+</table>
+<HR size=1 color=NAVY>
#end
</div>
1.3 +0 -3 jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/wml/top.vm
Index: top.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/wml/top.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- top.vm 2001/09/13 06:22:15 1.2
+++ top.vm 2001/12/06 06:03:40 1.3
@@ -1,5 +1,2 @@
<template>
- <do type="accept" label="Back">
- <prev/>
- </do>
</template>
1.1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/wml/login.vm
Index: login.vm
===================================================================
#if ($data.User.hasLoggedIn())
$screen_placeholder
#else
<card id="Login">
<p align="center">
#if (!$!data.getMessage())
<b>Welcome at Jetspeed</b><br/>
#else
<b>Jetspeed WAP</b>
#end
</p>
<do type="accept" label="login">
<go href="$link" method="post">
<postfield name="password" value="$(password)" />
<postfield name="username" value="$(username)" />
<postfield name="$jlink.ActionKey" value="$config.getString("action.login")" />
<setvar name="$jlink.ActionKey" value="" />
<setvar name="username" value="" />
<setvar name="password" value="" />
</go>
</do>
#if ($data.getMessage())
<p>$!data.getMessage()</p>
<p align="center">-------</p>
#end
<p>Login:<input name="username" type="text" size="5" value="" emptyok="false" maxlength="25"/></p>
<p>Passwd:<input name="password" type="password" size="5" value="" emptyok="true" maxlength="25"/></p>
</card>
#end
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customizer-portlet.vm 2001/06/25 11:33:51 1.1
+++ customizer-portlet.vm 2001/12/06 06:03:40 1.2
@@ -30,11 +30,11 @@
<tr>
<td align="right">
#if ($parameters.size() > 0)
- <input type="submit" name="eventSubmit_doUpdate" value="Update" />
+ <input type="submit" name="eventSubmit_doUpdate" value="Update" class="BUTON"/>
#end
</td>
<td align="left">
- <input type="submit" name="eventSubmit_doCancel" value="Cancel" />
+ <input type="submit" name="eventSubmit_doCancel" value="Cancel" class="BUTON"/>
</td>
</tr>
</table>
1.2 +69 -18 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customizer-portletset-add.vm 2001/07/22 20:33:26 1.1
+++ customizer-portletset-add.vm 2001/12/06 06:03:40 1.2
@@ -1,14 +1,46 @@
-<form action="$jlink" method="post">
+<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">
+<center>
+<table width="80%" border="1" cellspacing="0">
+<tr><td>
+<table width="100%" border="0" cellspacing="2" 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>
+ <td colspan="2" bgcolor="$!{skin.TitleBackgroundColor}" align="left" class=MENUBUTTON><font color="$!{skin.TitleColor}">Select</font></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}" align="left" class=MENUBUTTON><font color="$!{skin.TitleColor}"><b>Title</b></font></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}" align="left" class=MENUBUTTON><font color="$!{skin.TitleColor}"><b>Description</b></font></td>
</tr>
+##
+#set ($IX="a")
+#set ($COUNTI="0")
#foreach ($portlet in $browser)
- <tr>
- <td><input type="checkbox" name="pname" value="$portlet.Name" /></td>
+#set ($COUNTI="1")
+##Display rows in alternating colors
+#if ($IX=="a")
+ <tr valign=top bgcolor="#FAFAFA">
+#set ($IX="b")
+#else
+ <tr valign=top bgcolor="#F0F0F0">
+#set ($IX="a")
+#end
+
+ <td align="center">
+
+ ## Insert a image for already used portlets!
+ #set ($FF="")
+ #foreach ($entry in $runs)
+ #if ($entry.parent == $portlet.Name)
+ #set ($FF="checked")
+ <img src="images/ok.gif" width=14" height="14" border="0" VSpace="2" alt="active" /></TD><TD align="center">
+ #end
+ #end
+
+ ## Portlet is not used - use blank image!
+ #if ($FF!="checked")
+ <img src="images/blank.gif" width=14" height="2" border="0" /></TD><TD align="center">
+ #end
+
+ ## Display checkbox for portlet selection
+ <input type="checkbox" name="pname" value="$portlet.Name" $FF /></td>
<td valign="top" align="left">
#if ($portlet.Title) $portlet.Title #else $portlet.Name #end
</td>
@@ -17,20 +49,39 @@
</td>
</tr>
#end
+#if ($COUNTI=="0")
+ <tr><td colspan=4>No entries available!</td></tr>
+#end
+##
</table>
-<table width="80%" align="center" cellspacing="1" cellpadding="0">
- <tr>
- <td align="center">
+</td></tr>
+</table>
+</center>
+<br/><br/>
+<table cellpadding="1" cellspacing="3" border="0" width="100%" class=MENUBAR>
+<tr>
+ <td align="center" class=MENUBUTTON>
#if ($prev)
- <a href="$jlink.addPathInfo("start",$prev)"><< Prev</a>
+ <a href="$jlink.addPathInfo("start",$prev)"><nobr> << Prev </nobr></a>
+#else
+<nobr> << Prev </nobr>
#end
+ </td><td align="center" class=MENUBUTTON>
#if ($next)
- <a href="$jlink.addPathInfo("start",$next)">Next >></a>
+ <a href="$jlink.addPathInfo("start",$next)"><nobr> Next >> </nobr></a>
+#else
+<nobr> Next >> </nobr>
#end
- </td>
- <td align="right">
- <input type="submit" name="eventSubmit_doAdd" value="Add" />
- </td>
- </tr>
+ </td>
+ <td align="center" width="70%"> </td>
+ <td align="left">
+#if (($!mtype=="wml") || ($!mtype=="WML"))
+ <input type="submit" name="eventSubmit_doAdd" value="Add & Save" class="BUTON"/>
+#else
+ <input type="submit" name="eventSubmit_doAdd" value="Add" class="BUTON"/>
+#end
+ </td>
+</tr>
</table>
-</form>
\ No newline at end of file
+
+
1.2 +16 -7 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customizer-portletset-addset.vm 2001/07/22 20:33:26 1.1
+++ customizer-portletset-addset.vm 2001/12/06 06:03:40 1.2
@@ -1,16 +1,25 @@
+## This file has been modified by Andreas Kempf, mailto: A.Kempf@web.de
+## Date: 10/31/01
+## Changes:
+## + Added CSS Styles
+## --------------------------------------------------------------------
<form action="$jlink" method="post">
#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
-<table width="100%" cellspacing="1" cellpadding="0">
- <tr>
+<table width="100%" cellspacing="0" cellpadding="0">
+ <tr valign="center">
<td width="100%">
- Type the name of the pane to add:
- <br />
- <input type="text" name="title" value="">
+ <br/>Type the name of the pane to add:<br /><input type="text" name="title" value=""><br/><br/><br/>
</td>
</tr>
- <tr>
+ <tr valign="bottom">
<td align="right">
- <input type="submit" name="eventSubmit_doAddset" value="Add" />
+
+ <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
+ <tr><td align="right">
+ <input type="submit" name="eventSubmit_doAddset" value="Add" class="BUTON"/>
+ </td></tr>
+ </table>
+
</td>
</tr>
</table>
1.2 +9 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customizer-portletset-general.vm 2001/07/22 20:33:26 1.1
+++ customizer-portletset-general.vm 2001/12/06 06:03:40 1.2
@@ -1,17 +1,18 @@
<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>
+ <tr valign="center">
<td>
- Set a title for this pane :<br />
- <input type="text" name="title" value="$!set.Title" />
+ <br/>Set a title for this pane:<br/><input type="text" name="title" value="$!set.Title" /><br/><br/><br/>
</td>
</tr>
- <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" />
+ <tr valign="bottom">
+ <td valign="middle" align="right">
+ <table cellpadding="3" cellspacing="1" border="0" width="100%" class=MENUBAR>
+ <tr><td align="right">
+ <input type="submit" name="eventSubmit_doSave" value="Save" class="BUTON"/> <input type="submit" name="eventSubmit_doApply" value="Save & Apply" class="BUTON"/>
+ </td></tr>
+ </table>
</td>
</tr>
</table>
1.3 +35 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- customizer-portletset-layout.vm 2001/07/23 21:45:54 1.2
+++ customizer-portletset-layout.vm 2001/12/06 06:03:40 1.3
@@ -1,3 +1,9 @@
+## This file has been modified by Andreas Kempf, mailto: A.Kempf@web.de
+## Date: 10/31/01
+## Changes:
+## + Added CSS Styles
+## + Disabled controller and skin selection for wml customization!
+## --------------------------------------------------------------------
<table width="100%" cellspacing="0" cellpadding="0">
<tr>
#if ($controllers)
@@ -6,13 +12,27 @@
#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
<input type="hidden" name="eventSubmit_doLayout" value="layout" />
Layout :
+
+
+## No Controller-Selection for WML Profiles
+#if (($!mtype=="wml") || ($!mtype=="WML"))
+ <select name="controller" onChange="document.controllers.submit()" disabled>
+#else
<select name="controller" onChange="document.controllers.submit()">
+#end
+
+
#foreach ($controller in $controllers)
<option value="$controller.Name" #if ($controller.Name == $currentController) SELECTED #end>
#if ($controller.Title) $controller.Title #else $controller.Name #end
#end
</select>
- <input type="submit" value="OK" />
+## No submit-Button for WML Profiles
+#if (($!mtype=="wml") || ($!mtype=="WML"))
+ <input type="submit" value="OK" disabled class="BUTON"/>
+#else
+ <input type="submit" value="OK" class="BUTON"/>
+#end
</form>
</td>
<td width="2"></td>
@@ -29,7 +49,7 @@
#if ($control.Title) $control.Title #else $control.Name #end
#end
</select>
- <input type="submit" value="OK" />
+ <input type="submit" value="OK" class="BUTON"/>
</form>
</td>
<td width="2"></td>
@@ -40,13 +60,25 @@
#if ($action) <input name="$jlink.ActionKey" type="hidden" value="$action" /> #end
<input type="hidden" name="eventSubmit_doSkin" value="skin" />
Colors :
+
+## No Controller-Selection for WML Profiles
+#if (($!mtype=="wml") || ($!mtype=="WML"))
+ <select name="skin" onChange="document.skins.submit()" disabled>
+#else
<select name="skin" onChange="document.skins.submit()">
+#end
#foreach ($skin in $skins)
<option value="$skin.Name" #if ($skin.Name == $currentSkin) SELECTED #end>
#if ($skin.Title) $skin.Title #else $skin.Name #end
#end
</select>
- <input type="submit" value="OK" />
+
+## No submit-Button for WML Profiles
+#if (($!mtype=="wml") || ($!mtype=="WML"))
+ <input type="submit" value="OK" disabled class="BUTON"/>
+#else
+ <input type="submit" value="OK" class="BUTON"/>
+#end
</form>
</td>
#end
1.6 +32 -10 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- customizer-portletset.vm 2001/07/23 21:45:54 1.5
+++ customizer-portletset.vm 2001/12/06 06:03:40 1.6
@@ -1,18 +1,40 @@
-<table width="100%" cellspacing="0" cellpadding="0">
+<table width="100%" cellspacing="3" cellpadding="1" border="0" class=MENUBAR>
<tr>
- <td align="left" nowrap>
- <a href="$jlink.addPathInfo("mode","layout")">Layout</a>
- |
-#if ($allowportlet)
+ <td align="center" nowrap width="20%" class=UPPERCASE>
+## Show customizer content-type
+ $!mtype
+ </td>
+ <td align="center" nowrap class=MENUBUTTON width="20%">
+ <a href="$jlink.addPathInfo("mode","layout")">Layout</a>
+ </td>
+ <td nowrap align="center" class=MENUBUTTON width="20%">
+#if ($allowportlet=="true")
<a href="$jlink.addPathInfo("mode","add")">Add portlet</a>
- |
-#end
-#if ($allowpane)
+#else
+ -
+#end
+ </td>
+ <td nowrap align="center" class=MENUBUTTON width="20%">
+#if ($allowpane=="true")
<a href="$jlink.addPathInfo("mode","addset")">Add pane</a>
- |
-#end
+#else
+ -
+#end
+ </td>
+ <td nowrap align="center" class=MENUBUTTON width="20%">
+#if ($allowproperties=="true")
<a href="$jlink.addPathInfo("mode","general")">Properties</a>
+#else
+ -
+#end
+ </td>
+ </tr>
+#if ($panename && $panename!="*")
+ <tr>
+ <td colspan=5 class=PANETITLE>
+ <img src="images/is_pane.gif" alt="Selected pane" width=14" height="14" border="0" hspace="2" /> $!panename <small>[edit pane]</small>
</td>
</tr>
+#end
</table>
#parse ($feature)
1.6 +31 -17 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfirmRegistration.vm 2001/11/24 00:42:19 1.5
+++ ConfirmRegistration.vm 2001/12/06 06:03:40 1.6
@@ -7,23 +7,37 @@
<input name="password" type="hidden" value="$!data.Parameters.getString("password")" />
<input name="$jlink.ActionKey" type="hidden" value="$config.getString("action.login")" />
- <p>$l10n.CONFIRMREGISTRATION_MESSAGE</p>
- <table cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td> Secret Key: </td>
- <td align="right">
- <input name="secretkey" type="TEXT" value="" />
- </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2" align="right">
- <input name="reset" type="reset" value="Reset" />
- <input name="submit2" type="submit" value="Confirm Registration" />
- </td>
- </tr>
+ <center>
+ <table cellpadding="4" cellspacing="0" border="1" class=INPUTFORM>
+ <tr>
+ <td class=INPUTFORMTITLE>$l10n.CONFIRMREGISTRATION_MESSAGE $!data.Parameters.getString("username")</td>
+ </tr>
+ <tr>
+ <td>
+ <p>Please enter your secret key to confirm your registration:</p>
+ <center>
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td> Secret Key: </td>
+ <td align="right">
+ <input name="secretkey" type="TEXT" value="" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td align="left">
+ <input name="reset" type="reset" value="Reset" class="BUTON" />
+ </td><td align="right">
+ <input name="submit2" type="submit" value="Confirm Registration" class="BUTON" />
+ </td>
+ </tr>
+ </table>
+ </center>
+ </td>
+ </tr>
</table>
+ </center>
</form>
</div>
1.5 +18 -13 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditAccount.vm 2001/11/25 20:50:19 1.4
+++ EditAccount.vm 2001/12/06 06:03:40 1.5
@@ -5,50 +5,55 @@
enctype="application/x-www-form-urlencoded">
<input name="$jlink.ActionKey" type="hidden" value="UpdateAccount" />
<input name="username" type="hidden" value="$!data.User.UserName" />
- <table cellpadding="4" cellspacing="0" border="0">
+ <center>
+ <table cellpadding="4" cellspacing="1" border="0" class=INPUTFORM>
<tr>
+ <td class=INPUTFORMTITLE>$l10n.EDITACCOUNT_TITLE</td>
+ </tr>
+ <tr>
<td>
- <h2><u>$l10n.EDITACCOUNT_TITLE</u></h2>
#if ($data.Message)
<p><b>$data.Message</b></p>
#end
<table cellpadding="0" cellspacing="0" border="0">
<tr>
<td> $l10n.USERFORM_USERNAMEMSG </td>
- <td> $data.User.UserName </td>
+ <td>$data.User.UserName </td>
</tr>
<tr>
<td> $l10n.USERFORM_PASSWORDMSG </td>
- <td> <input name="password" type="PASSWORD" value="" /> </td>
+ <td align=right><input name="password" type="PASSWORD" value="" /> </td>
</tr>
<tr>
- <td> $l10n.USERFORM_PASSWORDCONFIRMMSG </td>
- <td> <input name="password_confirm" type="PASSWORD" value="" /> </td>
+ <td> $l10n.USERFORM_PASSWORDCONFIRMMSG </td>
+ <td align=right><input name="password_confirm" type="PASSWORD" value="" /> </td>
</tr>
<tr>
<td colspan="2"> <hr size="1" noshade /> </td>
</tr>
<tr>
<td> $l10n.USERFORM_FIRSTNAMEMSG </td>
- <td> <input name="firstname" type="TEXT" value="$!data.User.FirstName" /> </td>
+ <td align=right><input name="firstname" type="TEXT" value="$!data.User.FirstName" /> </td>
</tr>
<tr>
<td> $l10n.USERFORM_LASTNAMEMSG </td>
- <td> <input name="lastname" type="TEXT" value="$!data.User.LastName" /> </td>
+ <td align=right><input name="lastname" type="TEXT" value="$!data.User.LastName" /> </td>
</tr>
<tr>
<td> $l10n.USERFORM_EMAILMSG </td>
- <td> <input name="email" type="TEXT" value="$!data.User.Email" /> </td>
+ <td align=right><input name="email" type="TEXT" value="$!data.User.Email" /> </td>
+ </tr>
+ <tr>
+ <td colspan=2> </td>
</tr>
<tr>
- <td colspan="2" align="right">
- <input name="cancelBtn" type="submit" value="$l10n.USERFORM_CANCEL" />
-
- <input name="submit2" type="submit" value="$l10n.USERFORM_UPDATE" />
+ <td align=left><input name="cancelBtn" type="submit" value="$l10n.USERFORM_CANCEL" class="BUTON"/></td>
+ <td align=right><input name="submit2" type="submit" value="$l10n.USERFORM_UPDATE" class="BUTON"/></td>
</td>
</tr>
</table>
</td>
</table>
+ </center>
</form>
</div>
1.6 +43 -40 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NewAccount.vm 2001/11/25 20:50:19 1.5
+++ NewAccount.vm 2001/12/06 06:03:40 1.6
@@ -1,12 +1,9 @@
<div align="left">
- <form accept-charset="UTF-8, ISO-8859-1"
- method="POST"
- 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">
- <tr>
+ <center>
+ <table cellpadding="4" cellspacing="0" border="1" class=INPUTFORM>
+ <tr>
<td>
+ <p>
<h2>$l10n.NEWACCOUNT_TITLE</h2>
<p>$l10n.NEWACCOUNT_NOTICE<br />
#if ( $config.getString("new.user.approval") != "on" )
@@ -22,43 +19,49 @@
<b>$data.Message</b>
<p />
#end
+ <form accept-charset="UTF-8, ISO-8859-1" method="POST" action="$link.setPage("ConfirmRegistration")" enctype="application/x-www-form-urlencoded">
+ <input name="$jlink.ActionKey" type="hidden" value="CreateNewUserAndConfirm" />
+
+ <center>
<table cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td> $l10n.USERFORM_USERNAMEMSG </td>
- <td> <input name="username" type="TEXT" value="$!data.Parameters.getString("username")" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_PASSWORDMSG </td>
- <td> <input name="password" type="PASSWORD" value="" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_PASSWORDCONFIRMMSG </td>
- <td> <input name="password_confirm" type="PASSWORD" value="" /> </td>
- </tr>
- <tr>
- <td colspan="2"> <hr size="1" noshade /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_FIRSTNAMEMSG </td>
- <td> <input name="firstname" type="TEXT" value="$!data.Parameters.getString("firstname")" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_LASTNAMEMSG </td>
- <td> <input name="lastname" type="TEXT" value="$!data.Parameters.getString("lastname")" /> </td>
- </tr>
- <tr>
- <td> $l10n.USERFORM_EMAILMSG </td>
- <td> <input name="email" type="TEXT" value="$!data.Parameters.getString("email")" /> </td>
- </tr>
- <tr>
- <td colspan="2" align="right">
- <input name="submit1" type="reset" value="$l10n.USERFORM_RESET" />
-
- <input name="submit2" type="submit" value="$l10n.USERFORM_CREATE" />
- </td>
+ <tr>
+ <td> $l10n.USERFORM_USERNAMEMSG </td>
+ <td align=right><input name="username" type="TEXT" value="$!data.Parameters.getString("username")" /> </td>
+ </tr>
+ <tr>
+ <td> $l10n.USERFORM_PASSWORDMSG </td>
+ <td align=right><input name="password" type="PASSWORD" value="" /> </td>
+ </tr>
+ <tr>
+ <td> $l10n.USERFORM_PASSWORDCONFIRMMSG </td>
+ <td align=right><input name="password_confirm" type="PASSWORD" value="" /> </td>
+ </tr>
+ <tr>
+ <td colspan="2"> <hr size="1" noshade /> </td>
+ </tr>
+ <tr>
+ <td> $l10n.USERFORM_FIRSTNAMEMSG </td>
+ <td align=right><input name="firstname" type="TEXT" value="$!data.Parameters.getString("firstname")" /> </td>
+ </tr>
+ <tr>
+ <td> $l10n.USERFORM_LASTNAMEMSG </td>
+ <td align=right><input name="lastname" type="TEXT" value="$!data.Parameters.getString("lastname")" /> </td>
+ </tr>
+ <tr>
+ <td> $l10n.USERFORM_EMAILMSG </td>
+ <td align=right><input name="email" type="TEXT" value="$!data.Parameters.getString("email")" /> </td>
+ </tr>
+ <tr>
+ <td colspan=2> </td>
+ </tr>
+ <tr>
+ <td align=left><input name="submit1" type="reset" value="$l10n.USERFORM_RESET" class="BUTON"/></td>
+ <td align=right><input name="submit2" type="submit" value="$l10n.USERFORM_CREATE" class="BUTON"/></td>
</tr>
</table>
+ </center>
</td>
</table>
+ </center>
</form>
</div>
1.8 +93 -2 jakarta-jetspeed/webapp/css/default.css
Index: default.css
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/css/default.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.css 2001/11/28 10:57:29 1.7
+++ default.css 2001/12/06 06:03:40 1.8
@@ -1,6 +1,6 @@
{background: white}
- BODY {font-family: "Verdana"; font-size: 9pt; color: 000000}
+ BODY {font-family: "Verdana"; font-size: 9pt; color: 000000; margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px}
TD {font-family: "Verdana"; font-size: 9pt; color: 000000}
TR {font-family: "Verdana"; font-size: 9pt; color: 000000}
FONT {font-family: "Verdana"; font-size: 9pt; color: 000000}
@@ -8,7 +8,8 @@
BIG {font-family: "Verdana"; font-size: 13pt; color: 000000;font-weight: bold}
TH {font-family: "Verdana"; font-size: 9pt; color: 000000;font-weight: bold}
A:link {font-family: "Verdana"; font-size: 10pt; color: NAVY;font-weight: bold}
- A:visited {font-family: "Verdana"; font-size: 10pt; color: BLACK;font-weight: bold}
+ A:visited {font-family: "Verdana"; font-size: 10pt; color: NAVY;font-weight: bold}
+ A:hover {font-family: "Verdana"; font-size: 10pt; color: BLUE;font-weight: bold}
H1 {font-family: "Arial"; font-size: 30pt; color: navy;}
STRONG {font-family: "Verdana"; font-size: 9pt; color: 000000;text-decoration: none; margin-left=0}
H2 {font-family: "Verdana"; font-size: 12pt; color: 000000;text-decoration: none; margin-left=0}
@@ -137,3 +138,93 @@
font-weight: normal;
padding: 0;
}
+
+.UPPERCASE {
+ text-transform: uppercase;
+}
+
+
+.WELCOME {
+ font-size: 12pt;
+ font-color: #000000;
+ font-weight: 900;
+ font-stretch: wider;
+}
+
+
+.MENUBAR {
+ font-family: arial,helvetica;
+ background: #F5F5F5;
+ color: #000000;
+ font-size: 11pt;
+ font-weight: bold;
+
+ border-top: 1px solid #B0B0B0;
+ border-left: 1px solid #B0B0B0;
+ border-right: 1px solid #FAFAFA;
+ border-bottom: 1px solid #FAFAFA;
+ }
+
+.INPUTFORM {
+ font-family: arial,helvetica;
+ background: #F0F0F0;
+ color: #000000;
+ font-size: 11pt;
+ font-weight: bold;
+
+ border-top: 1px solid #A0A0A0;
+ border-left: 1px solid #A0A0A0;
+ border-right: 1px solid #FFFFFF;
+ border-bottom: 1px solid #FFFFFF;
+ }
+
+.INPUTFORMTITLE {
+ font-family: arial,helvetica;
+ background: #FAFAFA;
+ color: #000000;
+ font-size: 13pt;
+ font-weight: bold;
+
+ border-top: 1px solid #FFFFFF;
+ border-left: 1px solid #FFFFFF;
+ border-right: 1px solid #0A0A0A;
+ border-bottom: 1px solid #0A0A0A;
+ }
+
+.MENUBUTTON {
+ font-family: arial,helvetica;
+ background: #E0E0E0;
+ color: #808080;
+ font-size: 10pt;
+ font-weight: bold;
+
+ border-top: 1px solid #FFFFFF;
+ border-left: 1px solid #FFFFFF;
+ border-right: 1px solid #A0A0A0;
+ border-bottom: 1px solid #A0A0A0;
+ }
+
+.PANETITLE {
+ background: #FAFAFA;
+ font-weight: bold;
+
+ border-top: 1px solid #BABABA;
+ border-left: 1px solid #BABABA;
+ border-right: 1px solid #BABABA;
+ border-bottom: 1px solid #BABABA;
+ }
+
+.BUTON
+{
+ font-family: arial,helvetica;
+ background: #E0E0E0;
+ color: NAVY;
+ font-size: 10pt;
+ font-weight: bold;
+ border-color: #050505;
+ border-top: 1pt double #FFFFFF;
+ border-left: 1pt double #FFFFFF;
+ border-right: 1pt double #A0A0A0;
+ border-bottom: 1pt double #A0A0A0;
+}
+
1.1 jakarta-jetspeed/webapp/images/blank.gif
<<Binary file>>
1.1 jakarta-jetspeed/webapp/images/is_pane.gif
<<Binary file>>
1.1 jakarta-jetspeed/webapp/images/ok.gif
<<Binary file>>
1.1 jakarta-jetspeed/webapp/images/html/is_portlet.gif
<<Binary file>>
1.1 jakarta-jetspeed/webapp/images/wml/bullet.wbmp
<<Binary file>>
1.1 jakarta-jetspeed/webapp/images/wml/exit.wbmp
<<Binary file>>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>