Author: taylor
Date: Mon Nov 13 11:17:46 2006
New Revision: 474443
URL: http://svn.apache.org/viewvc?view=rev&rev=474443
Log:
https://issues.apache.org/jira/browse/JS2-610
basic support for categorization: icons to represent portlets passed down over
ajax api
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletInfo.java
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm?view=diff&rev=474443&r1=474442&r2=474443
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getportlets.vm
Mon Nov 13 11:17:46 2006
@@ -4,14 +4,7 @@
<portlets>
#foreach ($portlet in $portlets)
- <portlet name="$portlet.Name" displayName="$portlet.DisplayName"
description="$portlet.Description">
-## <position column="$portlet.Column" row="$portlet.Row"/>
-## <parameters>
-###foreach ($param in $portlet.Parameters)
-## <param name="$param.Name" value="$param.Value"/>
-###end
-## </parameters>
- </portlet>
+ <portlet name="$portlet.Name" displayName="$!portlet.DisplayName"
description="$!portlet.Description"/>
#end
</portlets>
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm?view=diff&rev=474443&r1=474442&r2=474443
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/ajax-xml/getthemes.vm
Mon Nov 13 11:17:46 2006
@@ -2,25 +2,25 @@
#if ($type == "portletDecorations")
[
#foreach($p in $portletDecorations)
- ["$p", "$p"],
+#if($velocityCount > 1),#end["$p", "$p"]
#end
]
#elseif ($type == "pageDecorations")
[
#foreach($p in $pageDecorations)
- ["$p", "$p"],
+#if($velocityCount > 1),#end["$p", "$p"]
#end
]
#elseif ($type == "desktopThemes")
[
#foreach($dt in $desktopThemes)
- ["$dt", "$dt"],
+#if($velocityCount > 1),#end["$dt", "$dt"]
#end
]
#elseif ($type == "layouts")
[
#foreach($l in $layouts)
- ["$l.DisplayName", "$l.Name"],
+#if($velocityCount > 1),#end["$l.DisplayName", "$l.Name"]
#end
]
#end
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java?view=diff&rev=474443&r1=474442&r2=474443
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
Mon Nov 13 11:17:46 2006
@@ -41,6 +41,7 @@
import org.apache.jetspeed.search.SearchEngine;
import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.PortletPermission;
+import org.apache.pluto.om.common.Parameter;
/**
* Get Portlets retrieves the portlet list available to the current subject
@@ -59,6 +60,7 @@
protected Log log = LogFactory.getLog(GetPortletsAction.class);
private PortletRegistry registry = null;
private SearchEngine searchEngine = null;
+ public final static String PORTLET_ICON = "portlet-icon";
public GetPortletsAction(String template, String errorTemplate)
{
@@ -145,7 +147,20 @@
try
{
AccessController.checkPermission(new
PortletPermission(portlet.getUniqueName(), JetspeedActions.MASK_VIEW));
- list.add(new PortletInfo(uniqueName,
portlet.getDisplayNameText(locale), portlet.getDescriptionText(locale)));
+ Parameter param =
portlet.getInitParameterSet().get(PORTLET_ICON);
+ String image;
+ if (param != null)
+ {
+ String relativeImagePath = param.getValue();
+ String context =
muta.getWebApplicationDefinition().getContextRoot();
+ image = context + relativeImagePath;
+ }
+ else
+ {
+ // default TODO: assign image by category
+ image = "images/portlets/office-calendar.png";
+ }
+ list.add(new PortletInfo(uniqueName,
portlet.getDisplayNameText(locale), portlet.getDescriptionText(locale), image));
}
catch (AccessControlException ace)
{
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletInfo.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletInfo.java?view=diff&rev=474443&r1=474442&r2=474443
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletInfo.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletInfo.java
Mon Nov 13 11:17:46 2006
@@ -27,12 +27,14 @@
private String name;
private String displayName;
private String description;
+ private String image;
- public PortletInfo(String name, String displayName, String description)
+ public PortletInfo(String name, String displayName, String description,
String image)
{
this.name = name;
this.displayName = displayName;
this.description = description;
+ this.image = image;
}
/**
* @return Returns the description.
@@ -54,5 +56,21 @@
public String getName()
{
return name;
+ }
+
+ /**
+ * @return Returns the image.
+ */
+ public String getImage()
+ {
+ return image;
+ }
+
+ /**
+ * @param image The image to set.
+ */
+ public void setImage(String image)
+ {
+ this.image = image;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
