I made some changes to the Velocity templates to restore
some of the JR/TR.props references that had been hard-coded in.
(header logo, welcome message, login message, footer logo, stylesheet).

I also moved the header logo from default.vm to top.vm
as it seems the more appropriate place for it.

I'm just starting to investigate Velocity, so I'm not sure if I'm
even implementing it correctly. But the diffs do seem to work.
Any comments/critiques would be appreciated.

Mike


Index: jetspeed/webapp/WEB-INF/templates/vm/layouts/html/default.vm
===================================================================
RCS file:
/products/cvs/jetspeed/jetspeed/webapp/WEB-INF/templates/vm/layouts/html/default.vm,v

retrieving revision 1.1
diff -r1.1 default.vm
4c4
<     <link href="$clink.setURI("css/default.css").Absolute"
type="text/css" rel="stylesheet" />
---
>     <link
href="$clink.setURI($config.getString("site.stylesheet")).Absolute"
type="text/css" rel="stylesheet" />
8,9c8
<       <tr>
<         <td><img
src="$clink.setURI("images/jetspeed-logo.gif").Absolute" /></td>
---
>       <tr>
31c30
< </html>
\ No newline at end of file
---
> </html>
Index: jetspeed/webapp/WEB-INF/templates/vm/navigations/html/bottom.vm
===================================================================
RCS file:
/products/cvs/jetspeed/jetspeed/webapp/WEB-INF/templates/vm/navigations/html/bottom.vm,v

retrieving revision 1.1
diff -r1.1 bottom.vm
2,3c2,4
<   <img align="right" src="$clink.setURI("images/feather.gif")" />
<   <font size="-2">
---
>
>   <img align="right"
src="$clink.setURI($config.getString("site.footer.logo"))" />
>   <font size="-1">
7c8
< </p>
\ No newline at end of file
---
> </p>
Index: jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm
===================================================================
RCS file:
/products/cvs/jetspeed/jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm,v

retrieving revision 1.1
diff -r1.1 top.vm
2c2,5
<   Welcome to Jetspeed -> <a href="$jlink">Home</a>  <br />
---
>   <img align="left"
src="$clink.setURI($config.getString("site.header.logo"))">
>   <font size="+1">$config.getString("site.header.welcome")</font>
>   <br />
>   <a href="$jlink">Home</a>  <br />
11c14
<   <a href="$jlink.setPage("Login.vm")">Please login to Jetspeed</a>
---
>   <a
href="$jlink.setPage("Login.vm")">$config.getString("login.message")</a>






--
--------------------------------------------------------------
To subscribe:        [EMAIL PROTECTED]
To unsubscribe:      [EMAIL PROTECTED]
Search: <http://www.mail-archive.com/jetspeed@list.working-dogs.com/>
List Help?:          [EMAIL PROTECTED]

Reply via email to