paulsp 01/11/06 20:08:06
Modified: webapp/WEB-INF/templates/vm/controls/html jetspeed-menu.vm
jetspeed-tab.vm jetspeed.vm
Log:
General cleanup around the use of skins, including:
o Consistently apply the class attribute.
o Only set class and color attributes when the class or color exist in
the skin definition.
o Use the style attribute instead of color and bgcolor attributes.
Revision Changes Path
1.4 +24 -21 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-menu.vm
Index: jetspeed-menu.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-menu.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jetspeed-menu.vm 2001/09/06 16:33:56 1.3
+++ jetspeed-menu.vm 2001/11/07 04:08:06 1.4
@@ -1,3 +1,4 @@
+##<!-- begin jetspeed-menu.vm -->
#if (! $data.Customized )
#if ( ! $tabs )
#parse ("jetspeed.vm")
@@ -6,10 +7,10 @@
#if (!$width)
#set ($width = "20%" )
#end
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-<tr>
- <td valign="top" width="$width">
- <table cellspacing="0" border="0" cellpadding="0">
+<table cellpadding="0" cellspacing="0" border="0" width="100%" #if (${skin.PortletStyleClass})
class="$skin.PortletStyleClass" #end>
+ <tr>
+ <td valign="top" width="$width" >
+ <table cellspacing="0" border="0" cellpadding="0" width="100%" #if (${skin.TabStyleClass})
class="$skin.TabStyleClass" #end>
#foreach ( $tab in $tabs )
#if ($tab.isSelected() )
#set ($bgcolor = $!{skin.HighlightBackgroundColor} )
@@ -18,27 +19,29 @@
#set ($bgcolor = $!{skin.TitleBackgroundColor} )
#set ($color = $!{skin.TitleTextColor} )
#end
- <tr>
- <td valign="middle" bgcolor="$bgcolor">
- <b><a #if ($tab.Link && ($tab.isSelected() == false)) href="$tab.Link"
#end style="color:$color">$tab.Title</a> </b>
- </td>
- </tr>
+ <tr>
+ <td valign="middle" #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}"
#end #if (${bgcolor}) style="background-color:$bgcolor" #end >
+ <b><a #if ($tab.Link && ($tab.isSelected() == false)) href="$tab.Link"
#end #if (${color}) style="color:$color" #end>$tab.Title</a></b>
+ </td>
+ </tr>
#end
- <tr>
- <td valign="bottom" align="right">
+ <tr>
+ <td valign="bottom" align="right">
#foreach ( $action in $actions )
- <a href="${action.Link}"><img src="images/${action.Name}.gif" border="0"></a>
+ <a href="${action.Link}" title="${action.Name}"><img src="images/${action.Name}.gif"
alt="${action.Name}" border="0"></a>
#end
- </td>
- </tr>
- </table>
- </td>
- <td valign="top" bgcolor="$!{skin.BackgroundColor}">
- $portlet.getContent($data)
- </td>
-</tr>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td width="2" #if (${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}"
#end ><img height="2" width="2" src="images/dot.gif" /></td>
+ <td valign="top" #if (${skin.ContentStyleClass}) class="$skin.ContentStyleClass"
#end #if (${skin.BackgroundColor}) style="background-color:${skin.BackgroundColor}" #end >
+ $portlet.getContent($data)
+ </td>
+ </tr>
</table>
#end
#else
$portlet.getContent($data)
-#end
\ No newline at end of file
+#end
+##<!-- end jetspeed-menu.vm -->
1.5 +56 -51 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-tab.vm
Index: jetspeed-tab.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed-tab.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetspeed-tab.vm 2001/09/06 11:37:37 1.4
+++ jetspeed-tab.vm 2001/11/07 04:08:06 1.5
@@ -1,57 +1,62 @@
+##<!-- begin jetspeed-tab.vm -->
#if (! $data.Customized )
-#if ( ! $tabs )
-#parse ("jetspeed.vm")
-#else
-<table cellpadding="0" cellspacing="0" border="0" width="100%" class="$!{skin.TabStyleClass}">
-<tr>
- <td valign="top">
- <table align="left" cellspacing="0" border="0" cellpadding="0" class="$!{skin.TabTitleStyleClass}">
- <tr width="100%">
-#foreach ( $tab in $tabs )
-#if ($tab.isSelected() )
- #set ($bgcolor = $!{skin.HighlightBackgroundColor} )
- #set ($color = $!{skin.HighlightTextColor} )
-#else
- #set ($bgcolor = $!{skin.TitleBackgroundColor} )
- #set ($color = $!{skin.TitleTextColor} )
-#end
- <td valign="middle" bgcolor="$bgcolor">
- <b><a #if ($tab.Link && ($tab.isSelected() == false)) href="$tab.Link"
#end style="color: $color;">$tab.Title</a> </b>
-#foreach ($action in $tab.Actions)
- <a href="${action.Link}" title="${action.Name}"><img src="images/${action.Name}.gif"
border="0"></a>
-#end
- </td>
- <td width="2"> </td>
-#end
- </tr>
- </table>
- <table align="right" cellspacing="0" border="0" cellpadding="0">
- <tr width="100%">
- <td align="right" nowrap="true" valign="middle">
-#foreach ( $action in $actions )
- <a href="${action.Link}" title="${action.Name}"><img src="images/${action.Name}.gif"
border="0"></a>
-#end
- </td>
- </tr>
- </table>
- </td>
-</tr>
+ #if ( ! $tabs )
+ #parse ("jetspeed.vm")
+ #else
+<table cellpadding="0" cellspacing="0" border="0" width="100%" #if (${skin.TabStyleClass})
class="${skin.TabStyleClass}" #end >
+ <tr>
+ <td valign="top">
+ <table align="left" cellspacing="0" border="0" cellpadding="0" #if (${skin.TabTitleStyleClass})
class="${skin.TabTitleStyleClass}" #end >
+ <tr width="100%">
+ #foreach ( $tab in $tabs )
+ #if ($tab.isSelected() )
+ #set ($bgcolor = $!{skin.HighlightBackgroundColor} )
+ #set ($color = $!{skin.HighlightTextColor} )
+ #else
+ #set ($bgcolor = $!{skin.TitleBackgroundColor} )
+ #set ($color = $!{skin.TitleTextColor} )
+ #end
+ <td valign="middle" #if ($bgcolor) style="background-color: $bgcolor" #end
>
+ <b><a #if ($tab.Link && ($tab.isSelected() == false)) href="$tab.Link"
#end style="color: $color;">$tab.Title</a></b>
+ #foreach ($action in $tab.Actions)
+ <a href="${action.Link}" title="${action.Name}"><img src="images/${action.Name}.gif"
alt="${action.Name}" border="0"></a>
+ #end
+ </td>
+ <td width="2"> </td>
+ #end
+ </tr>
+ </table>
+ <table align="right" cellspacing="0" border="0" cellpadding="0">
+ <tr width="100%">
+ <td align="right" nowrap="true" valign="middle">
+ #foreach ( $action in $actions )
+ <a href="${action.Link}" title="${action.Name}"><img src="images/${action.Name}.gif"
alt="${action.Name}" border="0"></a>
+ #end
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
-<table cellspacing="0" width="100%" border="0" cellpadding="0" class="$!{skin.TabStyleClass}">
- <tr><td height="2" bgcolor="$!{skin.HighlightBackgroundColor}"><img height="2"
width="2" src="images/dot.gif" /></td></tr>
- <tr><td height="2" bgcolor="$!{skin.BackgroundColor}"><img height="2"
width="2" src="images/dot.gif" /></td></tr>
+<table cellspacing="0" width="100%" border="0" cellpadding="0" #if (${skin.TabStyleClass})
class="${skin.TabStyleClass}" #end >
+ <tr><td height="2" #if (${skin.HighlightBackgroundColor}) style="background-color:
${skin.HighlightBackgroundColor}" #end ><img height="2" width="2" src="images/dot.gif"
/></td></tr>
+ <tr><td height="2" #if (${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}"
#end ><img height="2" width="2" src="images/dot.gif" /></td></tr>
</table>
-<table cellspacing="0" width="100%" border="0" cellpadding="0" class="$!{skin.TabStyleClass}"><tr><td>
-<table bgcolor="$!{skin.BackgroundColor}" cellspacing="0" width="100%"
- border="0" cellpadding="0" class="$!{skin.TabContentStyleClass}">
-<tr>
- <td valign="top" width="100%">
- $portlet.getContent($data)
- </td>
-</tr>
+<table cellspacing="0" width="100%" border="0" cellpadding="0" #if (${skin.TabStyleClass})
class="${skin.TabStyleClass}" #end >
+ <tr>
+ <td>
+ <table cellspacing="0" width="100%" border="0" cellpadding="0" #if (${skin.TabContentStyleClass})
class="${skin.TabContentStyleClass}" #end #if (${skin.BackgroundColor}) style="background-color:
${skin.BackgroundColor}" #end >
+ <tr>
+ <td valign="top" width="100%">
+ $portlet.getContent($data)
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
-</td></tr></table>
-#end
-#else
+ #end
+ #else
$portlet.getContent($data)
#end
+##<!-- end jetspeed-tab.vm -->
1.5 +19 -17 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed.vm
Index: jetspeed.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetspeed.vm 2001/09/06 11:37:37 1.4
+++ jetspeed.vm 2001/11/07 04:08:06 1.5
@@ -1,30 +1,32 @@
+##<!-- begin jetspeed.vm -->
+#if (${skin.TitleBackgroundColor})
+ #set ($portletStyle="border-color: ${skin.TitleBackgroundColor}")
+#end
#if( ! $portlet.isClosed($data) )
-<table border="0" bgcolor="$!{skin.BackgroundColor}" cellpadding="0" cellspacing="0"
width="100%"
- class="$!{skin.PortletStyleClass}">
-<tr bgcolor="$!{skin.TitleBackgroundColor}" class="$!{skin.TitleStyleClass}">
- <td align="left" bgcolor="$!{skin.TitleBackgroundColor}"
- nowrap="true" valign="middle" width="100%">
- <b><font color="$!{skin.TitleTextColor}">$portlet.Title</font><b>
+<table border="0" cellpadding="0" cellspacing="0" width="100%" #if( ${skin.PortletStyleClass})
class="$!{skin.PortletStyleClass}" #end #if (${portletStyle}) style="${portletStyle}" #end>
+ <tr #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}" #end #if (${skin.TabBackgroundColor})
style="background-color:${skin.TabBackgroundColor}" #end >
+ <td align="left" #if (${skin.TitleBackgroundColor}) style="background-color:${skin.TitleBackgroundColor}"
#end nowrap="true" valign="middle" width="100%">
+ #if (${skin.TitleTextColor})<font style="color:"${skin.TitleTextColor}")>$portlet.Title</font>
#else $portlet.Title #end
</td>
- <td align="right" bgcolor="$!{skin.TitleBackgroundColor}" nowrap="true" valign="middle">
+ <td align="right" #if (${skin.TitleBackgroundColor}) style="background-color:${skin.TitleBackgroundColor}"
#end nowrap="true" valign="middle">
#foreach ( $action in $actions )
- <a href="${action.Link}" title="${action.Name}"><img src="images/${action.Name}.gif"
border="0"></a>
+ <a href="${action.Link}" title="${action.Name}" ><img src="images/${action.Name}.gif"
alt="${action.Name}" border="0"></a>
#end
</td>
-</tr>
+ </tr>
#if( ! $portlet.isMinimized($data) )
-<tr>
+ <tr>
<td colspan="2" align="center" valign="top" width="100%" >
- <table border="0" cellpadding="2" cellspacing="0"
- width="100%" align="center" class="$!{skin.ContentStyleClass}">
+ <table border="0" cellpadding="2" cellspacing="0" width="100%" align="center"
#if (${skin.ContentStyleClass}) class="${skin.ContentStyleClass}" #end #if (${skin.TextColor})
style="color:${skin.TextColor}" #end >
<tr>
- <td>
- $!portlet.getContent($data)
- </td>
+ <td>
+ $!portlet.getContent($data)
+ </td>
</tr>
- </table>
+ </table>
</td>
-</tr>
+ </tr>
#end
</table>
#end
+##<!-- end jetspeed.vm -->
--
To unsubscribe, e-mail: <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>
|