portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morci...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf demo-portlets.xreg
Date Thu, 29 May 2003 20:23:19 GMT
morciuch    2003/05/29 13:23:19

  Modified:    src/java/org/apache/jetspeed/portal/portlets
                        LinkPortlet.java
               webapp/WEB-INF/conf demo-portlets.xreg
  Log:
  Removed code to check for media type - this is handled via registry (see Bugzilla bug# 18666).
This portlet is a real mess and should be reimplemented.
  
  Revision  Changes    Path
  1.6       +10 -8     jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/LinkPortlet.java
  
  Index: LinkPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/LinkPortlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LinkPortlet.java	4 Mar 2003 00:05:04 -0000	1.5
  +++ LinkPortlet.java	29 May 2003 20:23:19 -0000	1.6
  @@ -55,18 +55,20 @@
   package org.apache.jetspeed.portal.portlets;
   
   
  - /** LinkPortlet
  -  * Portlet for rendering HTML links
  -  * Can also be used for WML but no output will be created so
  -  * redering for wml is done in by the /wml/column.vm file
  -  * @author <a href="mailto:A.Kempf@web.de">Andreas Kempf</a>
  -  */
   import org.apache.jetspeed.capability.CapabilityMap;
   import org.apache.jetspeed.util.MimeType;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.ecs.*;
   
   
  +/**
  + * Portlet for rendering HTML links
  + * Can also be used for WML but no output will be created so
  + * redering for wml is done in by the /wml/column.vm file
  + * 
  + * @author <a href="mailto:A.Kempf@web.de">Andreas Kempf</a>
  + * @version $Id$
  + */
   public class LinkPortlet extends AbstractPortlet
   {
   
  @@ -94,7 +96,7 @@
     CapabilityMap cap = ((JetspeedRunData)data).getCapability();
   
     // only for HTML mimetype!!!
  -  if (cap.getPreferredType().equals(MimeType.HTML))
  +  if (cap.getPreferredType().getCode().equals(MimeType.HTML.getCode()))
     {
       String link;
       String image;
  @@ -139,7 +141,7 @@
   
           // add image
           if ((image != null) && (image.length()>0))
  -          res += "&nbsp;<IMG SRC=\"images/html/"+image+"\" HSPACES=\"5\" ALT=\""+name+"\"
BORDER=\"0\">&nbsp;&nbsp;";
  +          res += "&nbsp;<IMG SRC=\""+image+"\" HSPACES=\"5\" ALT=\""+name+"\" BORDER=\"0\">&nbsp;&nbsp;";
   
           // add name and description
           res += name+"</A>&nbsp;&nbsp;&nbsp;&nbsp;<SMALL>"+desc+"</SMALL></li>";
  
  
  
  1.35      +4 -4      jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg
  
  Index: demo-portlets.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- demo-portlets.xreg	19 May 2003 23:19:15 -0000	1.34
  +++ demo-portlets.xreg	29 May 2003 20:23:19 -0000	1.35
  @@ -174,10 +174,10 @@
               <title>My Bookmarks</title>
               <description>Insert your personal links!</description>
           </meta-info>
  -        <parameter name="image" value="contact.gif" hidden="true"/>
  -        <parameter name="link" value="http://www.siemens.de" hidden="true"/>
  -        <parameter name="anchor" value="Siemens germany" hidden="true"/>
  -        <parameter name="description" value="Visit our company home site" hidden="true"/>
  +        <parameter name="image" value="images/jetspeed-powered.gif" hidden="false"/>
  +        <parameter name="link" value="http://jakarta.apache.org/jetspeed/site/index.html"
hidden="false"/>
  +        <parameter name="anchor" value="Jetspeed" hidden="false"/>
  +        <parameter name="description" value="Jetspeed's home page" hidden="false"/>
           <parameter name="image1" value="" hidden="false"/>
           <parameter name="link1" value="" hidden="false"/>
           <parameter name="anchor1" value="" hidden="false"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message