You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2001/12/10 18:25:56 UTC

cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html customizer-portletset-add.vm

taylor      01/12/10 09:25:56

  Modified:    webapp/WEB-INF/templates/vm/controllers/wml column.vm
               webapp/WEB-INF/templates/vm/portlets/html
                        customizer-portletset-add.vm
  Log:
  - removed 'used' image on the add-portlet page, already used portlets are checked and readonly.
  
  Revision  Changes    Path
  1.3       +32 -15    jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/wml/column.vm
  
  Index: column.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/wml/column.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- column.vm	2001/12/06 06:03:40	1.2
  +++ column.vm	2001/12/10 17:25:56	1.3
  @@ -1,27 +1,44 @@
  -##modified: Andreas Kempf, 11/15/01
  +##modified: Andreas Kempf, 12/10/01
  +## added support for LinkPortlet
   ##---------------------------------
   <card title="User Home">
     #parse("welcome.vm")
     <p><br/>
  -  #foreach ( $portlet in $portlets )
  -#set ($img="")
  -#set ($img=$!portlet.getPortletConfig().getInitParameter("imgwml"))
  -#if ((!$img) || ($img==""))
  -  #set ($img="bullet.wbmp")
  -#end
  -## Insert external link
  -#set ($newlink=$!portlet.getPortletConfig().getInitParameter("isLink"))
  -#if ($newlink)
  -    <img src="$clink.getExternal()images/wml/$img" alt=""/><a href="$!newlink">$!portlet.Title</a><br/>
  -## Insert deck link
  -#else
  +
  +#foreach ( $portlet in $portlets )
  +
  +  ## Search for image
  +  #set ($img="")
  +  #set ($img=$!portlet.getPortletConfig().getInitParameter("imagewml"))
  +  #if ((!$img) || ($img==""))
  +    #set ($img="bullet.wbmp")
  +  #end
  +
  +  ## Check and retrieve link
  +  #set ($newlink="*")
  +  #set ($newlink=$!portlet.getPortletConfig().getInitParameter("link"))
  +
  +  ## Insert deck (local) link
  +  #if ($!newlink=="*")
       <img src="$clink.getExternal()images/wml/$img" alt=""/><a href="#_$!portlet.Name">$!portlet.Title</a><br/>
  -#end
  +  ## Insert link
  +  #else
  +    #set ($newtitle="*")
  +    #set ($newtitle=$!portlet.getPortletConfig().getInitParameter("anchor"))
  +    ## Display link anchor or title
  +    #if ($!newtitle=="*")
  +      #set ($newtitle=$!portlet.Title)
  +    #end
  +    <img src="$clink.getExternal()images/wml/$img" alt=""/><a href="$!newlink">$!newtitle</a><br/>
     #end
  -    <img src="$clink.getExternal()images/wml/exit.wbmp" alt=""/><b><a href="$link.setAction("LogoutUser")">Logout</a></b><br/>
  +#end
  +
  +## add Logout link
  +  <br/><img src="$clink.getExternal()images/wml/exit.wbmp" alt=""/><b><a href="$link.setAction("LogoutUser")">Logout</a></b><br/>
     </p>
   </card>
     #foreach ( $portlet in $portlets )
         $!portlet.getContent($data)
     #end
  +
   
  
  
  
  1.3       +6 -4      jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm
  
  Index: customizer-portletset-add.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- customizer-portletset-add.vm	2001/12/06 06:03:40	1.2
  +++ customizer-portletset-add.vm	2001/12/10 17:25:56	1.3
  @@ -5,7 +5,7 @@
   <tr><td>
   <table width="100%" border="0" cellspacing="2" cellpadding="0" align="center">
     <tr>
  -    <td colspan="2" bgcolor="$!{skin.TitleBackgroundColor}" align="left" class=MENUBUTTON><font color="$!{skin.TitleColor}">Select</font></td>
  +    <td bgcolor="$!{skin.TitleBackgroundColor}" align="left" class=MENUBUTTON><font color="$!{skin.TitleColor}"><b>Select</b></font></td>
       <td bgcolor="$!{skin.TitleBackgroundColor}" align="left" class=MENUBUTTON><font color="$!{skin.TitleColor}"><b>Title</b></font></td>
       <td bgcolor="$!{skin.TitleBackgroundColor}" align="left" class=MENUBUTTON><font color="$!{skin.TitleColor}"><b>Description</b></font></td>
     </tr>  
  @@ -30,17 +30,19 @@
     #foreach ($entry in $runs)
       #if ($entry.parent == $portlet.Name)
         #set ($FF="checked")
  -      <img src="images/ok.gif" width=14" height="14" border="0" VSpace="2" alt="active" /></TD><TD align="center">
  +##      <img src="images/ok.gif" width=14" height="14" border="0" VSpace="2" alt="active" /></TD><TD align="center">
       #end
     #end
   
     ## Portlet is not used - use blank image!
     #if ($FF!="checked")
  -    <img src="images/blank.gif" width=14" height="2" border="0" /></TD><TD align="center">
  +##    <img src="images/blank.gif" width=14" height="2" border="0" /></TD><TD align="center">
  +    <input type="checkbox" name="pname" value="$portlet.Name" $FF /></td>
  +  #else
  +    <input type="checkbox" name="pname" value="$portlet.Name" $FF DISABLED READONLY/></td>
     #end
   
     ## Display checkbox for portlet selection
  -    <input type="checkbox" name="pname" value="$portlet.Name" $FF /></td>
       <td valign="top" align="left">
   #if ($portlet.Title) $portlet.Title #else $portlet.Name #end
       </td>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>