paulsp 01/11/23 16:34:04 Modified: webapp/WEB-INF/templates/vm/controls/html jetspeed-menu.vm jetspeed.vm Log: Consistantly apply colors from skin defination Revision Changes Path 1.6 +13 -13 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jetspeed-menu.vm 2001/11/16 22:51:01 1.5 +++ jetspeed-menu.vm 2001/11/24 00:34:03 1.6 @@ -21,19 +21,19 @@ #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 +#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 ($titleclass) class="$titleclass" #end #if ($titlestyle) style="${titlestyle}" #end > #if ($tab.Link && ($tab.isSelected() == false)) 1.7 +41 -5 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jetspeed.vm 2001/11/12 17:05:03 1.6 +++ jetspeed.vm 2001/11/24 00:34:03 1.7 @@ -1,14 +1,50 @@ ##<!-- begin jetspeed.vm --> +## ---------------------- +## Set portlet style +## ---------------------- #if (${skin.TitleBackgroundColor}) #set ($portletStyle="border-color: ${skin.TitleBackgroundColor}") #end +## ---------------------- +## Set title style +## ---------------------- +#if (${skin.TitleBackgroundColor}) + #if (${skin.TitleTextColor}) + #set ($titlestyle = "background-color: $skin.TitleBackgroundColor; color: $skin.TitleTextColor;" ) + #else + #set ($titlestyle = "background-color: $skin.TitleBackgroundColor;" ) + #end +#else + #if (${$skin.TitleTextColor}) + #set ($titlestyle = "color: $skin.TitleTextColor;" ) + #else + #set ($titlestyle = "" ) + #end +#end +## ---------------------- +## Set content style +## ---------------------- +#if (${skin.BackgroundColor}) + #if (${skin.TextColor}) + #set ($contentstyle = "background-color: $skin.BackgroundColor; color: $skin.TextColor;" ) + #else + #set ($contentstyle = "background-color: $skin.BackgroundColor;" ) + #end +#else + #if (${$skin.TextColor}) + #set ($contentstyle = "color: $skin.TextColor;" ) + #else + #set ($contentstyle = "" ) + #end +#end + #if( ! $portlet.isClosed($data) ) <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 + <tr #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}" #end #if (${titlestyle}) style="${titlestyle}" #end > + <td align="left" nowrap="true" valign="middle" width="100%"> + $portlet.Title </td> - <td align="right" #if (${skin.TitleBackgroundColor}) style="background-color:${skin.TitleBackgroundColor}" #end nowrap="true" valign="middle"> + <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 @@ -17,7 +53,7 @@ #if( ! $portlet.isMinimized($data) ) <tr> <td colspan="2" align="center" valign="top" width="100%" > - <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 > + <table border="0" cellpadding="2" cellspacing="0" width="100%" align="center" #if (${skin.ContentStyleClass}) class="${skin.ContentStyleClass}" #end #if (${contentstyle}) style="${contentstyle}" #end > <tr> <td> $!portlet.getContent($data)
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>