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
Date Fri, 09 May 2003 17:28:31 GMT
morciuch    2003/05/09 10:28:31

  Modified:    docs/site changes.html
               src/java/org/apache/jetspeed/portal BasePortletSkin.java
                        PortletSkin.java
               webapp/WEB-INF/conf skins.xreg
               webapp/WEB-INF/templates/vm/controllers/html
                        multicolumn-customize.vm
               webapp/WEB-INF/templates/vm/controls/html jetspeed.vm
               webapp/WEB-INF/templates/vm/portlets/html browser-skin.vm
                        skin-form.vm
               webapp/css default.css
               xdocs    changes.xml
  Added:       webapp/css skins.css
               webapp/images/html/skins/Metal bottom.gif bottomleft.gif
                        bottomright.gif contentleft.gif contentright.gif
                        title.gif titleleft.gif titleright.gif
  Log:
  Applied patch to enhance skin capabilities, contributed by Aurélien Pernoud (see Bugzilla
issue# 18188)
  
  Revision  Changes    Path
  1.140     +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.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- changes.html	8 May 2003 20:35:49 -0000	1.139
  +++ changes.html	9 May 2003 17:28:30 -0000	1.140
  @@ -135,6 +135,9 @@
   </li>
   -->
   <li>
  +  Add -   Bug # 18188 - 2003/05/09 - Applied patch to enhance skin capabilities, contributed
by Aurélien Pernoud (MO)
  +</li>
  +<li>
     Add -   Bug # 19779 - 2003/05/08 - Added custom session validator for use with mod_ntlm
(MO)
   </li>
   <li>
  
  
  
  1.6       +54 -34    jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSkin.java
  
  Index: BasePortletSkin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSkin.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BasePortletSkin.java	2 Apr 2003 15:09:58 -0000	1.5
  +++ BasePortletSkin.java	9 May 2003 17:28:30 -0000	1.6
  @@ -75,7 +75,7 @@
       public String name = null;
       private CapabilityMap cm;
       private static final String[] VALID_EXTENSIONS = new String[] { "gif", "jpg", "png"
};
  -    
  +
       /**
        * Returns the name of this color scheme
        * @return the color scheme name
  @@ -84,7 +84,7 @@
       {
           return this.name;
       }
  -    
  +
       /** Sets the name of this Skin
        */
       public void setName(String name)
  @@ -111,7 +111,7 @@
           {
               put(TEXT_COLOR,color);
           }
  -    }    
  +    }
   
       /**
        * Returns the color to use for displaying the portlet background
  @@ -132,8 +132,8 @@
           {
               put(BACKGROUND_COLOR,color);
           }
  -    }    
  -    
  +    }
  +
   
       /**
        * Returns the color to use for displaying the portlet title text
  @@ -143,7 +143,7 @@
       {
           return (String)get(TITLE_TEXT_COLOR);
       }
  -    
  +
   
       /**
        * Sets the color to use for displaying the portlet title text
  @@ -155,7 +155,7 @@
           {
               put(TITLE_TEXT_COLOR,color);
           }
  -    }    
  +    }
   
       /**
        * Returns the color to use for displaying the portlet title background
  @@ -165,7 +165,7 @@
       {
           return (String)get(TITLE_BACKGROUND_COLOR);
       }
  -    
  +
       /**
        * Sets the color to use for displaying the portlet title background
        * @param titleColor the title color value in HTML format (#RRGGBB)
  @@ -176,7 +176,7 @@
           {
               put(TITLE_BACKGROUND_COLOR,color);
           }
  -    }    
  +    }
   
       /**
        * Returns the color to use for displaying an highlighted text
  @@ -197,7 +197,7 @@
           {
               put(HIGHLIGHT_TEXT_COLOR,color);
           }
  -    }    
  +    }
   
       /**
        * Returns the color to use for displaying an highlighted background
  @@ -218,7 +218,7 @@
           {
               put(HIGHLIGHT_BACKGROUND_COLOR,color);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use for the portlet overall
  @@ -239,7 +239,7 @@
           {
               put(PORTLET_STYLE_CLASS,portletStyleClass);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use for the portlet title
  @@ -260,7 +260,7 @@
           {
               put(TITLE_STYLE_CLASS,titleStyleClass);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use for the portlet content
  @@ -281,7 +281,7 @@
           {
               put(CONTENT_STYLE_CLASS,contentStyleClass);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use overall for the tabbed control
  @@ -302,7 +302,7 @@
           {
               put(TAB_STYLE_CLASS,tabStyleClass);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use on the title of the tabbed control
  @@ -323,7 +323,7 @@
           {
               put(TAB_TITLE_STYLE_CLASS,tabTitleStyleClass);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use on the control of the tabbed control
  @@ -344,7 +344,7 @@
           {
               put(TAB_CONTENT_STYLE_CLASS,tabContentStyleClass);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use on the control of the Highlighted title tab or menu
item
  @@ -365,7 +365,7 @@
           {
               put(HIGHLIGHT_TITLE_STYLE_CLASS, highlightTitleStyleClass);
           }
  -    }    
  +    }
   
       /**
        * Returns the CSS class to use for the controller overall
  @@ -387,8 +387,28 @@
               put(CONTROLLER_STYLE_CLASS,controllerStyleClass);
           }
       }
  -    
  -   
  +
  +    /**
  +     * Returns the CSS class to use for the global skin rendering
  +     * @see org.apache.jetspeed.portal.PortletSkin#getPortletSkinClass()
  +     */
  +    public String getPortletSkinClass()
  +    {
  +        return (String)get(PORTLET_SKIN_CLASS);
  +    }
  +
  +    /**
  +     * Sets the CSS class to use for the global skin rendering
  +     * @param portletSkinClass the new class to be used
  +     */
  +    public void setPortletSkinClass(String portletSkinClass)
  +    {
  +        if (portletSkinClass!=null)
  +        {
  +            put(PORTLET_SKIN_CLASS,portletSkinClass);
  +        }
  +    }
  +
       /**
        * @see org.apache.jetspeed.portal.PortletSkin#getImage(String, String)
        */
  @@ -411,7 +431,7 @@
           }
       }
   
  -  
  +
       /**
       * This allows the PortalToolKit to make the PortletSkin aware
       * of the current user-agents's capabilities
  @@ -422,24 +442,24 @@
       {
           this.cm = cm;
       }
  -    
  +
       /**
        * builds a media type specific path for the relative path provided
  -     */    
  +     */
       private String buildMediaTypeSpecificPath(String relativePath)
       {
           String path = "images/" + cm.getPreferredMediaType() + "/skins/" + relativePath;
           return path;
       }
  -    
  +
       /**
        * builds a media type specific path using this skin's name.
  -     */ 
  +     */
       private String buildMediaTypeSpecificPath()
  -    {        
  +    {
           return buildMediaTypeSpecificPath(name);
       }
  -    
  +
       private  String imageDiscovery(String imageName)
       {
           String imagePathes = (String) get("image.paths");
  @@ -469,7 +489,7 @@
           }
           return fullPath;
       }
  -    
  +
       /**
        * Does the path contain a valid image extension?
        */
  @@ -479,9 +499,9 @@
               || (path.indexOf(".jpg") > -1)
               || (path.indexOf(".png") > -1);
       }
  -    
  +
       /**
  -     * makes every attempt to locate a valid image based on the combination 
  +     * makes every attempt to locate a valid image based on the combination
        * of an absoulte path and relative path or name.  The relPath may pr may not
        * contain a valid image extension (.gif, .png, .jpg).
        */
  @@ -506,12 +526,12 @@
                   {
                       return path;
                   }
  -            }           
  +            }
           }
  -        
  +
           return null;
       }
  -    
  +
       /**
        * Does this <code>path</code> exist in the current file system.
        */
  
  
  
  1.6       +24 -6     jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletSkin.java
  
  Index: PortletSkin.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletSkin.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PortletSkin.java	2 Apr 2003 15:09:58 -0000	1.5
  +++ PortletSkin.java	9 May 2003 17:28:30 -0000	1.6
  @@ -81,7 +81,7 @@
       public static final String TAB_STYLE_CLASS = "tab-style-class";
       public static final String TAB_TITLE_STYLE_CLASS = "tab-title-style-class";
       public static final String TAB_CONTENT_STYLE_CLASS = "tab-content-style-class";
  -    public static final String STYLESHEET = "stylesheet";
  +    public static final String PORTLET_SKIN_CLASS = "portlet-skin-class";
   
       /**
        * Returns the name of this color scheme
  @@ -256,11 +256,11 @@
        * @param controllerStyleClass the new class to be used
        */
       void setControllerStyleClass(String controllerStyleClass);
  -    
  +
       /**
        * Returns a named image from this skin.  The skin property
  -     * must be prefixed with "image-" within the registry.  
  -     * @param String name name of image to retreive.  
  +     * must be prefixed with "image-" within the registry.
  +     * @param String name name of image to retreive.
        *  <strong>DO NOT PREFIX WITH "image-"</strong>
        * as getImage will do this for you.
        * @param String dftPath realtive path to a default image if
  @@ -269,7 +269,7 @@
        * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
        */
       String getImage(String name, String dftPath);
  -    
  +
      /**
       * This allows the PortalToolKit to make the PortletSkin aware
       * of the current user-agents's capabilities
  @@ -277,5 +277,23 @@
       * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
       */
       void setCapabilityMap(CapabilityMap cm);
  +
  +    /**
  +     * This returns the class to use for the entire portlet, based
  +     * on the cascading :
  +     * portlet has 9 possible class to be used in a skin :
  +     *                             ________________
  +     * - title   (+ left/right)   |__|__________|__|
  +     *                            |  |          |  |
  +     *                            |  |          |  |
  +     * - content (+ left/right)   |  |          |  |
  +     *                            |  |          |  |
  +     *                            |__|__________|__|
  +     * - bottom  (+ left/right)   |__|__________|__|
  +     *
  +     * using cascading, we can change all of those class with one parent class
  +     * -> this is how PortletSkinClass is used
  +     */
  +     String getPortletSkinClass();
   
   }
  
  
  
  1.10      +3 -0      jakarta-jetspeed/webapp/WEB-INF/conf/skins.xreg
  
  Index: skins.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/skins.xreg,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- skins.xreg	2 Apr 2003 15:09:58 -0000	1.9
  +++ skins.xreg	9 May 2003 17:28:30 -0000	1.10
  @@ -99,4 +99,7 @@
           <property name="highlight-title-style-class" value="HighlightTitleStyleClass"
hidden="false"/>
           <property name="image.paths" value="3D-icons" hidden="false"/>
       </skin-entry>
  +    <skin-entry name="MetalSkin" hidden="false">
  +        <property name="portlet-skin-class" value="Metal" hidden="false"/>
  +    </skin-entry>
   </registry>
  
  
  
  1.19      +44 -41    jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm
  
  Index: multicolumn-customize.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- multicolumn-customize.vm	11 Apr 2003 15:29:56 -0000	1.18
  +++ multicolumn-customize.vm	9 May 2003 17:28:30 -0000	1.19
  @@ -17,7 +17,7 @@
    #set ($col_class = $!skin.ControllerStyleClass)
   #end
     <td valign="top" width="$width">
  -    <table width="100%" cellspacing="1" cellpadding="1" border="0" #if ($!{col_class}=="")
#if( ${skin.PortletStyleClass}) class="$!{skin.PortletStyleClass}" #end #else class="$col_class"
#end>
  +    <table width="100%" cellspacing="1" cellpadding="1" border="0">
   #foreach ( $portlet in $column )
         <tr>
           <td width="100%">
  @@ -26,11 +26,11 @@
             <input type="hidden" name="id" value="$portlet.id" />
             <input type="hidden" name="col" value="$col" />
             <input type="hidden" name="row" value="$row" />
  -          <table width="95%" cellpadding="1" cellspacing="0" #if( ${skin.PortletStyleClass})
class="$!{skin.PortletStyleClass}" #end #if(${skin.TitleBackgroundColor}) style="background-color:
${skin.TitleBackgroundColor}" #end >
  -          <tr><td width="100%">
  -          <table width="100%" cellspacing="0" cellpadding="0" #if( ${skin.TitleStyleClass})
class="$!{skin.TitleStyleClass}" #end #if(${skin.TitleBackgroundColor}) style="background-color:
${skin.TitleBackgroundColor}" #end>
  -            <tr bgcolor="$!{skin.TitleBackgroundColor}">
  -              <td align="right" valign="top" #if(${skin.TitleBackgroundColor}) style="background-color:
${skin.TitleBackgroundColor}" #end  >
  +          <table width="100%" cellspacing="0" cellpadding="0" #if( ${skin.PortletStyleClass})
class="${skin.PortletStyleClass}" #end>
  +## Portlet Title
  +            <tr>
  +              <td class="PTitleLeft" style="font-size:1pt;">&nbsp;</td>
  +              <td align="right" valign="top" #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}"
#else class="PTitle" #end #if(${skin.TitleBackgroundColor}) style="background-color: ${skin.TitleBackgroundColor}"
#end>
                   <input type="image" src="images/close.gif" alt="$l10n.CUSTOMIZER_REMOVE"
border="0" name="eventSubmit_doDelete">
                   #if ($col == 0)
                   <img src="images/blank.gif" width="14">
  @@ -53,13 +53,18 @@
                   <input type="image" src="images/right.gif" alt="$l10n.CUSTOMIZER_MOVERIGHT"
border="0" name="eventSubmit_doRight">
                   #end
                 </td>
  +              <td class="PTitleRight" style="font-size:1pt;">&nbsp;</td>
               </tr>
  -            <tr height="50">
  -              <td height="50" valign="middle" #if(${skin.ContentStyleClass}) class="${skin.ContentStyleClass}"
#end #if(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}" #end align="center">
  -                <b>$titles.get($portlet.id)</b>
  -              </td>
  -            </tr>
  +## Portlet "content" (properties)
               <tr>
  +              <td class="PContentLeft" style="font-size:1pt;">&nbsp;</td>
  +              <td align="center" valign="middle" #if(${skin.ContentStyleClass}) class="${skin.ContentStyleClass}"
 #else class="PContent" #end #if(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}"
#end>
  +		<table width="100%" border="0">
  +                <tr>
  +                  <td colspan="2" align="center">
  +                    <b>$titles.get($portlet.id)</b>
  +                  </td>
  +                </tr>
   ## Set $portletSkin.  If no skin exists for the portlet, then set to "-- Default --"
   #if ($portlet.Skin)
     #set ($tempSkin = $portlet.Skin)
  @@ -87,10 +92,10 @@
                 <td#if(${skin.ContentStyleClass}) class="${skin.ContentStyleClass}" #end
#if(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}" #end align="center">
                   <table width="100%">
                     <tr>
  -                    <td width="50%" valign="top">
  +                    <td width="50%">
                         $l10n.CUSTOMIZER_SKIN : $portletSkin
                       </td>
  -                    <td width="50%" valign="top">
  +                    <td width="50%">
                          $l10n.CUSTOMIZER_SECURITY_REF : $portletSecurityRef
                       </td>
                     </tr>
  @@ -100,10 +105,8 @@
   ## Include path for references
   #if ($portlet.Path)
               <tr>
  -              <td#if(${skin.ContentStyleClass}) class="${skin.ContentStyleClass}" #end
#if(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}" #end>
  -                <table width="100%"> ## Including table to match alignment.
  -                  <tr><td>$l10n.CUSTOMIZER_REF_PATH : $portlet.Path</td></tr>
  -                </table>
  +              <td colspan="2">
  +              $l10n.CUSTOMIZER_REF_PATH : $portlet.Path
                 </td>
               </tr>
   #end
  @@ -114,33 +117,33 @@
      #set ($controlListBox = $jetspeed.getPortletParameter($data, $data.User.getTemp("customizer"),
"control")) 
   #end
   
  -#if (!$portlet.Path && $controlListBox)      
  -      
  -            <tr>
  -              <td#if(${skin.ContentStyleClass}) class="${skin.ContentStyleClass}" #end
#if(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}" #end>
  -                <table width="100%"> ## Including table to match alignment.
  -                  <tr>
  -                    <td>
  -        <form name="decorations$ndx" action="#psmlLink($jslink.Template)" method="post">
  -        #if ($action) 
  -                                <input name="$jslink.ActionKey" type="hidden" value="$action">

  -        #end
  -                                <input name="js_peid" type="hidden" value="$portlet.id">

  -                                <input type="hidden" name="eventSubmit_doControl" value="doControl">
       
  -                                $controlListBox
  -                        </form>
  -        #set ($ndx = $ndx + 1)            
  -                    </td>
  -                  </tr>
  -                </table>
  +#if (!$portlet.Path && $controlListBox)
  +                <tr>
  +                  <td colspan="2" align="left">
  +			<form name="decorations$ndx" action="#psmlLink($jslink.Template)" method="post">
  +			#if ($action) 
  +				<input name="$jslink.ActionKey" type="hidden" value="$action"> 
  +			#end
  +				<input name="js_peid" type="hidden" value="$portlet.id"> 
  +				<input type="hidden" name="eventSubmit_doControl" value="doControl">        
  +				$controlListBox
  +			</form>
  +			#set ($ndx = $ndx + 1)
  +		    </td>
  +		  </tr>
                 </td>
  +              </table>
  +              <td class="PContentRight" style="font-size:1pt;">&nbsp;</td>
               </tr>
   #end
  -
  -          </table>
  -          </td></tr>
  +## End of the portlet content preview (properties)
  +## Bottom of the portlet preview
  +	     <tr>
  +	       <td class="PBottomLeft" style="font-size:1pt;">&nbsp;</td>
  +	       <td class="PBottom" style="font-size:1pt;">&nbsp;</td>
  +	       <td class="PBottomRight" style="font-size:1pt;">&nbsp;</td>
  +	     </tr>
             </table>
  -          ##</form>
           </td>
         </tr>
   #set ($row = $row + 1)
  
  
  
  1.16      +35 -21    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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jetspeed.vm	27 Mar 2003 17:46:19 -0000	1.15
  +++ jetspeed.vm	9 May 2003 17:28:30 -0000	1.16
  @@ -17,8 +17,6 @@
   #else
     #if (${$skin.TitleTextColor})
       #set ($titlestyle = "color: $skin.TitleTextColor;" )
  -  #else
  -    #set ($titlestyle = "" )
     #end
   #end
   ## ----------------------
  @@ -33,48 +31,64 @@
   #else
     #if (${$skin.TextColor})
       #set ($contentstyle = "color: $skin.TextColor;" )
  -  #else
  -    #set ($contentstyle = "" )
     #end
   #end
   
   #if( ! $portlet.isClosed($data) )
  +##
  +## Here we set a global css for the portlet using div tag
  +##
  +<div #if (${skin.PortletSkinClass}) class="${skin.PortletSkinClass}" #end>
   <table border="0" cellpadding="0" cellspacing="0" width="100%" #if( ${skin.PortletStyleClass})
class="$!{skin.PortletStyleClass}" #end #if (${portletStyle}) style="${portletStyle}" #end>
   ##
   ## Portlet Title Bar
   ##
   #if( $portlet_instance.isShowTitleBar() )
  -  <tr #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}" #end #if (${titlestyle})
style="${titlestyle}" #end >
  -    #if (${portlet_instance.Image})
  -    <td style="padding-right: 5;"><image src="${portlet_instance.Image}"></td>
  +  <tr>
  +    #if (${skin.PortletSkinClass})
  +    <td class="PTitleLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
       #end
  -    <td align="left" nowrap="true" valign="middle" width="100%" #if (${skin.TitleStyleClass})
class="${skin.TitleStyleClass}" #end #if (${titlestyle}) style="${titlestyle}" #end>
  +    <td align="left" valign="middle" #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}"
#else class="PTitle" #end #if (${titlestyle}) style="${titlestyle}" #end>
          $portlet_instance.Title
       </td>
  -    <td align="right" nowrap="true" valign="middle" #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}"
#end #if (${titlestyle}) style="${titlestyle}" #end>
  -#foreach ( $action in $actions )
  -      <!--<a href="${action.Link}" title="${action.Name}" ><img src="images/${action.Name}.gif"
alt="${action.Alt}" border="0"></a>-->
  -      <a href="${action.Link}" title="${action.Name}" ><img src="${skin.getImage($action.Name,"images/${action.Name}.gif")}"
alt="${action.Alt}" border="0"></a>
  -#end
  +    <td align="right" valign="middle" #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}"
#else class="PTitle" #end #if (${titlestyle}) style="${titlestyle}" #end>
  +	#foreach ( $action in $actions )
  +	<a href="${action.Link}" title="${action.Name}" ><img src="${skin.getImage($action.Name,"images/${action.Name}.gif")}"
alt="${action.Alt}" border="0"></a>
  +	#end
       </td>
  +    #if (${skin.PortletSkinClass})
  +    <td class="PTitleRight" style="font-size:1pt;" nowrap="true">&nbsp;</td>
  +    #end
     </tr>
  +
   #end
   ##
   ## Portlet Content
   ##
   #if( ! $portlet.isMinimized($data) )
     <tr>
  -    <td colspan="3" 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 (${contentstyle})
style="${contentstyle}" #end >
  -        <tr>
  -          <td>
  -            $!portlet.getContent($data)
  -          </td>
  -        </tr>
  -      </table>
  +    #if (${skin.PortletSkinClass} && $portlet_instance.isShowTitleBar())
  +    <td class="PContentLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
  +    #end
  +    <td colspan="2" #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())
  +    <td class="PContentRight" style="font-size:1pt;" nowrap="true">&nbsp;</td>
  +    #end
     </tr>
   #end
  +##
  +## Portlet Bottom
  +##
  +  #if ($portlet_instance.isShowTitleBar() && ${skin.PortletSkinClass})
  +  <tr>
  +    <td class="PBottomLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
  +    <td colspan="2" class="PBottom" style="font-size:1pt;" nowrap="true">&nbsp;</td>
  +    <td class="PBottomRight" style="font-size:1pt;" nowrap="true">&nbsp;</td>
  +  </tr>
  +  #end
   </table>
  +</div>
   #end
   ##<!-- end jetspeed.vm -->
  
  
  
  1.5       +2 -2      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-skin.vm
  
  Index: browser-skin.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-skin.vm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- browser-skin.vm	13 Feb 2003 06:16:48 -0000	1.4
  +++ browser-skin.vm	9 May 2003 17:28:30 -0000	1.5
  @@ -21,8 +21,8 @@
       </table>
       </td>
       <td align="center">
  -    	<a style="font-size:10" href="$jslink.setPaneByName("SkinForm").addQueryData("mode","update").addQueryData("skinname",
$!entry.Name)">Update Skin</a>&nbsp;
  -    	<a style="font-size:10" href="$jslink.setPaneByName("SkinForm").addQueryData("mode","delete").addQueryData("skinname",
$!entry.Name)">Delete Skin</a>&nbsp;
  +    	<a style="font-size:10" href="$jslink.setPaneByName("SkinForm").addQueryData("mode","update").addQueryData("skinname",
$!entry.Name)">Edit</a>&nbsp;
  +    	<a style="font-size:10" href="$jslink.setPaneByName("SkinForm").addQueryData("mode","delete").addQueryData("skinname",
$!entry.Name)">Delete</a>&nbsp;
       </td>
     </tr>
   #end
  
  
  
  1.4       +10 -0     jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/skin-form.vm
  
  Index: skin-form.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/skin-form.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- skin-form.vm	2 May 2003 19:24:37 -0000	1.3
  +++ skin-form.vm	9 May 2003 17:28:30 -0000	1.4
  @@ -319,6 +319,16 @@
               </font>
             </td>
           </tr>
  +        <tr>
  +          <td bgcolor="$!{skin.TitleBackgroundColor}">
  +            <b><font face="$ui.sansSerifFonts">portlet-skin-class</font></b>
  +          </td>
  +          <td bgcolor="$!{skin.TitleBackgroundColor}">
  +            <font face="$ui.sansSerifFonts">
  +              <input type="text" name="parameter.portlet-skin-class" size="20" value="$!entry.getParameter("portlet-skin-class").value">
  +            </font>
  +          </td>
  +        </tr>
   	
   	
         #end
  
  
  
  1.15      +1 -1      jakarta-jetspeed/webapp/css/default.css
  
  Index: default.css
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/css/default.css,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- default.css	28 Apr 2002 21:00:00 -0000	1.14
  +++ default.css	9 May 2003 17:28:30 -0000	1.15
  @@ -1,4 +1,4 @@
  -
  +@import "skins.css";
           {background:  white}
           BODY  {font-family: "Verdana"; font-size: 9pt; color: 000000; margin: 0px 0px 0px
0px; padding: 0px 0px 0px 0px}
           TD  {font-family: "Verdana"; font-size: 9pt; color: 000000}
  
  
  
  1.1                  jakarta-jetspeed/webapp/css/skins.css
  
  Index: skins.css
  ===================================================================
  /**
  	Metal Skin that uses the cascading capability of CSS
  **/
  
  .Metal .PTitleLeft
  {
  	/**
  	Needs to specify the width of image used
  	otherwise it won't show !
  	**/
  	width:10px;
  	
  	/** Always use relative path ! **/
  	background:  url(../images/html/skins/Metal/titleleft.gif);
  }
  
  .Metal .PTitle
  {
  	/**
  	Specify the height of the image used
  	else it will use the text height	
  	**/
  	height:16px;
  	color:#FFFFFF;
  	background:  url(../images/html/skins/Metal/title.gif);
  }
   
  .Metal .PTitleRight
  {
  	/**
  	Needs to specify the width of image used
  	otherwise it won't show !
  	**/
  	width:10px;
  	background:  url(../images/html/skins/Metal/titleright.gif);
  }
  
  .Metal .PContentLeft
  {
  	width:10px;
  	background:  url(../images/html/skins/Metal/contentleft.gif);
  }
  
  .Metal .PContent
  {
  
  }
  
  .Metal .PContentRight
  {
  	width:10px;
  	background:  url(../images/html/skins/Metal/contentright.gif);
  }
  
  .Metal .PBottomLeft
  {
  	width:10px;
  	background:  url(../images/html/skins/Metal/bottomleft.gif);
  }
  
  .Metal .PBottom
  {
  	/**
  	Specify the height of the image used
  	else it won't appear
  	**/
  	height:13px;
  	background:  url(../images/html/skins/Metal/bottom.gif);
  }
  
  .Metal .PBottomRight
  {
  	width:10px;
  	background:  url(../images/html/skins/Metal/bottomright.gif);
  }
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/bottom.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/bottomleft.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/bottomright.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/contentleft.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/contentright.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/title.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/titleleft.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-jetspeed/webapp/images/html/skins/Metal/titleright.gif
  
  	<<Binary file>>
  
  
  1.159     +4 -1      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- changes.xml	8 May 2003 20:35:49 -0000	1.158
  +++ changes.xml	9 May 2003 17:28:30 -0000	1.159
  @@ -24,6 +24,9 @@
   </li>
   -->
   <li>
  +  Add -   Bug # 18188 - 2003/05/09 - Applied patch to enhance skin capabilities, contributed
by Aurélien Pernoud (MO)
  +</li>
  +<li>
     Add -   Bug # 19779 - 2003/05/08 - Added custom session validator for use with mod_ntlm
(MO)
   </li>
   <li>
  
  
  

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