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 pa...@apache.org on 2001/12/16 08:11:31 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html bottom.vm top.vm
paulsp 01/12/15 23:11:31
Modified: src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization.properties
JetspeedLocalization_de.properties
JetspeedLocalization_en.properties
JetspeedLocalization_es.properties
JetspeedLocalization_fr.properties
webapp/WEB-INF/conf JetspeedResources.properties
webapp/WEB-INF/templates/vm/layouts/html default.vm
webapp/WEB-INF/templates/vm/navigations/html bottom.vm
top.vm
Log:
o Returned 1.3a1 look to navigation bars
o Moved logo from default.vm to top.vm
o Added parameter to define logo, either as a local file or a URL
o Added navigation bar enable/disable parameters JR.p
o Added "UserLogin and UserCreation from the top navigation bar" parameters
to JR.p
o Added parameter to control the width of the left navigation bar to JR.p
o Move support email from top.vm to bottom.vm; and only if mail.support is defined.
o Added alt text to images in navigation bars
o Added documentation to top.vm
o Made related changes to the localization files
Revision Changes Path
1.4 +3 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization.properties
Index: JetspeedLocalization.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedLocalization.properties 2001/11/25 20:45:24 1.3
+++ JetspeedLocalization.properties 2001/12/16 07:11:31 1.4
@@ -71,7 +71,9 @@
Enter the confirmation key that you received in the email on the next screen in order to confirm your registration with the system. <br />
NEWACCOUNT_APPROVAL=After your account has been created it will be passed to someone to deal with.
-TOP_TITLE=Welcome to Jetspeed ->
+#Text before user's full name, i.e. Welcome Joe Smith
+TOP_USERWELCOMEMSG=Welcome
+TOP_TITLE=Welcome to Jetspeed
TOP_USERNAMEMSG=Username:
TOP_PASSWORDMSG=Password:
TOP_CREATENEWACCOUNT=Create New Account
1.3 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties
Index: JetspeedLocalization_de.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_de.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLocalization_de.properties 2001/11/25 20:45:24 1.2
+++ JetspeedLocalization_de.properties 2001/12/16 07:11:31 1.3
@@ -71,7 +71,7 @@
EDITACCOUNT_TITLE=Zugang aktualisieren
EDITACCOUNT_NOTLOGGEDIN=Leider m�ssen Sie sich erst anmelden bevor Sie diese Seite aufrufen k�nnen.
-TOP_TITLE=Willkommen bei Jetspeed ->
+TOP_TITLE=Willkommen bei Jetspeed
TOP_CREATENEWACCOUNT=Neue Registrierung
TOP_LOGINBTN=Einw�hlen
MAINMENU_WELCOMEMSG=Willkommen
1.2 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
Index: JetspeedLocalization_en.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedLocalization_en.properties 2001/11/25 20:45:24 1.1
+++ JetspeedLocalization_en.properties 2001/12/16 07:11:31 1.2
@@ -71,7 +71,7 @@
Enter the confirmation key that you received in the email on the next screen in order to confirm your registration with the system. <br />
NEWACCOUNT_APPROVAL=After your account has been created it will be passed to someone to deal with.
-TOP_TITLE=Welcome to Jetspeed ->
+TOP_TITLE=Welcome to Jetspeed
TOP_USERNAMEMSG=Username:
TOP_PASSWORDMSG=Password:
TOP_CREATENEWACCOUNT=Create New Account
1.2 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties
Index: JetspeedLocalization_es.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_es.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedLocalization_es.properties 2001/11/25 20:45:24 1.1
+++ JetspeedLocalization_es.properties 2001/12/16 07:11:31 1.2
@@ -1,4 +1,4 @@
-# $Id: JetspeedLocalization_es.properties,v 1.1 2001/11/25 20:45:24 nacho Exp $
+# $Id: JetspeedLocalization_es.properties,v 1.2 2001/12/16 07:11:31 paulsp Exp $
#
LOCALIZATION_MAINTAINER=nacho@apache.org
@@ -93,7 +93,7 @@
TOP_EDITACCOUNT=Editar Cuenta:
TOP_LOGINBTN=Entrar
TOP_PASSWORDMSG=Contrase\u00F1a:
-TOP_TITLE=Bienvenido a Jetspeed ->
+TOP_TITLE=Bienvenido a Jetspeed
TOP_USERNAMEMSG=Usuario:
TOP_LOGOUT=Salir
TOP_CUSTOMIZE=Modificar
1.4 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties
Index: JetspeedLocalization_fr.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_fr.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedLocalization_fr.properties 2001/11/25 20:45:24 1.3
+++ JetspeedLocalization_fr.properties 2001/12/16 07:11:31 1.4
@@ -70,7 +70,7 @@
EDITACCOUNT_TITLE=Jetspeed - Modification de Compte
EDITACCOUNT_NOTLOGGEDIN=D�sol�, vous devez �tre identifi� afin d'acc�der � cet �cran.
-TOP_TITLE=Bienvenue sur Jetspeed ->
+TOP_TITLE=Bienvenue sur Jetspeed
TOP_CREATENEWACCOUNT=Cr�er un nouveau compte
TOP_LOGINBTN=Identification
MAINMENU_WELCOMEMSG=Bienvenue
1.51 +23 -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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- JetspeedResources.properties 2001/12/06 06:03:39 1.50
+++ JetspeedResources.properties 2001/12/16 07:11:31 1.51
@@ -1,7 +1,7 @@
################################################################################
# Jetspeed Configuration
# Author: Kevin A. Burton (burton@apache.org)
-# $Id: JetspeedResources.properties,v 1.50 2001/12/06 06:03:39 taylor Exp $
+# $Id: JetspeedResources.properties,v 1.51 2001/12/16 07:11:31 paulsp 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.
@@ -423,6 +423,28 @@
newuser.approval.enable=false
newuser.approval.accept.template=new-user-accept.vm
newuser.approval.reject.template=new-user-reject.vm
+
+#########################################
+# Navigation Bar customization #
+#########################################
+# Top navigation bar
+# topnav.logo.file - file name of the logo relative to <jetspeed_home>. Do not use with logo.url
+# topnav.logo.url - URL of logo. Useful when using a common company logo that is on a different server
+# topnav.user_login.enable - Display login prompts on navigation bar. If false then login nust be via login portlet
+# topnav.user_creation.enable - Display "create user" prompts on navigation bar. Requires topnav.user_login.enable=true
+topnav.enable=true
+topnav.logo.file=images/jetspeed-logo.gif
+topnav.logo.url=
+topnav.user_login.enable=true
+topnav.user_creation.enable=true
+
+# Left Navigation bar
+# leftnav.width keeps the left edge of the content from moving as the width of the content varies
+leftnav.enable=true
+leftnav.width=10%
+
+# Bottom Navigation bar
+bottomnav.enable=true
#########################################
# HTTP Page header #
1.4 +7 -2 jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/default.vm
Index: default.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/layouts/html/default.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.vm 2001/11/24 00:45:24 1.3
+++ default.vm 2001/12/16 07:11:31 1.4
@@ -4,22 +4,26 @@
<link href="$clink.setURI("css/default.css").Absolute" type="text/css" rel="stylesheet" />
</head>
<body bgcolor="#ffffff">
+ #if ($config.getBoolean("topnav.enable") == true)
<table cellspacing="0" width="100%" border="0" cellpadding="0">
<tr>
- <td><img src="$clink.setURI("images/jetspeed-logo.gif").Absolute" /></td>
<td>$jnavigation.setTemplate("top.vm")</td>
</tr>
</table>
+ #end
<table cellspacing="0" width="100%" cellpadding="0" border="0">
<tr>
- <td valign="top" bgcolor="#ffffff">
+ #if ($config.getBoolean("leftnav.enable") == true)
+ <td width="$config.getString("leftnav.width")" valign="top" bgcolor="#ffffff">
$jnavigation.setTemplate("left.vm")
</td>
+ #end
<td valign="top">
$screen_placeholder
</td>
</tr>
</table>
+ #if ($config.getBoolean("bottomnav.enable") == true)
<table cellspacing="0" width="100%" cellpadding="0" border="0">
<tr>
<td valign="bottom" bgcolor="#ffffff">
@@ -27,5 +31,6 @@
</td>
</tr>
</table>
+ #end
</body>
</html>
1.5 +20 -7 jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/bottom.vm
Index: bottom.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/bottom.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bottom.vm 2001/12/14 12:30:57 1.4
+++ bottom.vm 2001/12/16 07:11:31 1.5
@@ -1,7 +1,20 @@
-<p>
- <img align="right" src="$clink.setURI("images/feather.gif")" />
- <font size="-2">
- Apache Jetspeed 1.3a3-dev<br />
- © Apache Software Foundation 2001
- </font>
-</p>
\ No newline at end of file
+<br/>
+<table width="100%">
+ <tr>
+ <td align="left">
+ <small>
+ Apache Jetspeed 1.3a2-dev<br/>
+ © Apache Software Foundation 2001
+ </small>
+ #if ($config.getString("mail.support"))
+ <td align="center">
+ <a href="mailto:$config.getString("mail.support")">Support and Additional Information</a>
+ </td>
+ #end
+ <td align="right">
+ <a href="http://www.apache.org">
+ <img align="right" alt="Apache Software Foundation" border="0" src="$clink.setURI("images/feather.gif")" >
+ </a>
+ </td>
+ <tr>
+</table>
1.6 +125 -71 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- top.vm 2001/12/06 06:03:40 1.5
+++ top.vm 2001/12/16 07:11:31 1.6
@@ -1,79 +1,133 @@
+##
+## Calculate the URI for the logo
+##
+#if ($config.getString("topnav.logo.file"))
+ #set ($LogoFile = $config.getString("topnav.logo.file"))
+ #set ($LogoURI = $clink.setURI("$LogoFile").Absolute)
+#else
+ #set ($LogoURI = $config.getString("topnav.logo.url"))
+#end
+
<div>
#if ($data.User.hasLoggedIn())
-<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 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>
+##
+## This is the top naviation bar displayed for a logged in user
+##
+ <table cellspacing="0" border="0" width="100%">
+ <tr valign="center">
+ ##
+ ## Display the company logo with link back to the the portal home page
+ ##
+ <td align="left" width="30%">
+ <a href="$link">
+ <img border="0" alt="$l10n.HOME" src="$LogoURI" />
+ </a>
+ </td>
+ ##
+ ## Display the welcome message. This is typicaly where a Banner AD is displayed
+ ##
+ <td align="center">
+ <h2>$l10n.TOP_TITLE</h2>
+ </td>
+ ##
+ ## Right column of top navigation bar. Here we are displaying the
+ ## user's name, link(s) to page customizers, link to account editor, logout
+ ##
+ <td align="right" valign="bottom" width="30%" >
+ <table cellpadding="0" cellspacing="0" border="0" >
+ <tr>
+ <td align="right" style="font-size:10">
+ $l10n.TOP_USERWELCOMEMSG <b>$!data.User.FirstName $!data.User.LastName</b>
+ </td>
+ <td> </td>
+ </tr>
+ <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>
+ </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>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" style="font-size:10">
+ <a href="$link.setAction("LogoutUser")" style="font-size:10">$l10n.TOP_LOGOUT</a>
+ </td>
+ </tr>
+ ## Leave space between last line and content
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </td>
</tr>
- </table>
- </td>
-</tr>
-</table>
-<HR size=1 color=NAVY>
+ </table>
#else
-
-<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>
+##
+## This is the top naviation bar displayed for the anonymous user, i.e. they are not logged in
+##
+ <table cellspacing="0" border="0" width="100%">
+ <tr valign="center">
+ ##
+ ## Display the company logo with link back to the the portal home page
+ ##
+ <td align="left" width="30%">
+ <a href="$link">
+ <img border="0" alt="$l10n.HOME" src="$LogoURI" />
+ </a>
</td>
- </tr>
- </table>
- </td>
- <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" width="100%" bgcolor=#FFFFFF class=INPUTFORM>
- <tr>
- <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>$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>
+ ##
+ ## Display the welcome message. This is typicaly where a Banner AD is displayed
+ ##
+ <td align="center">
+ <h2>$l10n.TOP_TITLE</h2>
+ </td>
+ ##
+ ## Right column of top navigation bar.
+ ## Optionally allow user login. Required for user creation
+ ## Optionally allow user creation.
+ ##
+ #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")">
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr>
+ <td style="font-size:10">$l10n.USERFORM_USERNAMEMSG</td>
+ <td>
+ <input value="" name="username" maxlength="25" type="text" tabindex="1" style="font-size:10">
+ </td>
+ <td rowspan="2" align="center">
+ <input name="submit" type="submit" value="Login" tabindex="3" style="font-size:10">
+ </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td style="font-size:10">$l10n.USERFORM_PASSWORDMSG</td>
+ <td>
+ <input value="" name="password" maxlength="25" type="password" tabindex="2" style="font-size:10">
+ </td>
+ </tr>
+ #if( $config.getBoolean("topnav.user_creation.enable") == true)
+ <tr>
+ <td align="center" colspan="3">
+ <a href="$link.setPage("NewAccount")" style="font-size:10">$l10n.TOP_CREATENEWACCOUNT</a>
+ </td>
+ </tr>
+ #end
+ ## Leave space between last line and content
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ #end
</tr>
- </table>
- </td>
-</tr>
-</table>
-<HR size=1 color=NAVY>
+ </table>
#end
</div>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>