paulsp 01/11/16 14:51:01
Modified: webapp/WEB-INF/templates/vm/controllers/html column.vm
multicolumn-customize.vm multicolumn.vm row.vm
webapp/WEB-INF/templates/vm/controls/html jetspeed-menu.vm
jetspeed-tab.vm
Log:
Implement new skin style classes ControllerStyleClass and HighlightTitleStyleClass in
the HTML templates
Revision Changes Path
1.5 +1 -1
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- column.vm 2001/11/07 04:07:27 1.4
+++ column.vm 2001/11/16 22:51:01 1.5
@@ -1,5 +1,5 @@
##<!-- 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 >
+<table border="0" cellpadding="2" cellspacing="0" width="100%" #if
(${skin.ControllerStyleClass}) 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 )
1.6 +1 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- multicolumn-customize.vm 2001/11/07 04:07:27 1.5
+++ multicolumn-customize.vm 2001/11/16 22:51:01 1.6
@@ -10,7 +10,7 @@
#if ($!col_classes.size() >= $velocityCount)
#set ($col_class = $!col_classes.elementAt($idx))
#else
- #set ($col_class = "")
+ #set ($col_class = $!skin.ControllerStyleClass)
#end
<td valign="top" width="$width">
<table width="100%" cellspacing="1" cellpadding="1" border="0" #if
($!{col_class}=="") #if( ${skin.PortletStyleClass}) class="$!{skin.PortletStyleClass}"
#end #else class="$col_class" #end>
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multicolumn.vm 2001/11/07 04:07:27 1.3
+++ multicolumn.vm 2001/11/16 22:51:01 1.4
@@ -1,5 +1,5 @@
##<!-- Begin multicolumm.vm -->
-<table border="0" cellpadding="2" cellspacing="0" width="100%" #if
(${skin.PortletStyleClass}) class="$skin.PortletStyleClass" #end>
+<table border="0" cellpadding="2" cellspacing="0" width="100%" #if
(${skin.ControllerStyleClass}) class="$skin.ControllerStyleClass" #end#if
(${skin.TitleBackgroundColor}) style="border-color:${skin.TitleBackgroundColor}" #end>
<tr>
#foreach ( $column in $portlets )
#if ($!sizes.size() >= $velocityCount)
@@ -10,7 +10,7 @@
#if ($!col_classes.size() >= $velocityCount)
#set ($col_class = $!col_classes.elementAt($idx))
#else
- #set ($col_class = "$!{skin.PortletStyleClass}")
+ #set ($col_class = "$!{skin.ControllerStyleClass}")
#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 >
1.4 +1 -1
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- row.vm 2001/11/07 04:07:27 1.3
+++ row.vm 2001/11/16 22:51:01 1.4
@@ -1,5 +1,5 @@
##<!-- 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>
+<table border="0" cellpadding="2" cellspacing="0" width="100%" #if
(${skin.ControllerStyleClass}) class="$skin.ControllerStyleClass" #end #if
(${skin.TitleBackgroundColor}) style="border-color:${skin.TitleBackgroundColor}" #end>
<tr>
#foreach ( $portlet in $portlets )
#if ($sizes.size() >= $velocityCount)
1.5 +22 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jetspeed-menu.vm 2001/11/07 04:08:06 1.4
+++ jetspeed-menu.vm 2001/11/16 22:51:01 1.5
@@ -7,7 +7,7 @@
#if (!$width)
#set ($width = "20%" )
#end
-<table cellpadding="0" cellspacing="0" border="0" width="100%" #if
(${skin.PortletStyleClass}) class="$skin.PortletStyleClass" #end>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" #if
(${skin.ControllerStyleClass}) class="$skin.ControllerStyleClass" #end>
<tr>
<td valign="top" width="$width" >
<table cellspacing="0" border="0" cellpadding="0" width="100%" #if
(${skin.TabStyleClass}) class="$skin.TabStyleClass" #end>
@@ -15,13 +15,32 @@
#if ($tab.isSelected() )
#set ($bgcolor = $!{skin.HighlightBackgroundColor} )
#set ($color = $!{skin.HighlightTextColor} )
+ #set ($titleclass = $!{skin.HighlightTitleStyleClass} )
#else
#set ($bgcolor = $!{skin.TitleBackgroundColor} )
#set ($color = $!{skin.TitleTextColor} )
+ #set ($titleclass = $!{skin.TitleStyleClass} )
#end
+ #if (${bgcolor})
+ #if (${color})
+ #set ($titlestyle = "background-color: $bgcolor; color: $color;" )
+ #else
+ #set ($titlestyle = "background-color: $bgcolor;" )
+ #end
+ #else
+ #if (${color})
+ #set ($titlestyle = "color: $color;" )
+ #else
+ #set ($titlestyle = "" )
+ #end
+ #end
<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 valign="middle" #if ($titleclass) class="$titleclass" #end #if
($titlestyle) style="${titlestyle}" #end >
+ #if ($tab.Link && ($tab.isSelected() == false))
+ <a href="$tab.Link" #if (${color}) style="color:$color"
#end>$tab.Title</a>
+ #else
+ $tab.Title
+ #end
</td>
</tr>
#end
1.6 +24 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jetspeed-tab.vm 2001/11/07 04:08:06 1.5
+++ jetspeed-tab.vm 2001/11/16 22:51:01 1.6
@@ -12,15 +12,35 @@
#if ($tab.isSelected() )
#set ($bgcolor = $!{skin.HighlightBackgroundColor} )
#set ($color = $!{skin.HighlightTextColor} )
+ #set ($titleclass = $!{skin.HighlightTitleStyleClass} )
#else
#set ($bgcolor = $!{skin.TitleBackgroundColor} )
#set ($color = $!{skin.TitleTextColor} )
+ #set ($titleclass = $!{skin.TitleStyleClass} )
#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>
+
+ #if (${bgcolor})
+ #if (${color})
+ #set ($titlestyle = "background-color: $bgcolor; color: $color;" )
+ #else
+ #set ($titlestyle = "background-color: $bgcolor;" )
+ #end
+ #else
+ #if (${color})
+ #set ($titlestyle = "color: $color;" )
+ #else
+ #set ($titlestyle = "" )
+ #end
#end
+ <td valign="middle" #if ($titleclass) class="$titleclass" #end #if
($titlestyle) style="${titlestyle}" #end >
+ #if ($tab.Link && ($tab.isSelected() == false))
+ <a href="$tab.Link" #if ($color) style="color: $color"
#end>$tab.Title</a>
+ #else
+ $tab.Title
+ #end
+ #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
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
