portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pau...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html security_example.psml
Date Wed, 24 Jul 2002 03:25:41 GMT
paulsp      2002/07/23 20:25:41

  Modified:    webapp/WEB-INF/templates/vm/controls/html jetspeed.vm
               webapp/WEB-INF/psml/group/Jetspeed/html
                        security_example.psml
  Log:
  o jetspeed.vm now get title and content from the portlet instance
  o group/page/security_example has a title in the PSML set
  
  Revision  Changes    Path
  1.10      +3 -3      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jetspeed.vm	15 Mar 2002 09:21:13 -0000	1.9
  +++ jetspeed.vm	24 Jul 2002 03:25:41 -0000	1.10
  @@ -43,10 +43,10 @@
   ##
   ## Portlet Title Bar
   ##
  -#if( $portlet.isShowTitleBar($data) )
  +#if( $portlet_instance.isShowTitleBar() )
     <tr #if (${skin.TitleStyleClass}) class="${skin.TitleStyleClass}" #end #if (${titlestyle})
style="${titlestyle}" #end >
       <td align="left" nowrap="true" valign="middle" width="100%" #if (${skin.TitleStyleClass})
class="${skin.TitleStyleClass}" #end #if (${titlestyle}) style="${titlestyle}" #end>
  -       $portlet.Title
  +       $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 )
  @@ -64,7 +64,7 @@
         <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)
  +            $!portlet_instance.Content
             </td>
           </tr>
         </table>
  
  
  
  1.2       +10 -2     jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml
  
  Index: security_example.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/html/security_example.psml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- security_example.psml	14 Jul 2002 02:44:19 -0000	1.1
  +++ security_example.psml	24 Jul 2002 03:25:41 -0000	1.2
  @@ -24,7 +24,15 @@
           </metainfo>
           <controller name="TwoColumns"/>
           <entry parent="LoggedInWelcome"/>
  -        <entry parent="SecurityExample"/>
  -        <entry parent="Search"/>
  +        <entry parent="SecurityExample">
  +          <metainfo>
  +            <title>Security Example in Admin Tab</title>
  +          </metainfo>
  +        </entry>
  +        <entry parent="Search">
  +          <metainfo>
  +            <title>Search in Admin Tab</title>
  +          </metainfo>
  +        </entry>
       </portlets>
   </portlets>
  
  
  

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


Mime
View raw message