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/11/07 05:07:27 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html column.vm multicolumn-customize.vm multicolumn.vm row.vm
paulsp 01/11/06 20:07:27
Modified: webapp/WEB-INF/templates/vm/controllers/html column.vm
multicolumn-customize.vm multicolumn.vm row.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 +9 -7 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column.vm
Index: column.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- column.vm 2001/07/22 20:32:47 1.3
+++ column.vm 2001/11/07 04:07:27 1.4
@@ -1,13 +1,15 @@
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
+##<!-- Begin column.vm -->
+<table border="0" cellpadding="2" cellspacing="0" width="100%" #if (${skin.PortletStyleClass}) class="$skin.PortletStyleClass" #end #if (${skin.TitleBackgroundColor}) style="border-color:${skin.TitleBackgroundColor}" #end >
#foreach ( $portlet in $portlets )
#if ($sizes.size() >= $velocityCount)
#set ($idx = $velocityCount - 1 )
#set ($height = $!sizes.elementAt($idx))
#end
-<tr height="$!height">
- <td height="$!height">
- $!portlet.getContent($data)
- </td>
-</tr>
+ <tr #if ($height) height="$height" #end>
+ <td #if ($height) height="$height" #end>
+ $!portlet.getContent($data)
+ </td>
+ </tr>
#end
-</table>
\ No newline at end of file
+</table>
+##<!-- End column.vm -->
1.5 +11 -6 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm
Index: multicolumn-customize.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multicolumn-customize.vm 2001/10/14 12:16:41 1.4
+++ multicolumn-customize.vm 2001/11/07 04:07:27 1.5
@@ -7,8 +7,13 @@
#set ($idx = $velocityCount - 1 )
#set ($width = $!sizes.elementAt($idx))
#end
+#if ($!col_classes.size() >= $velocityCount)
+ #set ($col_class = $!col_classes.elementAt($idx))
+#else
+ #set ($col_class = "")
+#end
<td valign="top" width="$width">
- <table width="100%" cellspacing="1" cellpadding="1" border="0">
+ <table width="100%" cellspacing="1" cellpadding="1" border="0" #if ($!{col_class}=="") #if( ${skin.PortletStyleClass}) class="$!{skin.PortletStyleClass}" #end #else class="$col_class" #end>
#foreach ( $portlet in $column )
<tr>
<td width="100%">
@@ -16,11 +21,11 @@
#if ($action) <input type="hidden" name="$jlink.ActionKey" value="$action" /> #end
<input type="hidden" name="col" value="$col" />
<input type="hidden" name="row" value="$row" />
- <table width="95%" cellpadding="1" cellspacing="0" bgcolor="$!{skin.TitleBackgroundColor}">
+ <table width="95%" cellpadding="1" cellspacing="0" #if( ${skin.PortletStyleClass}) class="$!{skin.PortletStyleClass}" #end #if(${skin.TitleBackgroundColor}) style="background-color: ${skin.TitleBackgroundColor}" #end >
<tr><td width="100%">
- <table width="100%" cellspacing="0" cellpadding="0" bgcolor="$!{skin.TitleBackgroundColor}">
+ <table width="100%" cellspacing="0" cellpadding="0" #if( ${skin.TitleStyleClass}) class="$!{skin.TitleStyleClass}" #end #if(${skin.TitleBackgroundColor}) style="background-color: ${skin.TitleBackgroundColor}" #end>
<tr bgcolor="$!{skin.TitleBackgroundColor}">
- <td bgcolor="$!{skin.TitleBackgroundColor}" valign="top" >
+ <td align="right" valign="top" #if(${skin.TitleBackgroundColor}) style="background-color: ${skin.TitleBackgroundColor}" #end >
<input type="image" src="images/close.gif" alt="Close" border="0" name="eventSubmit_doDelete" />
<input type="image" src="images/left.gif" alt="Move left" border="0" name="eventSubmit_doLeft" />
<input type="image" src="images/up.gif" alt="Move up" border="0" name="eventSubmit_doUp" />
@@ -34,7 +39,7 @@
#set ($title = $portlet.Parent)
#end
<tr height="50">
- <td height="50" valign="middle" bgcolor="$!{skin.BackgroundColor}" align="center">
+ <td height="50" valign="middle" #if(${skin.ContentStyleClass}) class="${skin.ContentStyleClass}" #end #if(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}" #end align="center">
<b>$title</b>
</td>
</tr>
@@ -65,4 +70,4 @@
</td>
</tr>
</table>
-</form>
\ No newline at end of file
+</form>
1.3 +19 -11 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn.vm
Index: multicolumn.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multicolumn.vm 2001/07/23 21:45:53 1.2
+++ multicolumn.vm 2001/11/07 04:07:27 1.3
@@ -1,19 +1,27 @@
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-<tr>
+##<!-- Begin multicolumm.vm -->
+<table border="0" cellpadding="2" cellspacing="0" width="100%" #if (${skin.PortletStyleClass}) class="$skin.PortletStyleClass" #end>
+ <tr>
#foreach ( $column in $portlets )
#if ($!sizes.size() >= $velocityCount)
#set ($idx = $velocityCount - 1 )
#set ($width = $!sizes.elementAt($idx))
#end
- <td width="$!width" valign="top">
- <table width="100%" cellspacing="2" cellpadding="0" border="0">
+
+#if ($!col_classes.size() >= $velocityCount)
+ #set ($col_class = $!col_classes.elementAt($idx))
+#else
+ #set ($col_class = "$!{skin.PortletStyleClass}")
+#end
+ <td #if ($width) width="$width" #end valign="top">
+ <table width="100%" cellspacing="2" cellpadding="0" border="0" #if (${col_class}=="") #else class="$col_class" #end #if(${skin.TitleBackgroundColor}) style="border-color: ${skin.TitleBackgroundColor}" #end >
#foreach ( $portlet in $column )
- <tr>
- <td width="100%">$!portlet.getContent($data)</td>
- </tr>
+ <tr>
+ <td width="100%">$!portlet.getContent($data)</td>
+ </tr>
#end
- </table>
- </td>
+ </table>
+ </td>
#end
-</tr>
-</table>
\ No newline at end of file
+ </tr>
+</table>
+##<!-- End multicolumm.vm -->
1.3 +9 -7 jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row.vm
Index: row.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- row.vm 2001/07/22 20:32:47 1.2
+++ row.vm 2001/11/07 04:07:27 1.3
@@ -1,13 +1,15 @@
-<table border="0" cellpadding="2" cellspacing="0" width="100%">
-<tr>
+##<!-- Begin row.vm -->
+<table border="0" cellpadding="2" cellspacing="0" width="100%" #if (${skin.PortletStyleClass}) class="$skin.PortletStyleClass" #end #if (${skin.TitleBackgroundColor}) style="border-color:${skin.TitleBackgroundColor}" #end>
+ <tr>
#foreach ( $portlet in $portlets )
#if ($sizes.size() >= $velocityCount)
#set ($idx = $velocityCount - 1 )
#set ($width = $!sizes.elementAt($idx))
#end
- <td valign="top" width="$!width">
- $!portlet.getContent($data)
- </td>
+ <td valign="top" #if ($width) width="$width" #end>
+ $!portlet.getContent($data)
+ </td>
#end
-</tr>
-</table>
\ No newline at end of file
+ </tr>
+</table>
+##<!-- End row.vm -->
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>