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/xdocs changes.xml portlet_config_common.xml
Date Wed, 02 Jul 2003 22:34:46 GMT
morciuch    2003/07/02 15:34:46

  Modified:    docs/site changes.html portlet_config_common.html
               src/java/org/apache/jetspeed/modules/actions/portlets
                        CustomizeAction.java WeatherAction.java
               webapp/WEB-INF/conf demo-portlets.xreg portlets.xreg
               webapp/WEB-INF/templates/vm/portlets/html
                        customizer-portlet.vm weather.vm
               xdocs    changes.xml portlet_config_common.xml
  Added:       webapp/WEB-INF/templates/vm/parameters/html HiddenInput.vm
                        WeatherParms.vm WeatherStyles.vm
  Removed:     webapp/WEB-INF/templates/vm/portlets/html
                        weather-customize.vm
  Log:
  Reworked the weather portlet (see Bugzilla bug# 20593):
  
  1. Got rid of the custom customizer
  2. Made multi-instance safe
  
  Also, introduced another parameter type: invisible. This is used to render parameter as
hidden inputs so other parameters can actually set their values behind the scenes (weather
location is an example of this).
  
  Revision  Changes    Path
  1.151     +3 -0      jakarta-jetspeed/docs/site/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
  retrieving revision 1.150
  retrieving revision 1.151
  diff -u -r1.150 -r1.151
  --- changes.html	23 Jun 2003 18:50:18 -0000	1.150
  +++ changes.html	2 Jul 2003 22:34:44 -0000	1.151
  @@ -140,6 +140,9 @@
   </li>
   -->
   <li>
  +  Add -   Bug # 20593 - 2003/07/02 - Reworked weather portlet (MO)
  +</li>
  +<li>
     Add -   Bug # 17932 - 2003/06/23 - Disabled the ability to login as anonymous user (MO)
   </li>
   <li>
  
  
  
  1.26      +4 -0      jakarta-jetspeed/docs/site/portlet_config_common.html
  
  Index: portlet_config_common.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/portlet_config_common.html,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- portlet_config_common.html	10 Jun 2003 16:09:24 -0000	1.25
  +++ portlet_config_common.html	2 Jul 2003 22:34:45 -0000	1.26
  @@ -499,6 +499,10 @@
               instructions on how to develop your own, see javadoc for <code>org.apache.jetspeed.modules.parameters</code>
package. 
               See below for example registry entry.</td>
             </tr>
  +          <tr>
  +            <td>invisible</td>
  +            <td>Parameters with this type are rendered as hidden inputs in the portlet
customizer form.</td>
  +          </tr>
           </table>
         
               </font>
  
  
  
  1.23      +2 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java
  
  Index: CustomizeAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- CustomizeAction.java	28 Jun 2003 18:15:45 -0000	1.22
  +++ CustomizeAction.java	2 Jul 2003 22:34:45 -0000	1.23
  @@ -437,6 +437,7 @@
           try
           {
               PortletInstance instance = PersistenceManager.getInstance(p, rundata);
  +            PortletEntry regEntry = (PortletEntry) Registry.getEntry(Registry.PORTLET,
p.getName());
   
               Iterator i = params.iterator();
   
  @@ -446,7 +447,7 @@
                   Parameter param = (Parameter)i.next();
                   String name = param.getName();
                   String newValue = rundata.getParameters().getString(name);
  -                String regValue = param.getValue();
  +                String regValue = regEntry.getParameter(name).getValue(); //param.getValue();
                   String psmlValue = instance.getAttribute(name);
   
                   //System.out.println(name + "= [" + psmlValue + "] in psml");
  
  
  
  1.5       +56 -110   jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/WeatherAction.java
  
  Index: WeatherAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/WeatherAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WeatherAction.java	4 Mar 2003 00:04:53 -0000	1.4
  +++ WeatherAction.java	2 Jul 2003 22:34:45 -0000	1.5
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -54,10 +54,12 @@
   
   package org.apache.jetspeed.modules.actions.portlets;
   
  -// Velocity stuff
  +// Jetspeed stuff
   import org.apache.jetspeed.portal.portlets.VelocityPortlet;
   import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction;
  +import org.apache.jetspeed.util.PortletConfigState;
   
  +// Turbine stuff
   import org.apache.turbine.util.RunData;
   
   // Velocity Stuff
  @@ -69,19 +71,27 @@
   /**
    * WeatherAction portlet uses WeatherUnderground's weather condition
    * stickers/banners to build the portlet view.
  - *
  + * 
    * <p> Donated by Community Grids Java Source Package</p>
    * <p> Provides supporting classess for portal environments.</p>
  - *
  + * 
    * @author <a href="mailto:obalsoy@indiana.edu">Ozgur Balsoy</a>
    * @version $Id$
    */
   public class WeatherAction extends VelocityPortletAction
   {
  -    
  +    public static final String WEATHER_CITY_INFO = "weather_city_info";
  +    public static final String WEATHER_STATE = "weather_state";
  +    public static final String WEATHER_CITY = "weather_city";
  +    public static final String WEATHER_STATION = "weather_station";
  +    public static final String WEATHER_STYLE = "weather_style";
  +
       /**
        * Nothing specific for maximized view.
  -     *
  +     * 
  +     * @param portlet
  +     * @param context
  +     * @param rundata
        * @see VelocityPortletAction#buildMaximizedContext
        */
       protected void buildMaximizedContext( VelocityPortlet portlet,
  @@ -90,112 +100,73 @@
       {
           buildNormalContext( portlet, context, rundata);
       }
  -    
  -    /**
  -     * Subclasses should override this method if they wish to
  -     * provide their own customization behavior.
  -     * Default is to use Portal base customizer action
  -     *
  -     * @see VelocityPortletAction#buildConfigureContext
  -     */
  -    protected void buildConfigureContext( VelocityPortlet portlet,
  -                                          Context context,
  -                                          RunData rundata )
  -    {
  -        buildNormalContext( portlet, context, rundata);
  -        String cityInfo = (String)context.get("weather_city_info");
  -        if(cityInfo != null)
  -        {
  -            try
  -            {
  -                javax.naming.Name path = new javax.naming.CompositeName(cityInfo);
  -                if(path.size()==3)
  -                {
  -                    if(path.get(0).equals("US"))
  -                    {
  -                        context.put("weather_state",path.get(1));
  -                        context.put("weather_city",path.get(2).replace('_',' '));
  -                    } else
  -                    {
  -                        context.put("weather_station",path.get(2));
  -                    }
  -                }
  -            }
  -            catch(Exception ex)
  -            {}
  -        }
  -        setTemplate(rundata, "weather-customize");
  -    }
  -    
  +
       /**
        * Subclasses must override this method to provide default behavior
        * for the portlet action
  -     *
  +     * 
  +     * @param portlet
  +     * @param context
  +     * @param rundata
        * @see VelocityPortletAction#buildNormalContext
        */
       protected void buildNormalContext( VelocityPortlet portlet,
                                          Context context,
                                          RunData rundata )
       {
  -        String cityInfo = portlet.getAttribute("weather_city_info",null, rundata);
  -        if( cityInfo == null)
  -        {
  -            String city = portlet.getPortletConfig().getInitParameter("weather_city");
  -            String state = portlet.getPortletConfig().getInitParameter("weather_state");
  -            String station = portlet.getPortletConfig().getInitParameter("weather_station");
  -            cityInfo = getCityInfo(city, state, station);
  -            if(cityInfo == null)
  -            {
  -                setTemplate(rundata, "weather-customize");
  -                return;
  -            }
  -            else
  -            {
  -                portlet.setAttribute("weather_city_info",cityInfo, rundata);
  -            }
  -        }
  -        context.put("weather_city_info", cityInfo);
  -        String style = portlet.getAttribute("weather_style",null,rundata);
  -        if(style == null)
  -        {
  -            style = portlet.getPortletConfig().getInitParameter("weather_style");
  -            if(style == null)
  -            {
  -                style = "infobox";
  -                portlet.setAttribute("weather_style",style,rundata);
  -            }
  -        }
  -        context.put("weather_style",style);
  +
  +        String cityInfo = PortletConfigState.getParameter(portlet, rundata, this.WEATHER_CITY_INFO,
null);
  +        //if (cityInfo == null)
  +        //{
  +            String city = portlet.getPortletConfig().getInitParameter(this.WEATHER_CITY);
  +            String state = portlet.getPortletConfig().getInitParameter(this.WEATHER_STATE);
  +            String station = portlet.getPortletConfig().getInitParameter(this.WEATHER_STATION);
  +            cityInfo = getCityInfo(city, state, station);            
  +        //}
  +        context.put(this.WEATHER_CITY_INFO, cityInfo);
  +        PortletConfigState.setInstanceParameter(portlet, rundata, this.WEATHER_CITY_INFO,
cityInfo);
  +
  +        String style = PortletConfigState.getParameter(portlet, rundata, this.WEATHER_STYLE,
"infobox");
  +        context.put(this.WEATHER_STYLE,style);
       }
  -    
  +
       /**
        * Builds the path for US cities. The format is US/ST/City.html, i.e.
        * for New York City, the city path is US/NY/New_York
  +     * 
  +     * @param city
  +     * @param state
  +     * @return 
        */
       private String getUSInfo(String city, String state)
       {
           city = city.trim().toLowerCase()+" ";
  -        if(city.indexOf(" ")>0)
  +        if (city.indexOf(" ")>0)
           {
               String newCity = "";
               StringTokenizer st = new StringTokenizer(city, " ");
  -            while(st.hasMoreTokens())
  +            while (st.hasMoreTokens())
               {
                   String token = st.nextToken();
                   newCity = newCity + token.substring(0,1).toUpperCase() +
  -                token.substring(1) + "_";
  +                          token.substring(1) + "_";
               }
               city = newCity.substring(0, newCity.length()-1); // remove last '_'
           }
           state = state.toUpperCase();
           return "US/" + state + "/" + city;
       }
  -    
  +
       /**
        * Builds the city path for US or other world cities. For world cities,
        * the city path is global/station/station_number, i.e.
        * for Istanbul, Turkey, it is global/stations/17060. The station numbers
        * need to be obtained from the Weather Underground's site.
  +     * 
  +     * @param city
  +     * @param state
  +     * @param station
  +     * @return 
        */
       private String getCityInfo(String city, String state, String station)
       {
  @@ -210,43 +181,18 @@
           }
           return cityInfo;
       }
  -    
  +
       /**
  +     * 
  +     * @param data
  +     * @param context
        * @see VelocityPortletAction#doCancel
  -     */    
  +     */
       public void doCancel(RunData data, Context context)
       {
           VelocityPortlet portlet = (VelocityPortlet) context.get("portlet");
           buildNormalContext(portlet, context, data);
       }
  -    
  -    /**
  -     * Update PSML parmaters to reflect the desired
  -     * weather station, i.e. city
  -     *
  -     * @param data data
  -     * @param context a context for web pages.
  -     */
  -    public void doUpdate(RunData data, Context context)
  -    {
  -        String city = (String) data.getParameters().getString("weather_city");
  -        String state = (String) data.getParameters().getString("weather_state");
  -        String style = (String) data.getParameters().getString("weather_style");
  -        String station = (String) data.getParameters().getString("weather_station");
  -        
  -        String cityInfo = getCityInfo(city, state, station);
  -        if (cityInfo != null)
  -        {
  -            VelocityPortlet portlet = (VelocityPortlet) context.get("portlet");
  -            context.put("weather_city_info", cityInfo);
  -            portlet.setAttribute("weather_city_info", cityInfo, data);
  -            if (style == null || style.equals(""))
  -            {
  -                style = "infobox";
  -            }
  -            context.put("weather_style", style);
  -            portlet.setAttribute("weather_style", style, data);
  -        }
  -    }
  +
   }
   
  
  
  
  1.40      +15 -13    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.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- demo-portlets.xreg	19 Jun 2003 17:12:19 -0000	1.39
  +++ demo-portlets.xreg	2 Jul 2003 22:34:45 -0000	1.40
  @@ -240,30 +240,32 @@
           <category>demo</category>
           <category>velocity.demo</category>
       </portlet-entry>
  -    <portlet-entry name="BloomingtonWeather" hidden="false" type="ref" parent="CustomizerVelocity"
application="false">
  +    <portlet-entry name="BloomingtonWeather" hidden="false" type="ref" parent="WeatherPortlet"
application="false">
           <meta-info>
               <title>Weather - Bloomington,IN</title>
               <description>Current weather conditions</description>
           </meta-info>
  -        <parameter name="template" value="weather" hidden="true"/>
  -        <parameter name="customizeTemplate" value="weather-customize" hidden="true"/>
  -        <parameter name="action" value="portlets.WeatherAction" hidden="true"/>
  -        <parameter name="weather_city" value="Bloomington" hidden="false"/>
  -        <parameter name="weather_state" value="IN" hidden="false"/>
  -        <parameter name="weather_style" value="infobox" hidden="false"/>
  +        <parameter name="weather_city" value="Bloomington" type="invisible" hidden="false"/>
  +        <parameter name="weather_state" value="IN" type="invisible" hidden="false"/>
  +        <parameter name="weather_style" value="infobox" type="style" hidden="false">
  +			<meta-info>
  +				<title>Style</title>
  +			</meta-info>
  +		</parameter>        
           <media-type ref="html"/>
           <category>weather</category>
       </portlet-entry>
  -    <portlet-entry name="IstanbulWeather" hidden="false" type="ref" parent="CustomizerVelocity"
application="false">
  +    <portlet-entry name="IstanbulWeather" hidden="false" type="ref" parent="WeatherPortlet"
application="false">
           <meta-info>
               <title>Weather - Istanbul,Turkey</title>
               <description>Current weather conditions</description>
           </meta-info>
  -        <parameter name="template" value="weather" hidden="true"/>
  -        <parameter name="customizeTemplate" value="weather-customize" hidden="true"/>
  -        <parameter name="action" value="portlets.WeatherAction" hidden="true"/>
  -        <parameter name="weather_station" value="17060" hidden="false"/>
  -        <parameter name="weather_style" value="infobox" hidden="false"/>
  +        <parameter name="weather_station" value="17060" type="invisible" hidden="false"/>
  +        <parameter name="weather_style" value="infobox" type="style" hidden="false">
  +			<meta-info>
  +				<title>Style</title>
  +			</meta-info>
  +		</parameter>
           <parameter name="_showtitlebar" value="false" hidden="true"/>
           <media-type ref="html"/>
           <category>weather</category>
  
  
  
  1.40      +29 -13    jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg
  
  Index: portlets.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- portlets.xreg	11 Jun 2003 21:47:47 -0000	1.39
  +++ portlets.xreg	2 Jul 2003 22:34:45 -0000	1.40
  @@ -226,19 +226,35 @@
           <classname>org.apache.jetspeed.portal.portlets.browser.DatabaseBrowserPortlet</classname>
           <category>database</category>
       </portlet-entry>
  -
  -    <portlet-entry name="WeatherPortlet" hidden="false" type="ref"
  -        parent="CustomizerVelocity" application="false" >
  -        <meta-info>
  -            <title >Weather</title>
  -            <description >Current weather conditions for a city</description>
  -        </meta-info>
  -        <parameter name="template" value="weather" hidden="true"/>
  -        <parameter name="customizeTemplate" value="weather-customize" hidden="true"/>
  -        <parameter name="action" value="portlets.WeatherAction" hidden="true"/>
  -        <media-type ref="html"/>
  -        <category>weather</category>
  -    </portlet-entry>
  +    
  +	<portlet-entry name="WeatherPortlet" hidden="false" type="ref" parent="Velocity" application="false">
  +		<meta-info>
  +			<title>Weather</title>
  +			<description>Current weather conditions for a city</description>
  +		</meta-info>
  +		<parameter name="template" value="weather" hidden="true"/>
  +		<parameter name="action" value="portlets.WeatherAction" hidden="true"/>
  +		<parameter name="weather_city_info" value="US/IN/Bloomington" hidden="true"/>
  +		<parameter name="weather_parms" value="" type="style" hidden="false">
  +			<meta-info>
  +				<title>Weather Location</title>
  +			</meta-info>
  +		</parameter>
  +		<parameter name="weather_parms.style" value="VelocityParameterPresentationStyle" hidden="true"/>
  +		<parameter name="weather_parms.style.template" value="WeatherParms.vm" hidden="true"/>
  +		<parameter name="weather_city" value="" type="invisible" hidden="false"/>
  +		<parameter name="weather_state" value="" type="invisible" hidden="false"/>
  +		<parameter name="weather_station" value="" type="invisible" hidden="false"/>
  +		<parameter name="weather_style" value="infobox" type="style" hidden="false">
  +			<meta-info>
  +				<title>Style</title>
  +			</meta-info>
  +		</parameter>
  +		<parameter name="weather_style.style" value="VelocityParameterPresentationStyle" hidden="true"/>
  +		<parameter name="weather_style.style.template" value="WeatherStyles.vm" hidden="true"/>
  +		<media-type ref="html"/>		
  +		<category group="Jetspeed">weather</category>
  +	</portlet-entry>    
   
       <portlet-entry name="PreviewPortlet" hidden="true" type="instance" application="false">
           <security-ref parent="default"/>
  
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/templates/vm/parameters/html/HiddenInput.vm
  
  Index: HiddenInput.vm
  ===================================================================
  <input type="hidden" name="$name" value="$value">
  
  
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/templates/vm/parameters/html/WeatherParms.vm
  
  Index: WeatherParms.vm
  ===================================================================
  #set ( $portlet = $parms.get("portlet"))
  #set ( $weather_city = $portlet.getPortletConfig().getInitParameter("weather_city") )
  #set ( $weather_state = $portlet.getPortletConfig().getInitParameter("weather_state") )
  #set ( $weather_station = $portlet.getPortletConfig().getInitParameter("weather_station")
)
  
  <table>
  <tr><td><b>US cities</b> City : <input name="weather_city1" value="$weather_city"
size="20" onChange="weather_city.value=this.value" />
  State: <input name="weather_state1" value="$weather_state" size="2" onChange="weather_state.value=this.value"
/>
  </td></tr>
  <tr><td><b>World cities</b> Station number: <input name="weather_station1"
value="$weather_station" onChange="weather_station.value=this.value" size="10" />
  Search at <a href="http://www.wunderground.com/" target="_blank">Weather Underground</a></td></tr>
  </TABLE>
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/templates/vm/parameters/html/WeatherStyles.vm
  
  Index: WeatherStyles.vm
  ===================================================================
  #set ( $portlet = $parms.get("portlet"))
  
  ##set ( $weather_style = "infobox" )
  #set ( $weather_style = $portlet.getPortletConfig().getInitParameter("weather_style") )
  
  #set ( $weather_city_info = "US/IN/Bloomington" )
  ##set ( $weather_city_info = $portlet.getPortletConfig().getInitParameter("weather_city_info")
)
  
  #set ($img_base = "http://banners.wunderground.com/banner")
  
  <table>
  <!--tr><td valign="center"><input type="radio" name="weather_style" value="bigwx_both_cond"
#if($weather_style == "bigwx_both_cond") checked #end >
  <img src="$img_base/bigwx_both_cond/language/www/${weather_city_info}.gif" align="middle"></td></tr>
  <tr><td  valign="center"><input type="radio" name="weather_style" value="default_both"
#if($weather_style == "default_both") checked #end>
  <img src="$img_base/default_both/language/www/${weather_city_info}.gif" align="middle"></td></tr-->
  <tr><td valign="center"><input type="radio" name="weather_style" value="infobox"
#if($weather_style == "infobox") checked #end>
  <img src="$img_base/infobox/language/www/${weather_city_info}.gif" align="middle"></td></tr>
  <tr><td  valign="center"><input type="radio" name="weather_style" value="bigtemp"
#if($weather_style == "bigtemp") checked #end>
  <img src="$img_base/bigtemp/language/www/${weather_city_info}.gif" align="middle"></td></tr>
  <tr><td  valign="center"><input type="radio" name="weather_style" value="sunandmoon"
#if($weather_style == "sunandmoon") checked #end>
  <img src="$img_base/sunandmoon/language/www/${weather_city_info}.gif" align="middle"></td></tr>
  <tr><td valign="center"><input type="radio" name="weather_style" value="bigwx_cond"
#if($weather_style == "bigwx_cond") checked #end >
  <img src="$img_base/bigwx_cond/language/www/${weather_city_info}.gif" align="middle"></td></tr>
  <tr><td  valign="center"><input type="radio" name="weather_style" value="default"
#if($weather_style == "default") checked #end>
  <img src="$img_base/default/language/www/${weather_city_info}.gif" align="middle"></td></tr>
  <tr><td  valign="center"><input type="radio" name="weather_style" value="gizmotimetempbig"
#if($weather_style == "gizmotimetempbig") checked #end>
  <img src="$img_base/gizmotimetempbig/language/www/${weather_city_info}.gif" align="middle"></td></tr>
  </table>
  
  
  
  1.16      +8 -4      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm
  
  Index: customizer-portlet.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portlet.vm,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- customizer-portlet.vm	11 Apr 2003 15:30:40 -0000	1.15
  +++ customizer-portlet.vm	2 Jul 2003 22:34:46 -0000	1.16
  @@ -63,18 +63,21 @@
       </tr>
   #end
     #foreach ( $param in $parameters )
  +    #if ($param.Type == "invisible")
  +      <input type="hidden" name="$param.Name" value="$param.Value" >
  +    #else
       <tr>
         <td align="left" nowrap><b>#if ($param.Title) $param.Title #else $param.Name
#end</b></td>
         <td>
         #if ($param.Type == "style")
  -        $jetspeed.getPortletParameter($data, $portlet, $param.Name)
  +        $jetspeed.getPortletParameter($data, $portlet, $param.Name, $param.Value)
         #elseif ($param.Type == "boolean")
           <select name="$param.Name">
  -          <option #if ($config.getInitParameter($param.Name) == "false") SELECTED #end>false
  -          <option #if ($config.getInitParameter($param.Name) == "true") SELECTED #end>true
  +          <option #if ($param.Value == "false") SELECTED #end>false</option>
  +          <option #if ($param.Value == "true") SELECTED #end>true</option>
            </select>
         #else
  -        <input type="text" name="$param.Name" value="$config.getInitParameter($param.Name)"
size="50" >
  +        <input type="text" name="$param.Name" value="$param.Value" size="50" >
         #end
         </td>
       </tr>
  @@ -86,6 +89,7 @@
           <hr/>
         </td>
       </tr>
  +    #end
     #end
   #parse ("/portlets/html/customize-update_save_row.vm")
     </table>
  
  
  
  1.2       +7 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/weather.vm
  
  Index: weather.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/weather.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- weather.vm	19 Jul 2002 18:31:08 -0000	1.1
  +++ weather.vm	2 Jul 2003 22:34:46 -0000	1.2
  @@ -1,3 +1,9 @@
  +#if (!$weather_city_info)
  +<BR>
  +&nbsp;&nbsp;&nbsp;Please customize your weather location
  +<br><BR>
  +#else
   <a href="http://www.wunderground.com/${weather_city_info}.html"
  -target="_blank"><img src="http://banners.wunderground.com/banner/${weather_style}/${weather_city_info}.gif"
  +target="_blank"><img src="http://banners.wunderground.com/banner/${weather_style}/language/www/${weather_city_info}.gif"
   alt="Click for ${weather_city_info} Forecast" border="0"></a>
  +#end
  
  
  
  1.172     +4 -1      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- changes.xml	23 Jun 2003 18:50:18 -0000	1.171
  +++ changes.xml	2 Jul 2003 22:34:46 -0000	1.172
  @@ -24,6 +24,9 @@
   </li>
   -->
   <li>
  +  Add -   Bug # 20593 - 2003/07/02 - Reworked weather portlet (MO)
  +</li>
  +<li>
     Add -   Bug # 17932 - 2003/06/23 - Disabled the ability to login as anonymous user (MO)
   </li>
   <li>
  
  
  
  1.11      +4 -0      jakarta-jetspeed/xdocs/portlet_config_common.xml
  
  Index: portlet_config_common.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/portlet_config_common.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- portlet_config_common.xml	25 Apr 2003 23:14:03 -0000	1.10
  +++ portlet_config_common.xml	2 Jul 2003 22:34:46 -0000	1.11
  @@ -216,6 +216,10 @@
               instructions on how to develop your own, see javadoc for <code>org.apache.jetspeed.modules.parameters</code>
package. 
               See below for example registry entry.</td>
             </tr>
  +          <tr>
  +            <td>invisible</td>
  +            <td>Parameters with this type are rendered as hidden inputs in the portlet
customizer form.</td>
  +          </tr>
           </table>
         </td>
       </tr>
  
  
  

---------------------------------------------------------------------
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