morciuch 2003/09/30 13:38:19
Modified: src/java/org/apache/jetspeed/services/portletfactory
JetspeedPortletFactoryService.java
webapp/WEB-INF/templates/vm/controls/html jetspeed.vm
Log:
Added missing functionality for portlet icon (see Bugzilla bug# 23531).
Revision Changes Path
1.22 +5 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java
Index: JetspeedPortletFactoryService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JetspeedPortletFactoryService.java 6 Aug 2003 22:24:44 -0000 1.21
+++ JetspeedPortletFactoryService.java 30 Sep 2003 20:38:19 -0000 1.22
@@ -501,7 +501,10 @@
if ( entry.getDescription() != null )
data.setDescription( entry.getDescription() );
-
+
+ if ( entry.getMetaInfo() != null && entry.getMetaInfo().getImage() !=
null )
+ data.setImage( entry.getMetaInfo().getImage() );
+
return data;
}
1.17 +8 -1
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jetspeed.vm 9 May 2003 17:28:30 -0000 1.16
+++ jetspeed.vm 30 Sep 2003 20:38:19 -0000 1.17
@@ -43,10 +43,17 @@
##
## Portlet Title Bar
##
+#set ($cspan = 2)
#if( $portlet_instance.isShowTitleBar() )
<tr>
#if (${skin.PortletSkinClass})
<td class="PTitleLeft" style="font-size:1pt;" nowrap="true"> </td>
+ #else
+ ## There's an extra column created for the portlet icon
+ #set ($cspan = 3)
+ ##if ($portlet_instance.Image && $portlet_instance.Image !=
"images/dot.gif")
+ <td nowrap="true" width="1%" #if (${skin.TitleStyleClass})
class="${skin.TitleStyleClass}" #end #if (${titlestyle}) style="${titlestyle}"
#end><IMG SRC="$portlet_instance.Image"></td>
+ ##end
#end
<td align="left" valign="middle" #if (${skin.TitleStyleClass})
class="${skin.TitleStyleClass}" #else class="PTitle" #end #if (${titlestyle})
style="${titlestyle}" #end>
$portlet_instance.Title
@@ -70,7 +77,7 @@
#if (${skin.PortletSkinClass} && $portlet_instance.isShowTitleBar())
<td class="PContentLeft" style="font-size:1pt;" nowrap="true"> </td>
#end
- <td colspan="2" #if (${skin.ContentStyleClass})
class="${skin.ContentStyleClass}" #else class="PContent" #end #if (${contentstyle})
style="${contentstyle}" #end>
+ <td colspan="$cspan" #if (${skin.ContentStyleClass})
class="${skin.ContentStyleClass}" #else class="PContent" #end #if (${contentstyle})
style="${contentstyle}" #end>
$!portlet.getContent($data)
</td>
#if (${skin.PortletSkinClass} && $portlet_instance.isShowTitleBar())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
